From dae55abceb63a8bab8081eb367af6e452c34d646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 17 May 2016 11:10:16 -0300 Subject: [PATCH] ion refresher, ion infinite scroll and balance collapse --- public/views/backup.html | 20 +- public/views/includes/menu.html | 4 +- public/views/includes/walletInfo.html | 1 + public/views/modals/searchTransactions.html | 6 +- public/views/walletHome.html | 331 ++++++++++---------- src/css/ionic-migration.css | 1 - src/js/controllers/index.js | 4 +- src/js/controllers/walletHome.js | 9 +- src/sass/main.scss | 28 +- 9 files changed, 215 insertions(+), 189 deletions(-) diff --git a/public/views/backup.html b/public/views/backup.html index e7990c779..56d963203 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -19,7 +19,7 @@ -
+
{{wordsC.error|translate}} @@ -37,21 +37,21 @@ To restore this {{index.m}}-{{index.n}} shared wallet you will need : -
    -
  1. Your wallet recovery phrase and access to the server that coordinated the initial wallet creation. You still need {{index.m}} keys to spend.
  2. -
  3. OR the wallet recovery phrase of all copayers in the wallet
  4. -
  5. OR 1 wallet export file and the remaining quorum of wallet recovery phrases (e.g. in a 3-5 wallet: 1 wallet export file + 2 wallet recovery phrases of any of the other copayers).
  6. -
+
+ Your wallet recovery phrase and access to the server that coordinated the initial wallet creation. You still need {{index.m}} keys to spend. + OR the wallet recovery phrase of all copayers in the wallet + OR 1 wallet export file and the remaining quorum of wallet recovery phrases (e.g. in a 3-5 wallet: 1 wallet export file + 2 wallet recovery phrases of any of the other copayers). +
To restore this {{index.m}}-{{index.n}} shared wallet you will need : -
    -
  1. Your wallet recovery phrase and access to the server that coordinated the initial wallet creation. You still need {{index.m}} keys to spend.
  2. -
  3. OR the wallet recovery phrases of all copayers in the wallet
  4. -
+
+ Your wallet recovery phrase and access to the server that coordinated the initial wallet creation. You still need {{index.m}} keys to spend. + OR the wallet recovery phrases of all copayers in the wallet +
diff --git a/public/views/includes/menu.html b/public/views/includes/menu.html index 7d89c9e9f..c13a44156 100644 --- a/public/views/includes/menu.html +++ b/public/views/includes/menu.html @@ -1,6 +1,6 @@ -
+
-
+
diff --git a/public/views/includes/walletInfo.html b/public/views/includes/walletInfo.html index 81723c551..5802627e2 100644 --- a/public/views/includes/walletInfo.html +++ b/public/views/includes/walletInfo.html @@ -18,3 +18,4 @@ src="img/icon-ledger-white.svg"> +{{index.txHistory.length + '/' + index.completeHistory.length}} diff --git a/public/views/modals/searchTransactions.html b/public/views/modals/searchTransactions.html index e7e5ef22c..f9e2b23a0 100644 --- a/public/views/modals/searchTransactions.html +++ b/public/views/modals/searchTransactions.html @@ -1,9 +1,9 @@ - -

Search Transactions

+ {{'Close'|translate}} +

Search Transactions

@@ -65,4 +65,4 @@
- \ No newline at end of file + diff --git a/public/views/walletHome.html b/public/views/walletHome.html index d3447c9ea..67f40faf4 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -71,9 +71,14 @@ --> -
-
-
+ + + + +
+
{{index.updateError|translate}} @@ -86,11 +91,9 @@
- {{index.totalBalanceStr}} -
- {{index.totalBalanceAlternative}} {{index.alternativeIsoCode}} -
+ {{index.totalBalanceStr}} + {{index.totalBalanceStr}} +
{{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}
Pending Confirmation: @@ -100,7 +103,7 @@
[Balance Hidden] -
+
Tap and hold to show
@@ -113,190 +116,182 @@
-
+
-
+
+ -
-
- - - WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet. - -
- -
+ +
+
+
+ + + WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet. + +
+
+
+
+ + + WARNING: Wallet not registered + +
+
+ This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information. +
+
+ + Recreate + +
+
-
-
- - - WARNING: Wallet not registered - -
-
- This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information. -
-
- - Recreate - -
-
+
+ {{newRelease}} +
-
- {{newRelease}} -
- -
-

Payment Proposals

-

Unsent transactions

-
-
-
- -
- Total Locked Balance: - {{index.lockedBalanceStr}} - {{index.lockedBalanceAlternative}} - {{index.alternativeIsoCode}} -
-
- - - -
- No transactions yet -
- -
-

- Activity - -

- -
-
-
-
-
-
-
-
-
+
+

Payment Proposals

+

Unsent transactions

+
+
-
-
{{index.txProgress}} transactions downloaded
-
Updating transaction history. Please stand by.
+ +
+ Total Locked Balance: + {{index.lockedBalanceStr}} + {{index.lockedBalanceAlternative}} + {{index.alternativeIsoCode}}
-
-
-
-
- -
-
-   -
-
-   -
+ +

+ Activity + +

+ +
+ No transactions yet
-
-
+
-
-
-
- sync - sync - sync +
+
+
+
+
+
+
+
+
+
+
+
+
{{index.txProgress}} transactions downloaded
+
Updating transaction history. Please stand by.
+
+
-
- Received - - {{index.addressbook[btx.addressTo]}} - - {{btx.message}} + +
+
+
+ +
+
+   +
+
+   +
+
+
+ +
+
+
+ sync + sync + sync +
+
+ Received + + {{index.addressbook[btx.addressTo]}} + + {{btx.message}} + + + Sent + + + Moved + Invalid +
+
+ +
+ + + + - + + (possible double spend) + + + {{btx.amountStr}} + - - Sent - - - Moved - Invalid +
+ + + Unconfirmed + +
+
+
+ +
-
-
- - + - - - - (possible double spend) - - - {{btx.amountStr}} - - -
- - - Unconfirmed - +
+
+
+
+
+
+
+
+
+
-
-
- + + +
-
-
-
-
-
-
-
-
-
-
-
- - -
- - +
-
+