initial development started

7 years ago · 3a81215e3e
parent df2424b9b1
commit 3a81215e3e
4 changed files with 10 additions and 37 deletions
--- a/html/index.html
+++ b/html/index.html
@ -91,6 +91,7 @@
                <nav class="w-dropdown-list dropdown-rounded">
                    <a class="w-dropdown-link dropdown-styling pointer top" data-ix="display-login-key-review" show-modal="review-login-key">Review Login Key</a>
                    <a class="w-dropdown-link dropdown-styling pointer" show-modal="import-wallet" ng-hide="account_scan_start_height == 0">Import Transactions</a>
+                    <a class="w-dropdown-link dropdown-styling pointer" show-modal="imported-account">New Import Transactions</a>
                    <a class="w-dropdown-link dropdown-styling pointer bottom" data-ix="display-review-account" show-modal="review-account-details">Account Details</a>
                </nav>
            </div>
--- a/html/js/controllers/import_wallet.js
+++ b/html/js/controllers/import_wallet.js
@ -62,4 +62,9 @@ thinwalletCtrls.controller("ImportWalletCtrl", function($scope, $location, $http
    $scope.$on('$destroy', function() {
        $interval.cancel(getRequestInterval);
    });
+
+    $scope.importLast = function(no_blocks) {
+        alert(no_blocks);
+    }
+
 });
--- a/html/modals/imported-account.html
+++ b/html/modals/imported-account.html
@ -1,35 +1,4 @@
-
-<!-- saved from url=(0049)https://mymonero.com/modals/imported-account.html -->
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=windows-1252"><style id="dark-reader-style" type="text/css">@media screen {
-
-/* Leading rule */
-html {
-  -webkit-filter: invert(100%) hue-rotate(180deg) contrast(90%) grayscale(40%) sepia(10%) !important;
-}
-
-/* Contrary rule */
-img, iframe, video, *:not(object):not(body)>embed, object,
-*[style*="background:url"]:empty, *[style*="background-image:url"]:empty,
-*[style*="background: url"]:empty, *[style*="background-image: url"]:empty {
-  -webkit-filter: invert(100%) hue-rotate(180deg) !important;
-}
-
-/* Text contrast */
-html {
-  text-shadow: 0 0 0 !important;
-}
-
-/* Full screen */
-*:-webkit-full-screen, *:-webkit-full-screen * {
-  -webkit-filter: none !important;
-}
-
-/* Page background */
-html {
-  background: rgb(13,13,13) !important;
-}
-
-}</style></head><body><div class="modal-background" modal-name="imported-account">
+<div class="modal-background" modal-name="imported-account" ng-controller="ImportWalletCtrl">
  <div class="w-container">
    <div class="w-clearfix">
      <a class="w-inline-block close-modal" hide-modal="">
@ -44,13 +13,11 @@ html {
          <a class="login-btn modals pointer" show-modal="import-wallet">Import transactions</a>
        </div>

-        <!--
        <label class="field-label">Import transactions from last 10000 blocks</label>
        <div class="review-text">Imports transactions from last 10000 blocks (last 5-6 days). </div>
        <div class="submit-div small-top-margin">
-          <a class="login-btn modals pointer" hide-modal="" ng-click="importLast('ckuc')">Import transactions</a>
+          <a class="login-btn modals pointer" hide-modal="" ng-click="importLast('10000')">Import transactions</a>
        </div>
-        -->

        <label class="field-label">Don't import transactions</label>
        <div class="review-text">You can send and receive coins from your account, but you won't be able to see or spend any transactions you have received before now</div>
@ -60,4 +27,4 @@ html {
      </div>
    </div>
  </div>
-</div></body></html>
+</div>
--- a/src/YourMoneroRequests.cpp
+++ b/src/YourMoneroRequests.cpp
@ -798,7 +798,7 @@ YourMoneroRequests::import_wallet_request(const shared_ptr< Session > session, c
    }
    else
    {
-        // payment request is now, so create its entry in
+        // payment request is new, so create its entry in
        // Payments table

        uint64_t payment_table_id {0};