From 9d341a2cd9597b1cccc749218e6e3a00ae0beb63 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 1 Sep 2016 09:53:17 -0300 Subject: [PATCH 1/4] Missing ion-view element and bar-stable class for topbar --- public/views/add.html | 2 +- public/views/amount.html | 2 +- public/views/backup.html | 2 +- public/views/confirm.html | 2 +- public/views/preferences.html | 2 +- public/views/preferencesAbout.html | 2 +- public/views/preferencesAdvanced.html | 2 +- public/views/preferencesAlias.html | 2 +- public/views/preferencesAltCurrency.html | 2 +- public/views/preferencesBwsUrl.html | 2 +- public/views/preferencesColor.html | 2 +- public/views/preferencesDeleteWallet.html | 2 +- public/views/preferencesDeleteWords.html | 2 +- public/views/preferencesEmail.html | 2 +- public/views/preferencesFee.html | 2 +- public/views/preferencesHistory.html | 2 +- public/views/preferencesInformation.html | 2 +- public/views/preferencesLanguage.html | 2 +- public/views/preferencesLogs.html | 2 +- public/views/preferencesUnit.html | 2 +- public/views/tab-create-shared.html | 282 +++++++++++----------- public/views/tab-export-file.html | 194 +++++++-------- public/views/tab-export-qrCode.html | 38 +-- public/views/tab-home.html | 2 +- public/views/tab-import-file.html | 122 +++++----- public/views/tab-import-hardware.html | 124 +++++----- public/views/tab-import-phrase.html | 158 ++++++------ public/views/tab-receive.html | 2 +- public/views/tab-send.html | 2 +- public/views/tab-settings.html | 30 +-- public/views/termsOfUse.html | 4 +- public/views/translators.html | 2 +- public/views/walletDetails.html | 2 - 33 files changed, 507 insertions(+), 495 deletions(-) diff --git a/public/views/add.html b/public/views/add.html index 25287a4e2..0acc0abfa 100644 --- a/public/views/add.html +++ b/public/views/add.html @@ -1,5 +1,5 @@ - + {{'Add wallet' | translate}} - - Create new wallet - + + + + + + Create new wallet + - + -
- {{create.error|translate}} -
+
+ {{create.error|translate}} +
-
+ -
- - - - - - - - - - Show advanced options - Hide advanced options - - -
- -
+ + + + + + + + diff --git a/public/views/tab-export-file.html b/public/views/tab-export-file.html index db4e14aff..fd784f63b 100644 --- a/public/views/tab-export-file.html +++ b/public/views/tab-export-file.html @@ -1,102 +1,104 @@ - - Export Wallet - - - - + + + Export Wallet + + + + - + -
-
- - Failed to export -
- -
- - -
- - - Show advanced options - Hide advanced options - - - - Do not include private key - - -
- +
+
- - WARNING: The private key of this wallet is not available. The export allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export. - - -
- -
- - - - WARNING: Not including the private key allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export. - - -
- - - - -
-

Export options

- - -
-
- -
-
-

Wallet Export

-
- + Failed to export
-
- - Copy this text as it is to a safe place (notepad or email) + +
+ + +
+ + + Show advanced options + Hide advanced options + + + + Do not include private key + + +
+ + + + WARNING: The private key of this wallet is not available. The export allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export. + + +
+ +
+ + + + WARNING: Not including the private key allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export. + + +
+ + + + +
+

Export options

+ +
-
- + +
+
+

Wallet Export

+
+ +
+
+ + Copy this text as it is to a safe place (notepad or email) +
+
+
+ + diff --git a/public/views/tab-export-qrCode.html b/public/views/tab-export-qrCode.html index f524273d0..be1aa441c 100644 --- a/public/views/tab-export-qrCode.html +++ b/public/views/tab-export-qrCode.html @@ -1,23 +1,25 @@ - - Export Wallet - - - - + + + Export Wallet + + + + - + -
-
- +
+
+ +
+
From the destination device, go to Add wallet > Import wallet and scan this QR code
-
From the destination device, go to Add wallet > Import wallet and scan this QR code
-
-
-
Exporting via QR not supported for this wallet
-
+
+
Exporting via QR not supported for this wallet
+
- + + diff --git a/public/views/tab-home.html b/public/views/tab-home.html index 804fa28a3..e0e4897a3 100644 --- a/public/views/tab-home.html +++ b/public/views/tab-home.html @@ -1,4 +1,4 @@ - + Home diff --git a/public/views/tab-import-file.html b/public/views/tab-import-file.html index e0069afa8..65da3df53 100644 --- a/public/views/tab-import-file.html +++ b/public/views/tab-import-file.html @@ -1,65 +1,67 @@ - - - - - Import wallet - + + + + + + Import wallet + - + -
- {{error|translate}} -
- -
- -
- - - - - - - - - Show advanced options - Hide advanced options - - -
- - - -
+
+ {{error|translate}}
- - +
- +
+ + + + + + + + + Show advanced options + Hide advanced options + + +
+ + + +
+
+ + +
+ + + diff --git a/public/views/tab-import-hardware.html b/public/views/tab-import-hardware.html index 041f3d499..8ad5f7e24 100644 --- a/public/views/tab-import-hardware.html +++ b/public/views/tab-import-hardware.html @@ -1,71 +1,73 @@ - - - - - Import wallet - + + + + + + Import wallet + - + -
- {{error|translate}} -
- -
- -
-
- No hardware wallets supported on this device -
+
+ {{error|translate}}
-
-
- - - - - - - Shared Wallet - - - - Show advanced options - Hide advanced options - - -
- - + +
+
+ No hardware wallets supported on this device
- -
+
+
- + - + + + + Shared Wallet + + + + Show advanced options + Hide advanced options + + +
+ + + +
+
+ + +
+ + + + + diff --git a/public/views/tab-import-phrase.html b/public/views/tab-import-phrase.html index 42d4525fd..b4d637d48 100644 --- a/public/views/tab-import-phrase.html +++ b/public/views/tab-import-phrase.html @@ -1,88 +1,90 @@ - - - - - Import wallet - + + + + + + Import wallet + - + -
-
-
Could not access the wallet at the server. Please check:
-
    -
  • The password of the recovery phrase (if set)
    • -
  • The derivation path
    • -
  • The wallet service URL
    • -
-
- NOTE: To import a wallet from a 3rd party software, please go to Add Wallet > Create Wallet, and specify the Recovery Phrase there. -
-
- -
- {{error|translate}} -
-
- -
-
- -
-
- -
-
- +
+
+
Could not access the wallet at the server. Please check:
+
    +
  • The password of the recovery phrase (if set)
    • +
  • The derivation path
    • +
  • The wallet service URL
    • +
+
+ NOTE: To import a wallet from a 3rd party software, please go to Add Wallet > Create Wallet, and specify the Recovery Phrase there.
- - Show advanced options - Hide advanced options - +
+ {{error|translate}} +
+
-
+ +
- +
+
+ +
+
+ +
+
- - - - - - Testnet + + Show advanced options + Hide advanced options -
-
- - - +
+ + + + + + + + + Testnet + +
+
+ + + + + diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html index 6036b7127..cedff3b8b 100644 --- a/public/views/tab-receive.html +++ b/public/views/tab-receive.html @@ -1,5 +1,5 @@ - + {{'Receive' | translate}} diff --git a/public/views/tab-send.html b/public/views/tab-send.html index b3041548c..786618317 100644 --- a/public/views/tab-send.html +++ b/public/views/tab-send.html @@ -1,5 +1,5 @@ - + {{'Send' | translate}} diff --git a/public/views/tab-settings.html b/public/views/tab-settings.html index eec3eab45..163b6db9e 100644 --- a/public/views/tab-settings.html +++ b/public/views/tab-settings.html @@ -67,9 +67,12 @@ Enable Glidera Service + +
Others
@@ -77,20 +80,18 @@ Use Unconfirmed Funds -
-
Wallets Settings
-
-
- - {{item.name || item.id}} - - {{item.m}}-of-{{item.n}} - - - Incomplete - -
-
+
Wallets Settings
+
+ + {{item.name || item.id}} + + {{item.m}}-of-{{item.n}} + + + Incomplete +
@@ -98,6 +99,7 @@ About Bitpay Wallet
+
diff --git a/public/views/termsOfUse.html b/public/views/termsOfUse.html index b1d40739b..a0edffb52 100644 --- a/public/views/termsOfUse.html +++ b/public/views/termsOfUse.html @@ -1,10 +1,10 @@ - + {{'Back' | translate}} - +

diff --git a/public/views/translators.html b/public/views/translators.html index 84aabea3a..1f33e7857 100644 --- a/public/views/translators.html +++ b/public/views/translators.html @@ -1,5 +1,5 @@ - + {{'Translators' | translate}} {{'Back' | translate}} diff --git a/public/views/walletDetails.html b/public/views/walletDetails.html index 63e9ca4ff..577b12b83 100644 --- a/public/views/walletDetails.html +++ b/public/views/walletDetails.html @@ -1,5 +1,3 @@ - - {{wallet.name}} From e935ea64e8d420aaff604ec18d1cbbe4f0c14bc7 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 1 Sep 2016 09:25:19 -0400 Subject: [PATCH 2/4] updated create wallet method --- public/views/onboarding/tour.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/onboarding/tour.html b/public/views/onboarding/tour.html index ffaa8b41a..c3185705b 100644 --- a/public/views/onboarding/tour.html +++ b/public/views/onboarding/tour.html @@ -79,7 +79,7 @@

-
From 65e1f2dd506836707fbcdc75be81de81b55304aa Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 1 Sep 2016 10:37:02 -0300 Subject: [PATCH 3/4] fix respore --- public/views/onboarding/welcome.html | 3 +-- public/views/tab-home.html | 2 +- src/js/controllers/onboarding/welcomeController.js | 6 ------ src/js/routes.js | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/public/views/onboarding/welcome.html b/public/views/onboarding/welcome.html index 21d9018cf..f58e15aa6 100644 --- a/public/views/onboarding/welcome.html +++ b/public/views/onboarding/welcome.html @@ -6,7 +6,6 @@ Take control of your money - get started with bitcoin - -
+ diff --git a/public/views/tab-home.html b/public/views/tab-home.html index e0e4897a3..804fa28a3 100644 --- a/public/views/tab-home.html +++ b/public/views/tab-home.html @@ -1,4 +1,4 @@ - + Home diff --git a/src/js/controllers/onboarding/welcomeController.js b/src/js/controllers/onboarding/welcomeController.js index 84c628724..f217639ad 100644 --- a/src/js/controllers/onboarding/welcomeController.js +++ b/src/js/controllers/onboarding/welcomeController.js @@ -2,12 +2,6 @@ angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $log, $ionicPopup, profileService) { - $scope.goImport = function() { - $state.go('tabs.import.phrase', { - fromOnboarding: true - }); - }; - $scope.createProfile = function() { $log.debug('Creating profile'); profileService.createProfile(function(err) { diff --git a/src/js/routes.js b/src/js/routes.js index 29ba5434c..3c6e3b263 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -270,7 +270,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) .state('tabs.import', { url: '/import/:fromOnboarding', - abstract: true, +// abstract: true, views: { 'tab-home': { templateUrl: 'views/import.html' From 91d1b16508524385193e19df3f1cb61c1610eb46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Thu, 1 Sep 2016 10:12:06 -0300 Subject: [PATCH 4/4] translations --- public/views/confirm.html | 2 +- public/views/copayers.html | 8 +------- public/views/includes/walletActivity.html | 10 +++++----- public/views/join.html | 4 ++-- public/views/modals/addressbook.html | 8 ++++---- public/views/modals/search.html | 2 +- public/views/modals/txp-details.html | 2 +- public/views/modals/wallets.html | 8 ++++---- public/views/preferences.html | 4 ++-- public/views/preferencesAbout.html | 2 +- public/views/sellGlidera.html | 1 - public/views/tab-create-personal.html | 4 ++-- public/views/tab-create-shared.html | 4 ++-- public/views/tab-export-file.html | 4 ++-- public/views/tab-export-qrCode.html | 4 ++-- public/views/tab-home.html | 18 +++++++++--------- public/views/tab-import-file.html | 4 ++-- public/views/tab-import-hardware.html | 4 ++-- public/views/tab-import-phrase.html | 2 +- public/views/tab-scan.html | 2 +- public/views/tab-settings.html | 12 ++++++------ public/views/walletDetails.html | 6 +++--- 22 files changed, 54 insertions(+), 61 deletions(-) diff --git a/public/views/confirm.html b/public/views/confirm.html index ffbffb1b4..d2f74bb4c 100644 --- a/public/views/confirm.html +++ b/public/views/confirm.html @@ -42,7 +42,7 @@
- Add Description + Add Description {{description}} diff --git a/public/views/copayers.html b/public/views/copayers.html index 66f9133d3..bba6bec26 100644 --- a/public/views/copayers.html +++ b/public/views/copayers.html @@ -4,17 +4,11 @@ {{wallet.name}} - - - -

Share this invitation with your copayers

diff --git a/public/views/includes/walletActivity.html b/public/views/includes/walletActivity.html index 8574d8497..fca106357 100644 --- a/public/views/includes/walletActivity.html +++ b/public/views/includes/walletActivity.html @@ -9,7 +9,7 @@
- Payment Sent + Payment Sent
{{x.amountStr}}
@@ -18,7 +18,7 @@
- Payment Received + Payment Received
{{x.amountStr}}
@@ -26,12 +26,12 @@
- Proposal Deleted + Proposal Deleted
- Proposal Rejected + Proposal Rejected
@@ -43,7 +43,7 @@ - Proposal Accepted + Proposal Accepted
diff --git a/public/views/join.html b/public/views/join.html index 54f6805c8..7529baf11 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -2,10 +2,10 @@ - Join shared wallet + {{'Join shared wallet' | translate}} diff --git a/public/views/modals/addressbook.html b/public/views/modals/addressbook.html index db6b28dd8..6607d1a3a 100644 --- a/public/views/modals/addressbook.html +++ b/public/views/modals/addressbook.html @@ -1,7 +1,7 @@
@@ -11,7 +11,7 @@ @@ -56,7 +56,7 @@