diff --git a/public/views/backup.html b/public/views/backup.html index 0972e1097..bd9cc6173 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -1,17 +1,17 @@ -
+
+<<<<<<< 41f76292fef879856ea30ae58291f333a5e83415
+======= +
+
+ + Validating recovery phrase... +
+
+ +
+>>>>>>> Replace $root.go directive for href ui-sref - {{wordsC.error|translate}} + {{backupC.error|translate}}
@@ -30,8 +41,8 @@ -->
-
-
+
+
Write your wallet recovery phrase
@@ -56,37 +67,37 @@
-
+
Wallet recovery phrase not available. You can still export it from Advanced > Export.
-
-

+

+

You need the wallet recovery phrase to restore this personal wallet. Write it down and keep them somewhere safe.

-
+ -
+
- {{word}}  + {{word}} 
-
-
+
+
This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed. @@ -96,11 +107,11 @@
@@ -110,19 +121,19 @@ ## STEP 2 --> -
+
Confirm your wallet recovery phrase

Please tap the words in order to confirm your backup phrase is correctly written.

- +
- + @@ -132,10 +143,10 @@
@@ -145,7 +156,7 @@ ## STEP 3 --> -
+
Enter your password

@@ -161,7 +172,7 @@ ng-disabled="!passphrase" ng-style="{'background-color':index.backgroundColor}" class="button round expand m0" - ng-click="wordsC.goToStep(4);" + ng-click="backupC.goToStep(4);" translate>Continue

@@ -171,8 +182,8 @@ ## STEP 4 --> -
-
+
+
@@ -185,7 +196,7 @@ @@ -201,7 +212,7 @@
-
+
@@ -222,7 +233,7 @@
diff --git a/public/views/buyCoinbase.html b/public/views/buyCoinbase.html index 59e3b8fee..3f14b6e96 100644 --- a/public/views/buyCoinbase.html +++ b/public/views/buyCoinbase.html @@ -106,7 +106,7 @@

+ href ui-sref="coinbase">OK
@@ -161,8 +161,7 @@ Bitcoin purchase completed. Coinbase has queued the transfer to your selected Copay wallet.

- +
diff --git a/public/views/buyGlidera.html b/public/views/buyGlidera.html index ca276ccfd..6eec1f7af 100644 --- a/public/views/buyGlidera.html +++ b/public/views/buyGlidera.html @@ -115,10 +115,7 @@ A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 2-4 business days.

- +
diff --git a/public/views/coinbase.html b/public/views/coinbase.html index 293d489bc..f23c7fc79 100644 --- a/public/views/coinbase.html +++ b/public/views/coinbase.html @@ -11,7 +11,7 @@
- +
@@ -43,7 +43,7 @@ Reconnect
- Or go to Preferences and log out manually. + Or go to Preferences and log out manually.
@@ -102,7 +102,7 @@
  • + href ui-sref="buyCoinbase"> buy bitcoin Buy Bitcoin @@ -110,7 +110,7 @@
  • + href ui-sref="sellCoinbase"> sell bitcoin Sell Bitcoin diff --git a/public/views/glidera.html b/public/views/glidera.html index 11a4f7a66..020bbb832 100644 --- a/public/views/glidera.html +++ b/public/views/glidera.html @@ -28,7 +28,7 @@ Retry
@@ -94,7 +94,7 @@
-
+
Preferences @@ -136,7 +136,7 @@ ng-show="index.glideraStatus && index.glideraStatus.userCanTransact">
  • + href ui-sref="buyGlidera"> buy bitcoin Buy Bitcoin @@ -145,7 +145,7 @@
  • + href ui-sref="sellGlidera"> buy bitcoin Sell Bitcoin diff --git a/public/views/includes/sidebar.html b/public/views/includes/sidebar.html index 4b5675c00..4f7794a0e 100644 --- a/public/views/includes/sidebar.html +++ b/public/views/includes/sidebar.html @@ -7,18 +7,15 @@
      -
    • +
    • diff --git a/public/views/includes/topbar.html b/public/views/includes/topbar.html index c26d18381..371eaaaaa 100644 --- a/public/views/includes/topbar.html +++ b/public/views/includes/topbar.html @@ -4,14 +4,13 @@ - - {{'Back'|translate}} + + Back - {{'Close'|translate}} + Close diff --git a/public/views/preferences.html b/public/views/preferences.html index d1eff3ea9..97c55ec42 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -12,7 +12,7 @@
        -
      • +
      • {{index.alias||index.walletName}} @@ -20,7 +20,7 @@
        Alias
      • -
      • +
      • Disabled {{index.preferences.email}} @@ -29,7 +29,7 @@
        Email Notifications
      • -
      • +
      • @@ -45,7 +45,7 @@
        Hardware wallet
      • -
      • +
      • Not completed @@ -55,7 +55,7 @@
        Backup
      • -
      • +
      • Advanced
      • @@ -78,7 +78,7 @@
          -
        • +
        • Delete recovery phrase
        • diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html index bde19af47..b1e845597 100644 --- a/public/views/preferencesAbout.html +++ b/public/views/preferencesAbout.html @@ -1,5 +1,5 @@ -
          @@ -11,30 +11,30 @@
        • Version - v{{v.version}} - + v{{v.version}} +
        • Commit hash #{{v.commitHash}} - +
        - +

          -
        • - +
        • + Terms of Use
        • -
        • - +
        • + Translators
        • -
        • - +
        • + Session log
        diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html index 6cb6dfb55..1c2c557ff 100644 --- a/public/views/preferencesAdvanced.html +++ b/public/views/preferencesAdvanced.html @@ -1,5 +1,5 @@ -
        @@ -7,35 +7,35 @@

        - +
          -
        • - +
        • +
          Wallet Information
        • -
        • - +
        • +
          Sweep paper wallet
        • - -
        • - + +
        • +
          Export Wallet
        • - -
        • - + +
        • +
          Wallet Service URL
        • -
        • +
        • Transaction History
        • -
        • +
        • Delete Wallet
        • diff --git a/public/views/preferencesGlobal.html b/public/views/preferencesGlobal.html index 02f346db8..13ccb736e 100644 --- a/public/views/preferencesGlobal.html +++ b/public/views/preferencesGlobal.html @@ -6,7 +6,7 @@

            -
          • +
          • {{prefGlobal.currentLanguageName|translate}} @@ -17,7 +17,7 @@

              -
            • +
            • {{prefGlobal.unitName}} @@ -25,7 +25,7 @@
              Unit
            • -
            • +
            • {{prefGlobal.selectedAlternative.name}} @@ -36,7 +36,7 @@

                -
              • +
              • {{prefGlobal.feeOpts[prefGlobal.currentFeeLevel]|translate}} @@ -68,7 +68,7 @@

                  -
                • +
                • About Copay
                • diff --git a/public/views/preferencesInformation.html b/public/views/preferencesInformation.html index e8b2683d1..7ab4c4e81 100644 --- a/public/views/preferencesInformation.html +++ b/public/views/preferencesInformation.html @@ -1,5 +1,5 @@ -
                  @@ -56,7 +56,7 @@ - +
                • Derivation Strategy @@ -77,7 +77,7 @@ No private key
                • - +
                • Account ({{derivationStrategy}}) @@ -110,13 +110,13 @@
              - +

              Last Wallet Addresses

              • - {{a.address}} + {{a.address}}
                {{a.path}} · {{a.createdOn *1000 | amDateFormat:'MMMM Do YYYY, h:mm a' }} @@ -128,7 +128,7 @@
                  -
                • +
                • Scan addresses for funds
                • @@ -142,10 +142,10 @@

                  Balance By Address

                • - {{a.address}} + {{a.address}}
                  - {{(a.amount/1e8).toFixed(8)}} BTC + {{(a.amount/1e8).toFixed(8)}} BTC
              diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 2e7b1db17..8b33ebf73 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -9,9 +9,9 @@
              You do not have a wallet
              - + -
              +
              @@ -269,8 +269,7 @@

              Before receiving funds, it is necessary backup your wallet. If you lose this device, it is impossible to access your funds without a backup.

              -
              diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index 9dc4dd011..a05f881dc 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -43,6 +43,14 @@ angular.module('copayApp.controllers').controller('backupController', return false; }; + self.backTo = function(state) { + console.log(state); + if (state == 'walletHome') + go.walletHome(); + else + go.preferences(); + }; + self.goToStep = function(n) { if (n == 1) init();