diff --git a/Gruntfile.js b/Gruntfile.js
index 4f43bc7aa..d936ce969 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -146,7 +146,7 @@ module.exports = function(grunt) {
'src/js/externalServices.js',
'src/js/init.js',
'src/js/trezor-url.js',
- 'bower_components/trezor-connect/login.js',
+ 'bower_components/trezor-connect/connect.js',
'node_modules/bezier-easing/dist/bezier-easing.min.js',
'node_modules/cordova-plugin-qrscanner/dist/cordova-plugin-qrscanner-lib.min.js'
],
diff --git a/app-template/bitpay/appConfig.json b/app-template/bitpay/appConfig.json
index de3102e51..7b1aa089b 100644
--- a/app-template/bitpay/appConfig.json
+++ b/app-template/bitpay/appConfig.json
@@ -22,8 +22,8 @@
"windowsAppId": "2d1002d7-ee34-4f60-bd29-0c871ba0c195",
"pushSenderId": "1036948132229",
"description": "Secure Bitcoin Wallet",
- "version": "3.0.7",
- "androidVersion": "306000",
+ "version": "3.1.1",
+ "androidVersion": "311000",
"_extraCSS": null,
"_enabledExtensions": {
"coinbase": true,
diff --git a/app-template/copay/appConfig.json b/app-template/copay/appConfig.json
index f2aa21af5..8c7de8828 100644
--- a/app-template/copay/appConfig.json
+++ b/app-template/copay/appConfig.json
@@ -22,8 +22,8 @@
"windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
"pushSenderId": "1036948132229",
"description": "A Secure Bitcoin Wallet",
- "version": "3.0.7",
- "androidVersion": "306000",
+ "version": "3.1.1",
+ "androidVersion": "311000",
"_extraCSS": null,
"_enabledExtensions": {
"coinbase": true,
diff --git a/app-template/package-template.json b/app-template/package-template.json
index 46015f139..c6b567f25 100644
--- a/app-template/package-template.json
+++ b/app-template/package-template.json
@@ -94,6 +94,7 @@
"build:windows": "cordova prepare windows && cordova build windows -- --arch=\"x86\"",
"build:ios-release": "cordova prepare ios && cordova build ios --release",
"build:android-release": "cordova prepare android && cordova build android --release",
+ "build:windows-release": "cordova prepare windows && cordova build windows --release --arch=\"x86\"",
"build:desktop": "grunt desktop",
"build:macos": "grunt macos",
"open:ios": "open platforms/ios/*.xcodeproj",
@@ -101,6 +102,7 @@
"final:www": "npm run build:www-release",
"final:ios": "npm run final:www && npm run build:ios-release && npm run open:ios",
"final:android": "npm run final:www && npm run build:android-release && npm run sign:android && npm run run:android-release",
+ "final:windows": "npm run final:www && npm run build:windows-release",
"final:desktop": "npm run build:desktop && npm run build:macos",
"run:android": "cordova run android --device",
"run:android-release": "cordova run android --device --release",
diff --git a/bower.json b/bower.json
index ac2e0a9ee..56a7d7904 100644
--- a/bower.json
+++ b/bower.json
@@ -11,11 +11,11 @@
"angular-gettext": "2.2.1",
"angular-moment": "0.10.1",
"angular-qrcode": "bitpay/angular-qrcode#~6.3.0",
- "ionic": "1.3.1",
+ "ionic": "https://github.com/driftyco/ionic-v1.git",
"moment": "2.10.3",
"ng-lodash": "0.2.3",
"qrcode-decoder-js": "*",
- "trezor-connect": "~1.0.1",
+ "trezor-connect": "~1.1.3",
"ng-csv": "~0.3.6",
"ionic-toast": "^0.4.1",
"angular-clipboard": "^1.4.2",
@@ -23,6 +23,7 @@
"ngtouch": "^1.0.1"
},
"resolutions": {
- "angular": "1.5.3"
+ "angular": "1.5.3",
+ "ionic": "298ad4b645"
}
}
diff --git a/i18n/po/template.pot b/i18n/po/template.pot
index 08aa072c0..f1bf056fc 100644
--- a/i18n/po/template.pot
+++ b/i18n/po/template.pot
@@ -10,7 +10,7 @@ msgstr ""
#: www/views/includes/txp.html:27
#: www/views/modals/search.html:27
-#: www/views/walletDetails.html:269
+#: www/views/walletDetails.html:273
msgid "(possible double spend)"
msgstr ""
@@ -36,16 +36,16 @@ msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTX
msgstr ""
#: src/js/controllers/preferencesAbout.js:6
-#: www/views/tab-settings.html:146
+#: www/views/tab-settings.html:156
msgid "About"
msgstr ""
#: src/js/controllers/modals/txpDetails.js:52
-#: src/js/controllers/tx-details.js:59
+#: src/js/controllers/tx-details.js:62
msgid "Accepted"
msgstr ""
-#: www/views/preferencesInformation.html:59
+#: www/views/preferencesInformation.html:66
msgid "Account"
msgstr ""
@@ -129,7 +129,7 @@ msgstr ""
msgid "Addresses With Balance"
msgstr ""
-#: www/views/tab-settings.html:139
+#: www/views/tab-settings.html:149
msgid "Advanced"
msgstr ""
@@ -197,6 +197,10 @@ msgstr ""
msgid "Are you being watched?"
msgstr ""
+#: src/js/controllers/preferencesExternal.js:15
+msgid "Are you being watched? Anyone with your recovery phrase can access or spend your bitcoin."
+msgstr ""
+
#: src/js/controllers/copayers.js:42
msgid "Are you sure you want to cancel and delete this wallet?"
msgstr ""
@@ -245,7 +249,7 @@ msgstr ""
msgid "BIP32 path for address derivation"
msgstr ""
-#: www/views/preferences.html:45
+#: www/views/preferences.html:39
msgid "Backup"
msgstr ""
@@ -253,8 +257,12 @@ msgstr ""
msgid "Backup Needed"
msgstr ""
-#: www/views/preferences.html:47
-#: www/views/tab-settings.html:110
+#: src/js/controllers/lock.js:51
+msgid "Backup all livenet wallets before using this function"
+msgstr ""
+
+#: www/views/preferences.html:41
+#: www/views/tab-settings.html:120
msgid "Backup needed"
msgstr ""
@@ -267,11 +275,15 @@ msgstr ""
msgid "Backup wallet"
msgstr ""
-#: src/js/services/profileService.js:429
+#: src/js/controllers/lock.js:48
+msgid "Backup your wallet before using this function"
+msgstr ""
+
+#: src/js/services/profileService.js:430
msgid "Bad wallet invitation"
msgstr ""
-#: www/views/preferencesInformation.html:89
+#: www/views/preferencesInformation.html:96
msgid "Balance By Address"
msgstr ""
@@ -321,11 +333,11 @@ msgid "Broadcast Payment"
msgstr ""
#: src/js/controllers/modals/txpDetails.js:54
-#: src/js/controllers/tx-details.js:61
+#: src/js/controllers/tx-details.js:64
msgid "Broadcasted"
msgstr ""
-#: src/js/services/onGoingProcess.js:10
+#: src/js/services/onGoingProcess.js:11
msgid "Broadcasting transaction"
msgstr ""
@@ -341,15 +353,16 @@ msgstr ""
msgid "Buy Bitcoin"
msgstr ""
-#: src/js/services/onGoingProcess.js:39
+#: src/js/services/onGoingProcess.js:40
msgid "Buying Bitcoin..."
msgstr ""
-#: src/js/services/onGoingProcess.js:11
+#: src/js/services/onGoingProcess.js:12
msgid "Calculating fee"
msgstr ""
#: src/js/controllers/confirm.js:494
+#: src/js/controllers/lock.js:100
#: src/js/services/popupService.js:59
#: www/views/addressbook.add.html:10
#: www/views/feedback/send.html:5
@@ -359,11 +372,11 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: src/js/controllers/onboarding/tour.js:55
+#: src/js/controllers/onboarding/tour.js:56
msgid "Cannot Create Wallet"
msgstr ""
-#: src/js/services/profileService.js:425
+#: src/js/services/profileService.js:426
msgid "Cannot join the same wallet more that once"
msgstr ""
@@ -375,6 +388,10 @@ msgstr ""
msgid "Certified by"
msgstr ""
+#: www/views/preferencesExternal.html:19
+msgid "Check installation and retry."
+msgstr ""
+
#: www/views/tab-import-file.html:4
msgid "Choose a backup file from your computer"
msgstr ""
@@ -407,7 +424,7 @@ msgstr ""
msgid "Close"
msgstr ""
-#: www/views/preferences.html:28
+#: www/views/preferences.html:22
msgid "Color"
msgstr ""
@@ -415,7 +432,7 @@ msgstr ""
msgid "Commit hash"
msgstr ""
-#: www/views/preferences.html:59
+#: www/views/preferences.html:53
msgid "Complete the backup process to use this option"
msgstr ""
@@ -433,11 +450,15 @@ msgstr ""
msgid "Confirm & Finish"
msgstr ""
-#: src/js/services/walletService.js:878
+#: www/views/pin.html:9
+msgid "Confirm your PIN"
+msgstr ""
+
+#: src/js/services/walletService.js:938
msgid "Confirm your new spending password"
msgstr ""
-#: www/views/tx-details.html:88
+#: www/views/tx-details.html:92
msgid "Confirmations"
msgstr ""
@@ -449,11 +470,11 @@ msgstr ""
msgid "Connect my BitPay Card"
msgstr ""
-#: src/js/services/onGoingProcess.js:12
+#: src/js/services/onGoingProcess.js:13
msgid "Connecting to Coinbase..."
msgstr ""
-#: src/js/services/onGoingProcess.js:13
+#: src/js/services/onGoingProcess.js:14
msgid "Connecting to Glidera..."
msgstr ""
@@ -465,6 +486,7 @@ msgstr ""
msgid "Contacts"
msgstr ""
+#: src/js/controllers/lock.js:99
#: www/views/onboarding/notifications.html:9
msgid "Continue"
msgstr ""
@@ -489,7 +511,7 @@ msgstr ""
msgid "Copayer joined"
msgstr ""
-#: www/views/preferencesInformation.html:81
+#: www/views/preferencesInformation.html:88
msgid "Copayer {{$index}}"
msgstr ""
@@ -512,7 +534,7 @@ msgstr ""
msgid "Could not access the wallet at the server. Please check:"
msgstr ""
-#: src/js/services/profileService.js:492
+#: src/js/services/profileService.js:493
msgid "Could not access wallet"
msgstr ""
@@ -528,7 +550,7 @@ msgstr ""
msgid "Could not build transaction"
msgstr ""
-#: src/js/services/walletService.js:791
+#: src/js/services/walletService.js:836
msgid "Could not create address"
msgstr ""
@@ -536,7 +558,7 @@ msgstr ""
msgid "Could not create using the specified extended private key"
msgstr ""
-#: src/js/services/profileService.js:352
+#: src/js/services/profileService.js:353
msgid "Could not create using the specified extended public key"
msgstr ""
@@ -564,17 +586,17 @@ msgstr ""
msgid "Could not get transactions"
msgstr ""
-#: src/js/services/profileService.js:594
-#: src/js/services/profileService.js:626
-#: src/js/services/profileService.js:649
+#: src/js/services/profileService.js:595
+#: src/js/services/profileService.js:627
+#: src/js/services/profileService.js:650
msgid "Could not import"
msgstr ""
-#: src/js/services/profileService.js:563
+#: src/js/services/profileService.js:564
msgid "Could not import. Check input file and spending password"
msgstr ""
-#: src/js/services/profileService.js:438
+#: src/js/services/profileService.js:439
msgid "Could not join wallet"
msgstr ""
@@ -591,7 +613,7 @@ msgstr ""
msgid "Could not remove card"
msgstr ""
-#: src/js/services/walletService.js:712
+#: src/js/services/walletService.js:757
msgid "Could not save preferences on the server"
msgstr ""
@@ -646,11 +668,11 @@ msgstr ""
msgid "Created by"
msgstr ""
-#: src/js/services/onGoingProcess.js:17
+#: src/js/services/onGoingProcess.js:18
msgid "Creating Wallet..."
msgstr ""
-#: src/js/services/onGoingProcess.js:16
+#: src/js/services/onGoingProcess.js:17
msgid "Creating transaction"
msgstr ""
@@ -684,11 +706,11 @@ msgstr ""
msgid "Delete it and create a new one"
msgstr ""
-#: src/js/services/onGoingProcess.js:18
+#: src/js/services/onGoingProcess.js:19
msgid "Deleting Wallet..."
msgstr ""
-#: src/js/services/onGoingProcess.js:27
+#: src/js/services/onGoingProcess.js:28
msgid "Deleting payment proposal"
msgstr ""
@@ -703,6 +725,11 @@ msgstr ""
msgid "Derivation Strategy"
msgstr ""
+#: src/js/controllers/lock.js:12
+#: src/js/controllers/tab-settings.js:58
+msgid "Disabled"
+msgstr ""
+
#: www/views/includes/backupNeededPopup.html:10
#: www/views/onboarding/backupRequest.html:12
msgid "Do it later"
@@ -746,6 +773,14 @@ msgstr ""
msgid "Empty addresses limit reached. New addresses cannot be generated."
msgstr ""
+#: src/js/controllers/lock.js:26
+msgid "Enable Fingerprint"
+msgstr ""
+
+#: src/js/controllers/lock.js:17
+msgid "Enable PIN"
+msgstr ""
+
#: www/views/tab-scan.html:19
msgid "Enable camera access in your device settings to get started."
msgstr ""
@@ -766,8 +801,8 @@ msgstr ""
msgid "Enter Amount"
msgstr ""
-#: src/js/services/walletService.js:892
-#: src/js/services/walletService.js:907
+#: src/js/services/walletService.js:952
+#: src/js/services/walletService.js:967
msgid "Enter Spending Password"
msgstr ""
@@ -775,7 +810,7 @@ msgstr ""
msgid "Enter Two Factor for your BitPay account"
msgstr ""
-#: src/js/services/walletService.js:874
+#: src/js/services/walletService.js:934
msgid "Enter new spending password"
msgstr ""
@@ -802,12 +837,12 @@ msgstr ""
#: src/js/controllers/confirm.js:190
#: src/js/controllers/confirm.js:196
#: src/js/controllers/copayers.js:53
-#: src/js/controllers/create.js:109
-#: src/js/controllers/create.js:137
-#: src/js/controllers/create.js:150
-#: src/js/controllers/create.js:157
-#: src/js/controllers/create.js:172
-#: src/js/controllers/create.js:190
+#: src/js/controllers/create.js:117
+#: src/js/controllers/create.js:145
+#: src/js/controllers/create.js:158
+#: src/js/controllers/create.js:165
+#: src/js/controllers/create.js:194
+#: src/js/controllers/create.js:212
#: src/js/controllers/export.js:109
#: src/js/controllers/export.js:115
#: src/js/controllers/export.js:126
@@ -835,21 +870,23 @@ msgstr ""
#: src/js/controllers/import.js:54
#: src/js/controllers/import.js:67
#: src/js/controllers/import.js:88
-#: src/js/controllers/join.js:115
-#: src/js/controllers/join.js:129
-#: src/js/controllers/join.js:136
-#: src/js/controllers/join.js:150
-#: src/js/controllers/join.js:168
-#: src/js/controllers/join.js:93
+#: src/js/controllers/join.js:119
+#: src/js/controllers/join.js:133
+#: src/js/controllers/join.js:140
+#: src/js/controllers/join.js:171
+#: src/js/controllers/join.js:189
+#: src/js/controllers/join.js:97
#: src/js/controllers/modals/txpDetails.js:130
#: src/js/controllers/paperWallet.js:47
#: src/js/controllers/preferencesBitpayCard.js:20
#: src/js/controllers/preferencesBitpayServices.js:33
#: src/js/controllers/preferencesBitpayServices.js:50
#: src/js/controllers/preferencesDelete.js:37
+#: src/js/controllers/preferencesExternal.js:20
#: src/js/controllers/tab-home.js:170
#: src/js/controllers/tabsController.js:7
-#: src/js/controllers/tx-details.js:99
+#: src/js/controllers/tx-details.js:102
+#: src/js/services/incomingData.js:98
msgid "Error"
msgstr ""
@@ -857,7 +894,7 @@ msgstr ""
msgid "Error at confirm"
msgstr ""
-#: src/js/services/profileService.js:395
+#: src/js/services/profileService.js:396
msgid "Error creating wallet"
msgstr ""
@@ -905,16 +942,16 @@ msgstr ""
msgid "Export wallet"
msgstr ""
-#: src/js/services/walletService.js:1019
+#: src/js/services/walletService.js:1079
#: www/views/tab-export-qrCode.html:9
msgid "Exporting via QR not supported for this wallet"
msgstr ""
-#: www/views/preferencesInformation.html:76
+#: www/views/preferencesInformation.html:83
msgid "Extended Public Keys"
msgstr ""
-#: src/js/services/onGoingProcess.js:19
+#: src/js/services/onGoingProcess.js:20
msgid "Extracting Wallet Information..."
msgstr ""
@@ -942,11 +979,11 @@ msgstr ""
msgid "Feedback could not be submitted. Please try again later."
msgstr ""
-#: src/js/services/onGoingProcess.js:41
+#: src/js/services/onGoingProcess.js:42
msgid "Fetching BitPay Account..."
msgstr ""
-#: src/js/services/onGoingProcess.js:20
+#: src/js/services/onGoingProcess.js:21
msgid "Fetching Payment Information"
msgstr ""
@@ -1001,11 +1038,11 @@ msgstr ""
msgid "Funds will be transferred to"
msgstr ""
-#: src/js/services/onGoingProcess.js:21
+#: src/js/services/onGoingProcess.js:22
msgid "Generating .csv file..."
msgstr ""
-#: src/js/services/onGoingProcess.js:36
+#: src/js/services/onGoingProcess.js:37
msgid "Generating new address..."
msgstr ""
@@ -1025,7 +1062,7 @@ msgstr ""
msgid "Get started by adding your first one."
msgstr ""
-#: src/js/services/onGoingProcess.js:22
+#: src/js/services/onGoingProcess.js:23
msgid "Getting fee levels..."
msgstr ""
@@ -1034,7 +1071,7 @@ msgstr ""
#: src/js/controllers/preferencesLanguage.js:14
#: src/js/controllers/tab-home.js:145
#: src/js/controllers/tab-settings.js:48
-#: src/js/controllers/tx-details.js:160
+#: src/js/controllers/tx-details.js:163
msgid "Go Back"
msgstr ""
@@ -1050,11 +1087,15 @@ msgstr ""
msgid "Got it"
msgstr ""
-#: www/views/preferences.html:22
#: www/views/preferencesInformation.html:47
+#: www/views/preferencesInformation.html:53
msgid "Hardware Wallet"
msgstr ""
+#: www/views/preferencesExternal.html:18
+msgid "Hardware not connected."
+msgstr ""
+
#: www/views/import.html:20
msgid "Hardware wallet"
msgstr ""
@@ -1071,7 +1112,7 @@ msgstr ""
msgid "Hide"
msgstr ""
-#: www/views/preferences.html:38
+#: www/views/preferences.html:32
msgid "Hide Balance"
msgstr ""
@@ -1146,7 +1187,7 @@ msgstr ""
msgid "I've written it down"
msgstr ""
-#: www/views/preferences.html:56
+#: www/views/preferences.html:50
msgid "If enabled, all sensitive information (private key and recovery phrase) and actions (spending and exporting) associated with this wallet will be protected."
msgstr ""
@@ -1187,7 +1228,7 @@ msgstr ""
msgid "Import wallet"
msgstr ""
-#: src/js/services/onGoingProcess.js:23
+#: src/js/services/onGoingProcess.js:24
msgid "Importing Wallet..."
msgstr ""
@@ -1198,7 +1239,7 @@ msgstr ""
#: www/views/includes/walletItem.html:11
#: www/views/includes/walletSelector.html:18
#: www/views/tab-home.html:89
-#: www/views/tab-settings.html:107
+#: www/views/tab-settings.html:117
msgid "Incomplete"
msgstr ""
@@ -1206,6 +1247,10 @@ msgstr ""
msgid "Incomplete wallet"
msgstr ""
+#: www/views/pin.html:11
+msgid "Incorrect PIN, try again."
+msgstr ""
+
#: src/js/services/bwcError.js:113
msgid "Incorrect address network"
msgstr ""
@@ -1225,13 +1270,13 @@ msgid "Insufficient funds for fee"
msgstr ""
#: www/views/modals/search.html:70
-#: www/views/walletDetails.html:256
+#: www/views/walletDetails.html:260
msgid "Invalid"
msgstr ""
-#: src/js/controllers/create.js:157
+#: src/js/controllers/create.js:165
#: src/js/controllers/import.js:298
-#: src/js/controllers/join.js:136
+#: src/js/controllers/join.js:140
msgid "Invalid account number"
msgstr ""
@@ -1243,12 +1288,17 @@ msgstr ""
msgid "Invalid data"
msgstr ""
-#: src/js/controllers/create.js:137
+#: src/js/controllers/create.js:145
#: src/js/controllers/import.js:232
-#: src/js/controllers/join.js:115
+#: src/js/controllers/join.js:119
msgid "Invalid derivation path"
msgstr ""
+#: src/js/controllers/create.js:187
+#: src/js/controllers/join.js:163
+msgid "Invalid seed source id:"
+msgstr ""
+
#: src/js/controllers/copayers.js:74
msgid "Invitation to share a {{appName}} Wallet"
msgstr ""
@@ -1290,7 +1340,7 @@ msgstr ""
msgid "Join shared wallet"
msgstr ""
-#: src/js/services/onGoingProcess.js:24
+#: src/js/services/onGoingProcess.js:25
msgid "Joining Wallet..."
msgstr ""
@@ -1320,10 +1370,15 @@ msgstr ""
msgid "Loading addresses..."
msgstr ""
-#: src/js/services/onGoingProcess.js:34
+#: src/js/services/onGoingProcess.js:35
msgid "Loading transaction info..."
msgstr ""
+#: www/views/lock.html:3
+#: www/views/tab-settings.html:95
+msgid "Lock App"
+msgstr ""
+
#: www/views/modals/wallet-balance.html:80
msgid "Locked"
msgstr ""
@@ -1336,6 +1391,10 @@ msgstr ""
msgid "Locktime in effect. Please wait to remove this spend proposal"
msgstr ""
+#: www/views/walletDetails.html:243
+msgid "Low fees"
+msgstr ""
+
#: www/views/paymentUri.html:13
msgid "Make a payment to"
msgstr ""
@@ -1349,7 +1408,7 @@ msgid "Matches:"
msgstr ""
#: www/views/includes/copayers.html:4
-#: www/views/preferencesInformation.html:72
+#: www/views/preferencesInformation.html:79
msgid "Me"
msgstr ""
@@ -1357,7 +1416,7 @@ msgstr ""
msgid "Meh - it's alright"
msgstr ""
-#: src/js/controllers/tx-details.js:132
+#: src/js/controllers/tx-details.js:135
#: www/views/modals/paypro.html:48
#: www/views/modals/txp-details.html:95
#: www/views/tx-details.html:74
@@ -1380,18 +1439,18 @@ msgstr ""
msgid "Missing private keys to sign"
msgstr ""
-#: www/views/preferences.html:71
+#: www/views/preferences.html:65
#: www/views/preferencesAdvanced.html:3
msgid "More Options"
msgstr ""
#: www/views/modals/search.html:67
#: www/views/tx-details.html:19
-#: www/views/walletDetails.html:254
+#: www/views/walletDetails.html:258
msgid "Moved"
msgstr ""
-#: src/js/controllers/tx-details.js:110
+#: src/js/controllers/tx-details.js:113
msgid "Moved Funds"
msgstr ""
@@ -1451,6 +1510,10 @@ msgstr ""
msgid "No contacts yet"
msgstr ""
+#: www/views/preferencesExternal.html:12
+msgid "No hardware information available."
+msgstr ""
+
#: www/views/tab-import-hardware.html:3
msgid "No hardware wallets supported on this device"
msgstr ""
@@ -1553,6 +1616,10 @@ msgstr ""
msgid "On this screen you can see all your wallets, accounts, and assets."
msgstr ""
+#: www/views/lockedView.html:14
+msgid "One-touch Sign In"
+msgstr ""
+
#: src/js/controllers/tab-settings.js:47
msgid "Open"
msgstr ""
@@ -1569,7 +1636,7 @@ msgstr ""
msgid "Open GitHub Project"
msgstr ""
-#: src/js/controllers/tx-details.js:159
+#: src/js/controllers/tx-details.js:162
msgid "Open Insight"
msgstr ""
@@ -1644,7 +1711,7 @@ msgstr ""
msgid "Payment Proposals"
msgstr ""
-#: src/js/services/payproService.js:42
+#: src/js/services/payproService.js:32
msgid "Payment Protocol Invalid"
msgstr ""
@@ -1696,7 +1763,7 @@ msgstr ""
msgid "Permanently delete this wallet."
msgstr ""
-#: src/js/services/profileService.js:387
+#: src/js/services/profileService.js:388
msgid "Personal Wallet"
msgstr ""
@@ -1712,16 +1779,24 @@ msgstr ""
msgid "Please enter the recovery phrase"
msgstr ""
-#: src/js/controllers/create.js:109
-#: src/js/controllers/join.js:93
+#: src/js/controllers/create.js:117
+#: src/js/controllers/join.js:97
msgid "Please enter the required fields"
msgstr ""
-#: src/js/controllers/create.js:150
-#: src/js/controllers/join.js:129
+#: src/js/controllers/create.js:158
+#: src/js/controllers/join.js:133
msgid "Please enter the wallet recovery phrase"
msgstr ""
+#: www/views/pin.html:8
+msgid "Please enter your PIN"
+msgstr ""
+
+#: www/views/lockedView.html:15
+msgid "Please place your fingertip on the scanner to verify your identity"
+msgstr ""
+
#: www/views/backup.html:46
msgid "Please tap each word in the correct order."
msgstr ""
@@ -1738,7 +1813,7 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: src/js/services/onGoingProcess.js:37
+#: src/js/services/onGoingProcess.js:38
msgid "Preparing addresses..."
msgstr ""
@@ -1746,7 +1821,7 @@ msgstr ""
msgid "Preparing backup..."
msgstr ""
-#: src/js/routes.js:1144
+#: src/js/routes.js:1196
msgid "Press again to exit"
msgstr ""
@@ -1767,7 +1842,7 @@ msgid "Proposal Accepted"
msgstr ""
#: src/js/controllers/modals/txpDetails.js:51
-#: src/js/controllers/tx-details.js:58
+#: src/js/controllers/tx-details.js:61
#: www/views/confirm.html:124
msgid "Proposal Created"
msgstr ""
@@ -1800,8 +1875,8 @@ msgstr ""
msgid "Quick review!"
msgstr ""
-#: src/js/controllers/create.js:69
-#: src/js/controllers/join.js:53
+#: src/js/controllers/create.js:65
+#: src/js/controllers/join.js:50
msgid "Random"
msgstr ""
@@ -1828,12 +1903,12 @@ msgstr ""
msgid "Received"
msgstr ""
-#: src/js/controllers/tx-details.js:109
+#: src/js/controllers/tx-details.js:112
msgid "Received Funds"
msgstr ""
#: www/views/tx-details.html:24
-#: www/views/walletDetails.html:262
+#: www/views/walletDetails.html:266
msgid "Receiving"
msgstr ""
@@ -1869,16 +1944,16 @@ msgstr ""
msgid "Recreate"
msgstr ""
-#: src/js/services/onGoingProcess.js:25
+#: src/js/services/onGoingProcess.js:26
msgid "Recreating Wallet..."
msgstr ""
#: src/js/controllers/modals/txpDetails.js:53
-#: src/js/controllers/tx-details.js:60
+#: src/js/controllers/tx-details.js:63
msgid "Rejected"
msgstr ""
-#: src/js/services/onGoingProcess.js:26
+#: src/js/services/onGoingProcess.js:27
msgid "Rejecting payment proposal"
msgstr ""
@@ -1906,7 +1981,7 @@ msgstr ""
msgid "Repeat the password"
msgstr ""
-#: www/views/preferences.html:66
+#: www/views/preferences.html:60
msgid "Request Fingerprint"
msgstr ""
@@ -1914,7 +1989,7 @@ msgstr ""
msgid "Request Specific amount"
msgstr ""
-#: www/views/preferences.html:53
+#: www/views/preferences.html:47
msgid "Request Spending Password"
msgstr ""
@@ -1926,11 +2001,11 @@ msgstr ""
msgid "Restore from backup"
msgstr ""
-#: src/js/services/onGoingProcess.js:28
+#: src/js/services/onGoingProcess.js:29
msgid "Retrieving inputs information"
msgstr ""
-#: src/js/controllers/onboarding/tour.js:59
+#: src/js/controllers/onboarding/tour.js:60
msgid "Retry"
msgstr ""
@@ -1959,11 +2034,15 @@ msgstr ""
msgid "Scan addresses for funds"
msgstr ""
+#: www/views/lockedView.html:17
+msgid "Scan again"
+msgstr ""
+
#: src/js/services/fingerprintService.js:56
msgid "Scan your fingerprint please"
msgstr ""
-#: src/js/services/onGoingProcess.js:29
+#: src/js/services/onGoingProcess.js:30
msgid "Scanning Wallet funds..."
msgstr ""
@@ -1987,7 +2066,7 @@ msgstr ""
msgid "Search your currency"
msgstr ""
-#: www/views/preferences.html:41
+#: www/views/preferences.html:35
msgid "Security"
msgstr ""
@@ -2003,7 +2082,7 @@ msgstr ""
msgid "Self-signed Certificate"
msgstr ""
-#: src/js/services/onGoingProcess.js:40
+#: src/js/services/onGoingProcess.js:41
msgid "Selling Bitcoin..."
msgstr ""
@@ -2052,15 +2131,15 @@ msgstr ""
#: www/views/includes/txp.html:14
#: www/views/modals/txp-details.html:19
#: www/views/tx-details.html:23
-#: www/views/walletDetails.html:261
+#: www/views/walletDetails.html:265
msgid "Sending"
msgstr ""
-#: src/js/services/onGoingProcess.js:38
+#: src/js/services/onGoingProcess.js:39
msgid "Sending 2FA code..."
msgstr ""
-#: src/js/services/onGoingProcess.js:35
+#: src/js/services/onGoingProcess.js:36
msgid "Sending feedback..."
msgstr ""
@@ -2068,7 +2147,7 @@ msgstr ""
msgid "Sending maximum amount"
msgstr ""
-#: src/js/services/onGoingProcess.js:30
+#: src/js/services/onGoingProcess.js:31
msgid "Sending transaction"
msgstr ""
@@ -2079,11 +2158,11 @@ msgstr ""
#: www/views/modals/search.html:60
#: www/views/modals/tx-status.html:9
#: www/views/tx-details.html:17
-#: www/views/walletDetails.html:249
+#: www/views/walletDetails.html:253
msgid "Sent"
msgstr ""
-#: src/js/controllers/tx-details.js:108
+#: src/js/controllers/tx-details.js:111
msgid "Sent Funds"
msgstr ""
@@ -2113,8 +2192,7 @@ msgid "Settings"
msgstr ""
#: www/views/customAmount.html:20
-#: www/views/tab-receive.html:62
-#: www/views/tab-settings.html:36
+#: www/views/tab-receive.html:67
msgid "Share"
msgstr ""
@@ -2132,6 +2210,7 @@ msgid "Share this invitation with your copayers"
msgstr ""
#: src/js/controllers/feedback/complete.js:5
+#: www/views/tab-settings.html:36
msgid "Share {{appName}}"
msgstr ""
@@ -2139,6 +2218,14 @@ msgstr ""
msgid "Shared Wallet"
msgstr ""
+#: www/views/preferencesExternal.html:34
+msgid "Show Recovery Phrase"
+msgstr ""
+
+#: www/views/tab-receive.html:58
+msgid "Show address"
+msgstr ""
+
#: www/views/join.html:45
#: www/views/tab-create-personal.html:24
#: www/views/tab-create-shared.html:54
@@ -2161,7 +2248,7 @@ msgstr ""
msgid "Signatures rejected by server"
msgstr ""
-#: src/js/services/onGoingProcess.js:31
+#: src/js/services/onGoingProcess.js:32
msgid "Signing transaction"
msgstr ""
@@ -2183,8 +2270,8 @@ msgstr ""
msgid "Slide"
msgstr ""
-#: src/js/controllers/create.js:72
-#: src/js/controllers/join.js:56
+#: src/js/controllers/create.js:69
+#: src/js/controllers/join.js:53
msgid "Specify Recovery Phrase..."
msgstr ""
@@ -2220,7 +2307,7 @@ msgstr ""
msgid "Sweep paper wallet"
msgstr ""
-#: src/js/services/onGoingProcess.js:32
+#: src/js/services/onGoingProcess.js:33
msgid "Sweeping Wallet..."
msgstr ""
@@ -2272,7 +2359,7 @@ msgstr ""
msgid "That's exciting to hear. We'd love to earn that fifth star from you – how could we improve your experience?"
msgstr ""
-#: src/js/services/ledger.js:136
+#: src/js/services/ledger.js:152
msgid "The Ledger Chrome application is not installed"
msgstr ""
@@ -2312,7 +2399,7 @@ msgstr ""
msgid "The password of the recovery phrase (if set)"
msgstr ""
-#: src/js/services/walletService.js:984
+#: src/js/services/walletService.js:1044
msgid "The payment was created but could not be completed. Please try again from home screen"
msgstr ""
@@ -2392,13 +2479,17 @@ msgstr ""
msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed."
msgstr ""
+#: www/views/tx-details.html:89
+msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender"
+msgstr ""
+
#: www/views/walletDetails.html:116
#: www/views/walletDetails.html:35
msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information."
msgstr ""
#: www/views/modals/txp-details.html:137
-#: www/views/tx-details.html:102
+#: www/views/tx-details.html:106
msgid "Timeline"
msgstr ""
@@ -2453,7 +2544,7 @@ msgstr ""
msgid "Transaction created"
msgstr ""
-#: src/js/controllers/tx-details.js:99
+#: src/js/controllers/tx-details.js:102
msgid "Transaction not available at this time"
msgstr ""
@@ -2466,6 +2557,10 @@ msgstr ""
msgid "Transfer to Wallet"
msgstr ""
+#: www/views/pin.html:12
+msgid "Try again in {{expires}}"
+msgstr ""
+
#: www/views/bitpayCardIntro.html:18
msgid "Turn bitcoin into dollars, swipe anywhere Visa® is accepted."
msgstr ""
@@ -2479,7 +2574,7 @@ msgid "Uh oh..."
msgstr ""
#: www/views/modals/search.html:36
-#: www/views/tx-details.html:90
+#: www/views/tx-details.html:94
msgid "Unconfirmed"
msgstr ""
@@ -2523,11 +2618,12 @@ msgstr ""
msgid "Use Unconfirmed Funds"
msgstr ""
-#: src/js/services/onGoingProcess.js:33
+#: src/js/services/onGoingProcess.js:34
msgid "Validating recovery phrase..."
msgstr ""
#: www/views/preferencesAbout.html:14
+#: www/views/preferencesExternal.html:25
msgid "Version"
msgstr ""
@@ -2543,7 +2639,7 @@ msgstr ""
msgid "View Terms of Service"
msgstr ""
-#: src/js/controllers/tx-details.js:158
+#: src/js/controllers/tx-details.js:161
msgid "View Transaction on Insight"
msgstr ""
@@ -2551,7 +2647,7 @@ msgstr ""
msgid "View Update"
msgstr ""
-#: www/views/tx-details.html:128
+#: www/views/tx-details.html:132
msgid "View on blockchain"
msgstr ""
@@ -2571,11 +2667,11 @@ msgstr ""
msgid "WARNING: UNTRUSTED CERTIFICATE"
msgstr ""
-#: src/js/services/onGoingProcess.js:14
+#: src/js/services/onGoingProcess.js:15
msgid "Waiting for Ledger..."
msgstr ""
-#: src/js/services/onGoingProcess.js:15
+#: src/js/services/onGoingProcess.js:16
msgid "Waiting for Trezor..."
msgstr ""
@@ -2660,7 +2756,7 @@ msgstr ""
msgid "Wallet already exists"
msgstr ""
-#: src/js/services/profileService.js:497
+#: src/js/services/profileService.js:498
msgid "Wallet already in Copay"
msgstr ""
@@ -2722,13 +2818,14 @@ msgstr ""
msgid "Wallets"
msgstr ""
-#: www/views/tab-settings.html:92
+#: www/views/tab-settings.html:102
msgid "Wallets & Integrations"
msgstr ""
#: src/js/controllers/modals/txpDetails.js:143
#: src/js/controllers/modals/txpDetails.js:160
#: src/js/controllers/preferencesDelete.js:25
+#: src/js/controllers/preferencesExternal.js:14
#: www/views/preferencesDeleteWallet.html:11
msgid "Warning!"
msgstr ""
@@ -2867,7 +2964,7 @@ msgstr ""
msgid "Your wallet is never saved to cloud storage or standard device backups."
msgstr ""
-#: src/js/services/walletService.js:875
+#: src/js/services/walletService.js:935
msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down."
msgstr ""
@@ -2883,7 +2980,7 @@ msgstr ""
msgid "add your BitPay Visa card(s)"
msgstr ""
-#: www/views/tab-receive.html:70
+#: www/views/tab-receive.html:75
msgid "address not available"
msgstr ""
@@ -2891,11 +2988,15 @@ msgstr ""
msgid "address not yet available"
msgstr ""
+#: src/js/controllers/lockedView.js:5
+msgid "is locked"
+msgstr ""
+
#: www/views/includes/available-balance.html:8
msgid "locked by pending payments"
msgstr ""
-#: src/js/services/profileService.js:388
+#: src/js/services/profileService.js:389
msgid "me"
msgstr ""
@@ -2925,6 +3026,10 @@ msgstr ""
msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)."
msgstr ""
+#: src/js/controllers/lock.js:96
+msgid "{{appName}} is protected by Pin. Are you sure you want to disable it?"
+msgstr ""
+
#: www/views/includes/confirm-tx.html:23
msgid "{{feeRateStr}} of the transaction"
msgstr ""
@@ -2938,6 +3043,6 @@ msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr ""
#: www/views/copayers.html:46
-#: www/views/includes/walletInfo.html:11
+#: www/views/includes/walletInfo.html:12
msgid "{{wallet.m}}-of-{{wallet.n}}"
msgstr ""
diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js
index c5cd65103..5b213b053 100644
--- a/src/js/controllers/advancedSettings.js
+++ b/src/js/controllers/advancedSettings.js
@@ -1,6 +1,6 @@
'use strict';
-angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $rootScope, $log, $window, lodash, configService, uxLanguage, platformInfo, profileService, feeService, storageService, $ionicHistory, $timeout, $ionicScrollDelegate) {
+angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $log, configService) {
var updateConfig = function() {
var config = configService.getSync();
@@ -11,7 +11,6 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
$scope.recentTransactionsEnabled = {
value: config.recentTransactions.enabled
};
-
$scope.hideNextSteps = {
value: config.hideNextSteps.enabled
};
@@ -31,7 +30,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
$scope.nextStepsChange = function() {
var opts = {
hideNextSteps: {
- enabled: $scope.hideNextSteps.value
+ enabled: $scope.hideNextSteps.value
},
};
configService.set(opts, function(err) {
diff --git a/src/js/controllers/amazonCards.js b/src/js/controllers/amazonCards.js
index 329c620fc..c0e42b791 100644
--- a/src/js/controllers/amazonCards.js
+++ b/src/js/controllers/amazonCards.js
@@ -29,15 +29,18 @@ angular.module('copayApp.controllers').controller('amazonCardsController',
var index = 0;
var gcds = $scope.giftCards;
lodash.forEach(gcds, function(dataFromStorage) {
- if (dataFromStorage.status == 'PENDING') {
- $log.debug("creating gift card");
+ if (dataFromStorage.status == 'PENDING' || dataFromStorage.status == 'invalid') {
+ $log.debug("Creating / Updating gift card");
$scope.updatingPending[dataFromStorage.invoiceId] = true;
+
amazonService.createGiftCard(dataFromStorage, function(err, giftCard) {
+
$scope.updatingPending[dataFromStorage.invoiceId] = false;
if (err) {
popupService.showAlert('Error creating gift card', err);
return;
}
+
if (giftCard.status != 'PENDING') {
var newData = {};
diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index 4202b8e01..83634db45 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -1,6 +1,6 @@
'use strict';
-angular.module('copayApp.controllers').controller('amountController', function($scope, $filter, $timeout, $ionicScrollDelegate, $ionicHistory, gettextCatalog, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService, ongoingProcess, popupService, bwcError, payproService, profileService, bitcore, amazonService) {
+angular.module('copayApp.controllers').controller('amountController', function($scope, $filter, $timeout, $ionicScrollDelegate, $ionicHistory, gettextCatalog, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService, ongoingProcess, popupService, bwcError, payproService, profileService, bitcore, amazonService, nodeWebkitService) {
var _cardId;
var unitToSatoshi;
var satToUnit;
@@ -8,6 +8,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
var satToBtc;
var SMALL_FONT_SIZE_LIMIT = 10;
var LENGTH_EXPRESSION_LIMIT = 19;
+ var isNW = platformInfo.isNW;
$scope.isChromeApp = platformInfo.isChromeApp;
$scope.$on('$ionicView.leave', function() {
@@ -15,14 +16,14 @@ angular.module('copayApp.controllers').controller('amountController', function($
});
$scope.$on("$ionicView.beforeEnter", function(event, data) {
-
// Go to...
_cardId = data.stateParams.id; // Optional (BitPay Card ID)
$scope.nextStep = data.stateParams.nextStep;
$scope.currency = data.stateParams.currency;
$scope.forceCurrency = data.stateParams.forceCurrency;
- $scope.showMenu = $ionicHistory.backView() && $ionicHistory.backView().stateName == 'tabs.send';
+ $scope.showMenu = $ionicHistory.backView() && ($ionicHistory.backView().stateName == 'tabs.send' ||
+ $ionicHistory.backView().stateName == 'tabs.bitpayCard');
$scope.recipientType = data.stateParams.recipientType || null;
$scope.toAddress = data.stateParams.toAddress;
$scope.toName = data.stateParams.toName;
@@ -42,18 +43,20 @@ angular.module('copayApp.controllers').controller('amountController', function($
var reOp = /^[\*\+\-\/]$/;
var disableKeys = angular.element($window).on('keydown', function(e) {
+ if (!e.key) return;
if (e.which === 8) { // you can add others here inside brackets.
e.preventDefault();
$scope.removeDigit();
}
- if (e.key && e.key.match(reNr))
+ if (e.key.match(reNr)) {
$scope.pushDigit(e.key);
-
- else if (e.key && e.key.match(reOp))
+ } else if (e.key.match(reOp)) {
$scope.pushOperator(e.key);
-
- else if (e.key && e.key == 'Enter')
+ } else if (e.keyCode === 86) {
+ if (e.ctrlKey || e.metaKey)
+ processClipboard();
+ } else if (e.keyCode === 13)
$scope.finish();
$timeout(function() {
@@ -82,28 +85,35 @@ angular.module('copayApp.controllers').controller('amountController', function($
$scope.amount = (($stateParams.toAmount) * satToUnit).toFixed(unitDecimals);
}
- processAmount($scope.amount);
+ processAmount();
$timeout(function() {
$ionicScrollDelegate.resize();
}, 10);
});
+ function paste(value) {
+ $scope.amount = value;
+ processAmount();
+ $timeout(function() {
+ $scope.$apply();
+ });
+ };
+
+ function processClipboard() {
+ if (!isNW) return;
+ var value = nodeWebkitService.readFromClipboard();
+ if (value && evaluate(value) > 0) paste(evaluate(value));
+ };
+
$scope.showSendMaxMenu = function() {
$scope.showSendMax = true;
};
$scope.sendMax = function() {
$scope.showSendMax = false;
- $state.transitionTo('tabs.send.confirm', {
- recipientType: $scope.recipientType,
- toAmount: null,
- toAddress: $scope.toAddress,
- toName: $scope.toName,
- toEmail: $scope.toEmail,
- toColor: $scope.toColor,
- useSendMax: true,
- });
+ $scope.useSendMax = true;
+ $scope.finish();
};
$scope.toggleAlternative = function() {
@@ -128,7 +138,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
$scope.amount = ($scope.amount + digit).replace('..', '.');
checkFontSize();
- processAmount($scope.amount);
+ processAmount();
};
$scope.pushOperator = function(operator) {
@@ -156,7 +166,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
$scope.removeDigit = function() {
$scope.amount = $scope.amount.slice(0, -1);
- processAmount($scope.amount);
+ processAmount();
checkFontSize();
};
@@ -166,17 +176,12 @@ angular.module('copayApp.controllers').controller('amountController', function($
checkFontSize();
};
- function processAmount(val) {
- if (!val) {
- $scope.resetAmount();
- return;
- }
-
- var formatedValue = format(val);
+ function processAmount() {
+ var formatedValue = format($scope.amount);
var result = evaluate(formatedValue);
$scope.allowSend = lodash.isNumber(result) && +result > 0;
if (lodash.isNumber(result)) {
- $scope.globalResult = isExpression(val) ? '= ' + processResult(result) : '';
+ $scope.globalResult = isExpression($scope.amount) ? '= ' + processResult(result) : '';
$scope.amountResult = $filter('formatFiatAmount')(toFiat(result));
$scope.alternativeResult = txFormatService.formatAmount(fromFiat(result) * unitToSatoshi, true);
}
@@ -223,8 +228,9 @@ angular.module('copayApp.controllers').controller('amountController', function($
if ($scope.nextStep) {
$state.transitionTo($scope.nextStep, {
id: _cardId,
- amount: _amount,
- currency: $scope.showAlternativeAmount ? $scope.alternativeIsoCode : ''
+ amount: $scope.useSendMax ? null : _amount,
+ currency: $scope.showAlternativeAmount ? $scope.alternativeIsoCode : $scope.unitName,
+ useSendMax: $scope.useSendMax
});
} else {
var amount = $scope.showAlternativeAmount ? fromFiat(_amount) : _amount;
@@ -236,13 +242,15 @@ angular.module('copayApp.controllers').controller('amountController', function($
} else {
$state.transitionTo('tabs.send.confirm', {
recipientType: $scope.recipientType,
- toAmount: (amount * unitToSatoshi).toFixed(0),
+ toAmount: $scope.useSendMax ? null : (amount * unitToSatoshi).toFixed(0),
toAddress: $scope.toAddress,
toName: $scope.toName,
toEmail: $scope.toEmail,
toColor: $scope.toColor,
+ useSendMax: $scope.useSendMax
});
}
}
+ $scope.useSendMax = null;
};
});
diff --git a/src/js/controllers/backController.js b/src/js/controllers/backController.js
index f1fa38b68..510354649 100644
--- a/src/js/controllers/backController.js
+++ b/src/js/controllers/backController.js
@@ -1,10 +1,6 @@
'use strict';
-angular.module('copayApp.controllers').controller('backController', function($scope, $state, $stateParams, platformInfo) {
-
- var isCordova = platformInfo.isCordova;
- var isWP = platformInfo.isWP;
- var usePushNotifications = isCordova && !isWP;
+angular.module('copayApp.controllers').controller('backController', function($scope, $state, $stateParams) {
$scope.importGoBack = function() {
if ($stateParams.fromOnboarding) $state.go('onboarding.welcome');
@@ -12,8 +8,7 @@ angular.module('copayApp.controllers').controller('backController', function($sc
};
$scope.onboardingMailSkip = function() {
- if (!usePushNotifications) $state.go('onboarding.backupRequest');
- else $state.go('onboarding.notifications');
+ $state.go('onboarding.backupRequest');
}
});
diff --git a/src/js/controllers/buyAmazon.js b/src/js/controllers/buyAmazon.js
index b51d34763..48c502869 100644
--- a/src/js/controllers/buyAmazon.js
+++ b/src/js/controllers/buyAmazon.js
@@ -112,8 +112,13 @@ angular.module('copayApp.controllers').controller('buyAmazonController', functio
$scope.network = amazonService.getNetwork();
$scope.wallets = profileService.getWallets({
onlyComplete: true,
- network: $scope.network
+ network: $scope.network,
+ hasFunds: true
});
+ if (lodash.isEmpty($scope.wallets)) {
+ showErrorAndBack('No wallets with funds');
+ return;
+ }
$scope.wallet = $scope.wallets[0]; // Default first wallet
});
@@ -140,7 +145,13 @@ angular.module('copayApp.controllers').controller('buyAmazonController', functio
amazonService.createBitPayInvoice(dataSrc, function(err, dataInvoice) {
if (err) {
ongoingProcess.set('buyingGiftCard', false, statusChangeHandler);
- showError('Error creating BitPay invoice', err);
+
+ if (err && err.message && err.message.match(/suspended/i)) {
+ showError('Service not available', 'Amazon Gift Card Service is not available at this moment. Please try back later.');
+ } else {
+ showError('Could not access Gift Card Service', err);
+ };
+
return;
}
diff --git a/src/js/controllers/buyCoinbase.js b/src/js/controllers/buyCoinbase.js
index b259552cd..8c1bd2ea9 100644
--- a/src/js/controllers/buyCoinbase.js
+++ b/src/js/controllers/buyCoinbase.js
@@ -1,6 +1,6 @@
'use strict';
-angular.module('copayApp.controllers').controller('buyCoinbaseController', function($scope, $log, $state, $timeout, $ionicHistory, $ionicScrollDelegate, lodash, coinbaseService, popupService, profileService, ongoingProcess, walletService) {
+angular.module('copayApp.controllers').controller('buyCoinbaseController', function($scope, $log, $state, $timeout, $ionicHistory, $ionicScrollDelegate, lodash, coinbaseService, popupService, profileService, ongoingProcess, walletService, txFormatService) {
var amount;
var currency;
@@ -34,8 +34,8 @@ angular.module('copayApp.controllers').controller('buyCoinbaseController', funct
};
$scope.$on("$ionicView.beforeEnter", function(event, data) {
- $scope.isFiat = data.stateParams.currency ? true : false;
- var parsedAmount = coinbaseService.parseAmount(
+ $scope.isFiat = data.stateParams.currency != 'bits' && data.stateParams.currency != 'BTC' ? true : false;
+ var parsedAmount = txFormatService.parseAmount(
data.stateParams.amount,
data.stateParams.currency);
@@ -48,6 +48,11 @@ angular.module('copayApp.controllers').controller('buyCoinbaseController', funct
onlyComplete: true,
network: $scope.network
});
+
+ if (lodash.isEmpty($scope.wallets)) {
+ showErrorAndBack('No wallets available');
+ return;
+ }
$scope.wallet = $scope.wallets[0]; // Default first wallet
ongoingProcess.set('connectingCoinbase', true);
diff --git a/src/js/controllers/buyGlidera.js b/src/js/controllers/buyGlidera.js
index 7839685cc..33afa5c00 100644
--- a/src/js/controllers/buyGlidera.js
+++ b/src/js/controllers/buyGlidera.js
@@ -1,6 +1,6 @@
'use strict';
-angular.module('copayApp.controllers').controller('buyGlideraController', function($scope, $log, $state, $timeout, $ionicHistory, lodash, glideraService, popupService, profileService, ongoingProcess, walletService, platformInfo) {
+angular.module('copayApp.controllers').controller('buyGlideraController', function($scope, $log, $state, $timeout, $ionicHistory, lodash, glideraService, popupService, profileService, ongoingProcess, walletService, platformInfo, txFormatService) {
var amount;
var currency;
@@ -36,8 +36,8 @@ angular.module('copayApp.controllers').controller('buyGlideraController', functi
};
$scope.$on("$ionicView.beforeEnter", function(event, data) {
- $scope.isFiat = data.stateParams.currency ? true : false;
- var parsedAmount = glideraService.parseAmount(
+ $scope.isFiat = data.stateParams.currency != 'bits' && data.stateParams.currency != 'BTC' ? true : false;
+ var parsedAmount = txFormatService.parseAmount(
data.stateParams.amount,
data.stateParams.currency);
@@ -50,6 +50,11 @@ angular.module('copayApp.controllers').controller('buyGlideraController', functi
onlyComplete: true,
network: $scope.network
});
+
+ if (lodash.isEmpty($scope.wallets)) {
+ showErrorAndBack('No wallets available');
+ return;
+ }
$scope.wallet = $scope.wallets[0]; // Default first wallet
ongoingProcess.set('connectingGlidera', true);
diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index 1b44ae283..1e54684ed 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -1,11 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('createController',
- function($scope, $rootScope, $timeout, $log, lodash, $state, $ionicScrollDelegate, $ionicHistory, profileService, configService, gettextCatalog, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess, walletService, storageService, popupService, appConfigService) {
-
- var isChromeApp = platformInfo.isChromeApp;
- var isCordova = platformInfo.isCordova;
- var isDevel = platformInfo.isDevel;
+ function($scope, $rootScope, $timeout, $log, lodash, $state, $ionicScrollDelegate, $ionicHistory, profileService, configService, gettextCatalog, ledger, trezor, intelTEE, derivationPathHelper, ongoingProcess, walletService, storageService, popupService, appConfigService) {
/* For compressed keys, m*73 + n*34 <= 496 */
var COPAYER_PAIR_LIMITS = {
@@ -67,9 +63,11 @@ angular.module('copayApp.controllers').controller('createController',
var seedOptions = [{
id: 'new',
label: gettextCatalog.getString('Random'),
- }, {
+ supportsTestnet: true
+ }, {
id: 'set',
label: gettextCatalog.getString('Specify Recovery Phrase...'),
+ supportsTestnet: false
}];
$scope.seedSource = seedOptions[0];
@@ -81,16 +79,26 @@ angular.module('copayApp.controllers').controller('createController',
*/
if (appConfigService.name == 'copay') {
- if (n > 1 && isChromeApp) {
+ if (n > 1 && walletService.externalSource.ledger.supported)
seedOptions.push({
- id: 'ledger',
- label: 'Ledger Hardware Wallet',
+ id: walletService.externalSource.ledger.id,
+ label: walletService.externalSource.ledger.longName,
+ supportsTestnet: walletService.externalSource.ledger.supportsTestnet
+ });
+
+ if (walletService.externalSource.trezor.supported) {
+ seedOptions.push({
+ id: walletService.externalSource.trezor.id,
+ label: walletService.externalSource.trezor.longName,
+ supportsTestnet: walletService.externalSource.trezor.supportsTestnet
});
}
- if (isChromeApp || isDevel) {
+
+ if (walletService.externalSource.intelTEE.supported) {
seedOptions.push({
- id: 'trezor',
- label: 'Trezor Hardware Wallet',
+ id: walletService.externalSource.intelTEE.id,
+ label: walletService.externalSource.intelTEE.longName,
+ supportsTestnet: walletService.externalSource.intelTEE.supportsTestnet
});
}
}
@@ -151,23 +159,37 @@ angular.module('copayApp.controllers').controller('createController',
return;
}
- if ($scope.seedSource.id == 'ledger' || $scope.seedSource.id == 'trezor') {
+ if ($scope.seedSource.id == walletService.externalSource.ledger.id || $scope.seedSource.id == walletService.externalSource.trezor.id || $scope.seedSource.id == walletService.externalSource.intelTEE.id) {
var account = $scope.formData.account;
if (!account || account < 1) {
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid account number'));
return;
}
- if ($scope.seedSource.id == 'trezor')
+ if ($scope.seedSource.id == walletService.externalSource.trezor.id || $scope.seedSource.id == walletService.externalSource.intelTEE.id)
account = account - 1;
opts.account = account;
- ongoingProcess.set('connecting' + $scope.seedSource.id, true);
+ ongoingProcess.set('connecting ' + $scope.seedSource.id, true);
- var src = $scope.seedSource.id == 'ledger' ? ledger : trezor;
+ var src;
+ switch ($scope.seedSource.id) {
+ case walletService.externalSource.ledger.id:
+ src = ledger;
+ break;
+ case walletService.externalSource.trezor.id:
+ src = trezor;
+ break;
+ case walletService.externalSource.intelTEE.id:
+ src = intelTEE;
+ break;
+ default:
+ this.error = gettextCatalog.getString('Invalid seed source id: ' + $scope.seedSource.id);
+ return;
+ }
- src.getInfoForNewWallet(opts.n > 1, account, function(err, lopts) {
- ongoingProcess.set('connecting' + $scope.seedSource.id, false);
+ src.getInfoForNewWallet(opts.n > 1, account, opts.networkName, function(err, lopts) {
+ ongoingProcess.set('connecting ' + $scope.seedSource.id, false);
if (err) {
popupService.showAlert(gettextCatalog.getString('Error'), err);
return;
@@ -211,6 +233,6 @@ angular.module('copayApp.controllers').controller('createController',
}, 100);
} else $state.go('tabs.home');
});
- }, 100);
+ }, 300);
}
});
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index 3b1c96771..c5657d5cf 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -8,8 +8,8 @@ angular.module('copayApp.controllers').controller('importController',
var errors = bwcService.getErrors();
$scope.init = function() {
- $scope.isDevel = platformInfo.isDevel;
- $scope.isChromeApp = platformInfo.isChromeApp;
+ $scope.supportsLedger = platformInfo.supportsLedger;
+ $scope.supportsTrezor = platformInfo.supportsTrezor;
$scope.isCordova = platformInfo.isCordova;
$scope.formData = {};
$scope.formData.bwsurl = defaults.bws.url;
@@ -23,17 +23,17 @@ angular.module('copayApp.controllers').controller('importController',
$scope.seedOptions = [];
- if ($scope.isChromeApp) {
+ if ($scope.supportsLedger) {
$scope.seedOptions.push({
- id: 'ledger',
- label: 'Ledger Hardware Wallet',
+ id: walletService.externalSource.ledger.id,
+ label: walletService.externalSource.ledger.longName,
});
}
- if ($scope.isChromeApp || $scope.isDevel) {
+ if ($scope.supportsTrezor) {
$scope.seedOptions.push({
- id: 'trezor',
- label: 'Trezor Hardware Wallet',
+ id: walletService.externalSource.trezor.id,
+ label: walletService.externalSource.trezor.longName,
});
$scope.formData.seedSource = $scope.seedOptions[0];
}
@@ -260,14 +260,14 @@ angular.module('copayApp.controllers').controller('importController',
};
$scope.importTrezor = function(account, isMultisig) {
- trezor.getInfoForNewWallet(isMultisig, account, function(err, lopts) {
+ trezor.getInfoForNewWallet(isMultisig, account, 'livenet', function(err, lopts) {
ongoingProcess.clear();
if (err) {
popupService.showAlert(gettextCatalog.getString('Error'), err);
return;
}
- lopts.externalSource = 'trezor';
+ lopts.externalSource = walletService.externalSource.trezor.id;
lopts.bwsurl = $scope.formData.bwsurl;
ongoingProcess.set('importingWallet', true);
$log.debug('Import opts', lopts);
@@ -293,7 +293,7 @@ angular.module('copayApp.controllers').controller('importController',
var account = $scope.formData.account;
- if ($scope.formData.seedSource.id == 'trezor') {
+ if ($scope.formData.seedSource.id == walletService.externalSource.trezor.id) {
if (account < 1) {
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid account number'));
return;
@@ -302,11 +302,11 @@ angular.module('copayApp.controllers').controller('importController',
}
switch ($scope.formData.seedSource.id) {
- case ('ledger'):
+ case (walletService.externalSource.ledger.id):
ongoingProcess.set('connectingledger', true);
$scope.importLedger(account);
break;
- case ('trezor'):
+ case (walletService.externalSource.trezor.id):
ongoingProcess.set('connectingtrezor', true);
$scope.importTrezor(account, $scope.formData.isMultisig);
break;
@@ -316,14 +316,14 @@ angular.module('copayApp.controllers').controller('importController',
};
$scope.importLedger = function(account) {
- ledger.getInfoForNewWallet(true, account, function(err, lopts) {
+ ledger.getInfoForNewWallet(true, account, 'livenet', function(err, lopts) {
ongoingProcess.clear();
if (err) {
popupService.showAlert(gettextCatalog.getString('Error'), err);
return;
}
- lopts.externalSource = 'ledger';
+ lopts.externalSource = lopts.externalSource = walletService.externalSource.ledger.id;
lopts.bwsurl = $scope.formData.bwsurl;
ongoingProcess.set('importingWallet', true);
$log.debug('Import opts', lopts);
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 74abe3228..0f416f0ea 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -1,10 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('joinController',
- function($scope, $rootScope, $timeout, $state, $ionicHistory, $ionicScrollDelegate, profileService, configService, storageService, applicationService, gettextCatalog, lodash, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess, walletService, $log, $stateParams, popupService, appConfigService) {
-
- var isChromeApp = platformInfo.isChromeApp;
- var isDevel = platformInfo.isDevel;
+ function($scope, $rootScope, $timeout, $state, $ionicHistory, $ionicScrollDelegate, profileService, configService, storageService, applicationService, gettextCatalog, lodash, ledger, trezor, intelTEE, derivationPathHelper, ongoingProcess, walletService, $log, $stateParams, popupService, appConfigService) {
var self = this;
var defaults = configService.getDefaults();
@@ -64,17 +61,24 @@ angular.module('copayApp.controllers').controller('joinController',
*/
if (appConfigService.name == 'copay') {
- if (isChromeApp) {
+ if (walletService.externalSource.ledger.supported) {
self.seedOptions.push({
- id: 'ledger',
- label: 'Ledger Hardware Wallet',
+ id: walletService.externalSource.ledger.id,
+ label: walletService.externalSource.ledger.longName
});
}
- if (isChromeApp || isDevel) {
+ if (walletService.externalSource.trezor.supported) {
self.seedOptions.push({
- id: 'trezor',
- label: 'Trezor Hardware Wallet',
+ id: walletService.externalSource.trezor.id,
+ label: walletService.externalSource.trezor.longName
+ });
+ }
+
+ if (walletService.externalSource.intelTEE.supported) {
+ seedOptions.push({
+ id: walletService.externalSource.intelTEE.id,
+ label: walletService.externalSource.intelTEE.longName
});
}
}
@@ -97,7 +101,7 @@ angular.module('copayApp.controllers').controller('joinController',
var opts = {
secret: form.secret.$modelValue,
myName: form.myName.$modelValue,
- bwsurl: $scope.bwsurl,
+ bwsurl: $scope.bwsurl
}
var setSeed = self.seedSourceId == 'set';
@@ -130,21 +134,38 @@ angular.module('copayApp.controllers').controller('joinController',
return;
}
- if (self.seedSourceId == 'ledger' || self.seedSourceId == 'trezor') {
+ if (self.seedSourceId == walletService.externalSource.ledger.id || self.seedSourceId == walletService.externalSource.trezor.id || self.seedSourceId == walletService.externalSource.intelTEE.id) {
var account = $scope.account;
if (!account || account < 1) {
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid account number'));
return;
}
- if (self.seedSourceId == 'trezor')
+ if (self.seedSourceId == walletService.externalSource.trezor.id || self.seedSourceId == walletService.externalSource.intelTEE.id)
account = account - 1;
opts.account = account;
+ opts.isMultisig = true;
ongoingProcess.set('connecting' + self.seedSourceId, true);
- var src = self.seedSourceId == 'ledger' ? ledger : trezor;
- src.getInfoForNewWallet(true, account, function(err, lopts) {
+ var src;
+ switch (self.seedSourceId) {
+ case walletService.externalSource.ledger.id:
+ src = ledger;
+ break;
+ case walletService.externalSource.trezor.id:
+ src = trezor;
+ break;
+ case walletService.externalSource.intelTEE.id:
+ src = intelTEE;
+ break;
+ default:
+ this.error = gettextCatalog.getString('Invalid seed source id: ' + self.seedSourceId);
+ return;
+ }
+
+ // TODO: cannot currently join an intelTEE testnet wallet (need to detect from the secret)
+ src.getInfoForNewWallet(true, account, 'livenet', function(err, lopts) {
ongoingProcess.set('connecting' + self.seedSourceId, false);
if (err) {
popupService.showAlert(gettextCatalog.getString('Error'), err);
diff --git a/src/js/controllers/lockSetup.js b/src/js/controllers/lockSetup.js
new file mode 100644
index 000000000..b9ad3a431
--- /dev/null
+++ b/src/js/controllers/lockSetup.js
@@ -0,0 +1,121 @@
+'use strict';
+
+angular.module('copayApp.controllers').controller('lockSetupController', function($state, $scope, $timeout, $log, configService, popupService, gettextCatalog, appConfigService, fingerprintService, profileService, lodash) {
+
+ function init() {
+ $scope.options = [
+ {
+ method: null,
+ label: gettextCatalog.getString('Disabled'),
+ },
+ {
+ method: 'pin',
+ label: gettextCatalog.getString('Lock by PIN'),
+ needsBackup: null,
+ },
+ ];
+
+ if (fingerprintService.isAvailable()) {
+ $scope.options.push({
+ method: 'fingerprint',
+ label: gettextCatalog.getString('Lock by Fingerprint'),
+ needsBackup: null,
+ });
+ }
+
+ var config = configService.getSync();
+ var method = config.lock && config.lock.method;
+ if (!method) $scope.currentOption = $scope.options[0];
+ else $scope.currentOption = lodash.find($scope.options, {
+ 'method': method
+ });
+ processWallets();
+ };
+
+ $scope.$on("$ionicView.beforeEnter", function(event) {
+ init();
+ });
+
+ function processWallets() {
+ var wallets = profileService.getWallets();
+ var singleLivenetWallet = wallets.length == 1 && wallets[0].network == 'livenet' && wallets[0].needsBackup;
+ var atLeastOneLivenetWallet = lodash.any(wallets, function(w) {
+ return w.network == 'livenet' && w.needsBackup;
+ });
+
+ if (singleLivenetWallet) {
+ $scope.errorMsg = gettextCatalog.getString('Backup your wallet before using this function');
+ disableOptsUntilBackup();
+ } else if (atLeastOneLivenetWallet) {
+ $scope.errorMsg = gettextCatalog.getString('Backup all livenet wallets before using this function');
+ disableOptsUntilBackup();
+ } else {
+ enableOptsAfterBackup();
+ $scope.errorMsg = null;
+ }
+
+ function enableOptsAfterBackup() {
+ $scope.options[1].needsBackup = false;
+ if ($scope.options[2]) $scope.options[2].needsBackup = false;
+ };
+
+ function disableOptsUntilBackup() {
+ $scope.options[1].needsBackup = true;
+ if ($scope.options[2]) $scope.options[2].needsBackup = true;
+ };
+
+ $timeout(function() {
+ $scope.$apply();
+ });
+ };
+
+ $scope.select = function(selectedMethod) {
+ var config = configService.getSync();
+ var savedMethod = config.lock && config.lock.method;
+
+ if (!selectedMethod)
+ saveConfig();
+ else if (selectedMethod == 'fingerprint') {
+ if (savedMethod == 'pin') {
+ askForDisablePin(function(disablePin) {
+ if (disablePin) saveConfig('fingerprint');
+ else init();
+ });
+ } else saveConfig('fingerprint');
+ } else if (selectedMethod == 'pin') {
+ if (savedMethod == 'pin') return;
+ $state.transitionTo('tabs.pin', {
+ fromSettings: true,
+ locking: savedMethod == 'pin' ? false : true
+ });
+ }
+ $timeout(function() {
+ $scope.$apply();
+ });
+ };
+
+ function askForDisablePin(cb) {
+ var message = gettextCatalog.getString('{{appName}} startup is locked by PIN. Are you sure you want to disable it?', {
+ appName: appConfigService.nameCase
+ });
+ var okText = gettextCatalog.getString('Continue');
+ var cancelText = gettextCatalog.getString('Cancel');
+ popupService.showConfirm(null, message, okText, cancelText, function(ok) {
+ if (!ok) return cb(false);
+ return cb(true);
+ });
+ };
+
+ function saveConfig(method) {
+ var opts = {
+ lock: {
+ method: method || null,
+ value: null,
+ }
+ };
+
+ configService.set(opts, function(err) {
+ if (err) $log.debug(err);
+ });
+ };
+});
diff --git a/src/js/controllers/lockedView.js b/src/js/controllers/lockedView.js
new file mode 100644
index 000000000..0842c5cf6
--- /dev/null
+++ b/src/js/controllers/lockedView.js
@@ -0,0 +1,17 @@
+'use strict';
+
+angular.module('copayApp.controllers').controller('lockedViewController', function($state, $scope, $ionicHistory, fingerprintService, appConfigService, gettextCatalog) {
+ $scope.$on("$ionicView.beforeEnter", function(event) {
+ $scope.title = appConfigService.nameCase + ' ' + gettextCatalog.getString('is locked');
+ $scope.appName = appConfigService.name;
+ });
+
+ $scope.requestFingerprint = function() {
+ fingerprintService.check('unlockingApp', function(err) {
+ if (err) return;
+ $state.transitionTo('tabs.home').then(function() {
+ $ionicHistory.clearHistory();
+ });
+ });
+ };
+});
diff --git a/src/js/controllers/onboarding/collectEmail.js b/src/js/controllers/onboarding/collectEmail.js
index 7a23da915..6e3d230bd 100644
--- a/src/js/controllers/onboarding/collectEmail.js
+++ b/src/js/controllers/onboarding/collectEmail.js
@@ -1,6 +1,6 @@
'use strict';
-angular.module('copayApp.controllers').controller('collectEmailController', function($scope, $state, $timeout, $stateParams, $ionicConfig, profileService, configService, walletService, platformInfo, pushNotificationsService) {
+angular.module('copayApp.controllers').controller('collectEmailController', function($scope, $state, $timeout, $stateParams, $ionicConfig, profileService, configService, walletService) {
$scope.$on("$ionicView.beforeLeave", function() {
$ionicConfig.views.swipeBackEnabled(true);
@@ -10,11 +10,6 @@ angular.module('copayApp.controllers').controller('collectEmailController', func
$ionicConfig.views.swipeBackEnabled(false);
});
- var isCordova = platformInfo.isCordova;
- var isWP = platformInfo.isWP;
- var usePushNotifications = isCordova && !isWP;
- var requiresOptIn = platformInfo.isIOS;
-
var wallet = profileService.getWallet($stateParams.walletId);
var walletId = wallet.credentials.walletId;
$scope.data = {};
@@ -37,20 +32,9 @@ angular.module('copayApp.controllers').controller('collectEmailController', func
};
$scope.goNextView = function() {
- if (!usePushNotifications) {
- $state.go('onboarding.backupRequest', {
- walletId: walletId
- });
- } else if (requiresOptIn) {
- $state.go('onboarding.notifications', {
- walletId: walletId
- });
- } else {
- pushNotificationsService.init();
- $state.go('onboarding.backupRequest', {
- walletId: walletId
- });
- }
+ $state.go('onboarding.backupRequest', {
+ walletId: walletId
+ });
};
$scope.confirm = function(emailForm) {
diff --git a/src/js/controllers/onboarding/notifications.js b/src/js/controllers/onboarding/notifications.js
deleted file mode 100644
index c4554c84b..000000000
--- a/src/js/controllers/onboarding/notifications.js
+++ /dev/null
@@ -1,53 +0,0 @@
-'use strict';
-
-angular.module('copayApp.controllers').controller('notificationsController', function($scope, $state, $timeout, $stateParams, $ionicConfig, profileService, configService, $interval, pushNotificationsService) {
-
- $scope.$on("$ionicView.enter", function() {
- $ionicConfig.views.swipeBackEnabled(false);
- });
-
- $scope.$on("$ionicView.beforeLeave", function() {
- $ionicConfig.views.swipeBackEnabled(true);
- });
-
- $scope.walletId = $stateParams.walletId;
-
- $scope.allowNotif = function() {
- $scope.notificationDialogOpen = true;
- $timeout(function() {
- pushNotificationsService.init();
- });
- $scope.notificationPromise = $interval(function() {
- PushNotification.hasPermission(function(data) {
- if (data.isEnabled) {
- $interval.cancel($scope.notificationPromise);
- $state.go('onboarding.backupRequest', {
- walletId: $scope.walletId
- });
- }
- });
- }, 100);
- }
-
- $scope.continue = function() {
- $interval.cancel($scope.notificationPromise);
- $state.go('onboarding.backupRequest', {
- walletId: $scope.walletId
- });
- }
-
- $scope.disableNotif = function() {
- var opts = {
- pushNotifications: {
- enabled: false
- }
- };
- configService.set(opts, function(err) {
- if (err) $log.warn(err);
- $state.go('onboarding.backupRequest', {
- walletId: $scope.walletId
- });
- });
- };
-
-});
diff --git a/src/js/controllers/onboarding/tour.js b/src/js/controllers/onboarding/tour.js
index c2a38791e..0135e97fb 100644
--- a/src/js/controllers/onboarding/tour.js
+++ b/src/js/controllers/onboarding/tour.js
@@ -1,10 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('tourController',
- function($scope, $state, $log, $timeout, $filter, ongoingProcess, platformInfo, profileService, rateService, popupService, gettextCatalog) {
-
- var isCordova = platformInfo.isCordova;
- var isWP = platformInfo.isWP;
- var usePushNotifications = isCordova && !isWP;
+ function($scope, $state, $log, $timeout, $filter, ongoingProcess, profileService, rateService, popupService, gettextCatalog) {
$scope.data = {
index: 0
@@ -43,38 +39,34 @@ angular.module('copayApp.controllers').controller('tourController',
var retryCount = 0;
$scope.createDefaultWallet = function() {
ongoingProcess.set('creatingWallet', true);
- profileService.createDefaultWallet(function(err, walletClient) {
- if (err) {
- $log.warn(err);
+ $timeout(function() {
+ profileService.createDefaultWallet(function(err, walletClient) {
+ if (err) {
+ $log.warn(err);
- return $timeout(function() {
- $log.warn('Retrying to create default wallet.....:' + ++retryCount);
- if (retryCount > 3) {
- ongoingProcess.set('creatingWallet', false);
- popupService.showAlert(
- gettextCatalog.getString('Cannot Create Wallet'), err,
- function() {
- retryCount = 0;
- return $scope.createDefaultWallet();
- }, gettextCatalog.getString('Retry'));
- } else {
- return $scope.createDefaultWallet();
- }
- }, 2000);
- };
- ongoingProcess.set('creatingWallet', false);
- var wallet = walletClient;
- var walletId = wallet.credentials.walletId;
- if (!usePushNotifications) {
+ return $timeout(function() {
+ $log.warn('Retrying to create default wallet.....:' + ++retryCount);
+ if (retryCount > 3) {
+ ongoingProcess.set('creatingWallet', false);
+ popupService.showAlert(
+ gettextCatalog.getString('Cannot Create Wallet'), err,
+ function() {
+ retryCount = 0;
+ return $scope.createDefaultWallet();
+ }, gettextCatalog.getString('Retry'));
+ } else {
+ return $scope.createDefaultWallet();
+ }
+ }, 2000);
+ };
+ ongoingProcess.set('creatingWallet', false);
+ var wallet = walletClient;
+ var walletId = wallet.credentials.walletId;
$state.go('onboarding.backupRequest', {
walletId: walletId
});
- } else {
- $state.go('onboarding.notifications', {
- walletId: walletId
- });
- }
- });
+ });
+ }, 300);
};
$scope.goBack = function() {
diff --git a/src/js/controllers/pin.js b/src/js/controllers/pin.js
new file mode 100644
index 000000000..3156320fd
--- /dev/null
+++ b/src/js/controllers/pin.js
@@ -0,0 +1,186 @@
+'use strict';
+
+angular.module('copayApp.controllers').controller('pinController', function($state, $interval, $stateParams, $ionicHistory, $timeout, $scope, $log, configService, appConfigService) {
+ var ATTEMPT_LIMIT = 3;
+ var ATTEMPT_LOCK_OUT_TIME = 5 * 60;
+
+ $scope.$on("$ionicView.beforeEnter", function(event) {
+ $scope.currentPin = $scope.confirmPin = '';
+ $scope.fromSettings = $stateParams.fromSettings == 'true' ? true : false;
+ $scope.locking = $stateParams.locking == 'true' ? true : false;
+ $scope.match = $scope.error = $scope.disableButtons = false;
+ $scope.currentAttempts = 0;
+ $scope.appName = appConfigService.name;
+ });
+
+ $scope.$on("$ionicView.enter", function(event) {
+ configService.whenAvailable(function(config) {
+ if (!config.lock) return;
+ $scope.bannedUntil = config.lock.bannedUntil || null;
+ if ($scope.bannedUntil) {
+ var now = Math.floor(Date.now() / 1000);
+ if (now < $scope.bannedUntil) {
+ $scope.error = $scope.disableButtons = true;
+ lockTimeControl($scope.bannedUntil);
+ }
+ }
+ });
+ });
+
+ function checkAttempts() {
+ $scope.currentAttempts += 1;
+ $log.debug('Attempts to unlock:', $scope.currentAttempts);
+ if ($scope.currentAttempts === ATTEMPT_LIMIT) {
+ $scope.currentAttempts = 0;
+ var limitTime = Math.floor(Date.now() / 1000) + ATTEMPT_LOCK_OUT_TIME;
+ var config = configService.getSync();
+ var opts = {
+ lock: {
+ method: 'pin',
+ value: config.lock.value,
+ bannedUntil: limitTime,
+ attempts: config.lock.attempts + 1,
+ }
+ };
+
+ configService.set(opts, function(err) {
+ if (err) $log.debug(err);
+ lockTimeControl(limitTime);
+ });
+ }
+ };
+
+ function lockTimeControl(limitTime) {
+ $scope.limitTimeExpired = false;
+ setExpirationTime();
+
+ var countDown = $interval(function() {
+ setExpirationTime();
+ }, 1000);
+
+ function setExpirationTime() {
+ var now = Math.floor(Date.now() / 1000);
+ if (now > limitTime) {
+ $scope.limitTimeExpired = true;
+ if (countDown) reset();
+ } else {
+ $scope.disableButtons = true;
+ var totalSecs = limitTime - now;
+ var m = Math.floor(totalSecs / 60);
+ var s = totalSecs % 60;
+ $scope.expires = ('0' + m).slice(-2) + ":" + ('0' + s).slice(-2);
+ }
+ };
+
+ function reset() {
+ $scope.expires = $scope.error = $scope.disableButtons = null;
+ $scope.currentPin = $scope.confirmPin = '';
+ $interval.cancel(countDown);
+ $timeout(function() {
+ $scope.$apply();
+ });
+ return;
+ };
+ };
+
+ $scope.getFilledClass = function(limit) {
+ return $scope.currentPin.length >= limit ? 'filled-' + $scope.appName : null;
+ };
+
+ $scope.delete = function() {
+ if ($scope.disableButtons) return;
+ if ($scope.currentPin.length > 0) {
+ $scope.currentPin = $scope.currentPin.substring(0, $scope.currentPin.length - 1);
+ $scope.error = false;
+ $scope.updatePin();
+ }
+ };
+
+ $scope.isComplete = function() {
+ if ($scope.currentPin.length < 4) return false;
+ else return true;
+ };
+
+ $scope.updatePin = function(value) {
+ if ($scope.disableButtons) return;
+ $scope.error = false;
+ if (value && !$scope.isComplete()) {
+ $scope.currentPin = $scope.currentPin + value;
+ $timeout(function() {
+ $scope.$apply();
+ });
+ }
+ $scope.save();
+ };
+
+ $scope.save = function() {
+ if (!$scope.isComplete()) return;
+ var config = configService.getSync();
+ $scope.match = config.lock && config.lock.method == 'pin' && config.lock.value == $scope.currentPin ? true : false;
+ if (!$scope.locking) {
+ if ($scope.match) {
+ if ($scope.fromSettings) saveSettings();
+ else {
+ saveSettings('pin', $scope.currentPin);
+ $scope.error = false;
+ }
+ } else {
+ $timeout(function() {
+ $scope.confirmPin = $scope.currentPin = '';
+ $scope.error = true;
+ }, 200);
+ checkAttempts();
+ }
+ } else {
+ processCodes();
+ }
+ };
+
+ function processCodes() {
+ if (!$scope.confirmPin) {
+ $timeout(function() {
+ $scope.confirmPin = $scope.currentPin;
+ $scope.currentPin = '';
+ }, 200);
+ } else {
+ if ($scope.confirmPin == $scope.currentPin)
+ saveSettings('pin', $scope.confirmPin);
+ else {
+ $scope.confirmPin = $scope.currentPin = '';
+ $scope.error = true;
+ }
+ }
+ $timeout(function() {
+ $scope.$apply();
+ });
+ };
+
+ function saveSettings(method, value) {
+ var config = configService.getSync();
+ var attempts = config.lock && config.lock.attempts ? config.lock.attempts : 0;
+ var opts = {
+ lock: {
+ method: method || null,
+ value: value || null,
+ bannedUntil: null,
+ attempts: attempts + 1,
+ }
+ };
+
+ configService.set(opts, function(err) {
+ if (err) $log.debug(err);
+ $scope.close();
+ });
+ };
+
+ $scope.close = function(delay) {
+ $timeout(function() {
+ var shouldReturn = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName != 'starting';
+
+ if (shouldReturn)
+ $ionicHistory.goBack()
+ else
+ $state.go('tabs.home');
+ }, delay || 1);
+ };
+});
diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js
index 8b1a8dde0..90ff53f29 100644
--- a/src/js/controllers/preferences.js
+++ b/src/js/controllers/preferences.js
@@ -89,9 +89,6 @@ angular.module('copayApp.controllers').controller('preferencesController',
value: $scope.wallet.balanceHidden
};
- if (wallet.isPrivKeyExternal)
- $scope.externalSource = wallet.getPrivKeyExternalSourceName() == 'ledger' ? 'Ledger' : 'Trezor';
-
$scope.touchIdAvailable = fingerprintService.isAvailable();
$scope.touchIdEnabled = {
value: config.touchIdFor ? config.touchIdFor[walletId] : null
diff --git a/src/js/controllers/preferencesExternal.js b/src/js/controllers/preferencesExternal.js
new file mode 100644
index 000000000..916dc0e60
--- /dev/null
+++ b/src/js/controllers/preferencesExternal.js
@@ -0,0 +1,28 @@
+'use strict';
+
+angular.module('copayApp.controllers').controller('preferencesExternalController', function($scope, $stateParams, lodash, gettextCatalog, popupService, profileService, walletService) {
+ var wallet = profileService.getWallet($stateParams.walletId);
+
+ $scope.externalSource = lodash.find(walletService.externalSource, function(source) {
+ return source.id == wallet.getPrivKeyExternalSourceName();
+ });
+
+ if ($scope.externalSource.isEmbeddedHardware) {
+ $scope.hardwareConnected = $scope.externalSource.version.length > 0;
+
+ $scope.showMneumonicFromHardwarePopup = function() {
+ var title = gettextCatalog.getString('Warning!');
+ var message = gettextCatalog.getString('Are you being watched? Anyone with your recovery phrase can access or spend your bitcoin.');
+ popupService.showConfirm(title, message, null, null, function(res) {
+ if (res) {
+ walletService.showMneumonicFromHardware(wallet, function(err) {
+ if (err) {
+ popupService.showAlert(gettextCatalog.getString('Error'), err.message || err);
+ }
+ });
+ }
+ });
+ };
+ }
+
+});
\ No newline at end of file
diff --git a/src/js/controllers/preferencesInformation.js b/src/js/controllers/preferencesInformation.js
index 70ba5484e..9362d883f 100644
--- a/src/js/controllers/preferencesInformation.js
+++ b/src/js/controllers/preferencesInformation.js
@@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('preferencesInformation',
- function($scope, $log, $ionicHistory, platformInfo, lodash, profileService, configService, $stateParams, $state) {
+ function($scope, $log, $ionicHistory, platformInfo, lodash, profileService, configService, $stateParams, $state, walletService) {
var wallet = profileService.getWallet($stateParams.walletId);
$scope.wallet = wallet;
@@ -44,5 +44,13 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
$scope.M = c.m;
$scope.N = c.n;
$scope.pubKeys = lodash.pluck(c.publicKeyRing, 'xPubKey');
+ $scope.externalSource = null;
+
+ if (wallet.isPrivKeyExternal()) {
+ $scope.externalSource = lodash.find(walletService.externalSource, function(source) {
+ return source.id == wallet.getPrivKeyExternalSourceName();
+ }).name;
+ }
});
+
});
diff --git a/src/js/controllers/sellCoinbase.js b/src/js/controllers/sellCoinbase.js
index a336a4ac6..9e6bf2cd8 100644
--- a/src/js/controllers/sellCoinbase.js
+++ b/src/js/controllers/sellCoinbase.js
@@ -1,6 +1,6 @@
'use strict';
-angular.module('copayApp.controllers').controller('sellCoinbaseController', function($scope, $log, $state, $timeout, $ionicHistory, $ionicScrollDelegate, lodash, coinbaseService, popupService, profileService, ongoingProcess, walletService, appConfigService, configService) {
+angular.module('copayApp.controllers').controller('sellCoinbaseController', function($scope, $log, $state, $timeout, $ionicHistory, $ionicScrollDelegate, lodash, coinbaseService, popupService, profileService, ongoingProcess, walletService, appConfigService, configService, txFormatService) {
var amount;
var currency;
@@ -117,8 +117,8 @@ angular.module('copayApp.controllers').controller('sellCoinbaseController', func
};
$scope.$on("$ionicView.beforeEnter", function(event, data) {
- $scope.isFiat = data.stateParams.currency ? true : false;
- var parsedAmount = coinbaseService.parseAmount(
+ $scope.isFiat = data.stateParams.currency != 'bits' && data.stateParams.currency != 'BTC' ? true : false;
+ var parsedAmount = txFormatService.parseAmount(
data.stateParams.amount,
data.stateParams.currency);
@@ -133,8 +133,15 @@ angular.module('copayApp.controllers').controller('sellCoinbaseController', func
$scope.wallets = profileService.getWallets({
m: 1, // Only 1-signature wallet
onlyComplete: true,
- network: $scope.network
+ network: $scope.network,
+ hasFunds: true,
+ minAmount: parsedAmount.amountSat
});
+
+ if (lodash.isEmpty($scope.wallets)) {
+ showErrorAndBack('Insufficient funds');
+ return;
+ }
$scope.wallet = $scope.wallets[0]; // Default first wallet
ongoingProcess.set('connectingCoinbase', true);
diff --git a/src/js/controllers/sellGlidera.js b/src/js/controllers/sellGlidera.js
index 3028e0df3..119dac2fa 100644
--- a/src/js/controllers/sellGlidera.js
+++ b/src/js/controllers/sellGlidera.js
@@ -1,6 +1,6 @@
'use strict';
-angular.module('copayApp.controllers').controller('sellGlideraController', function($scope, $log, $state, $timeout, $ionicHistory, lodash, glideraService, popupService, profileService, ongoingProcess, walletService, configService, platformInfo) {
+angular.module('copayApp.controllers').controller('sellGlideraController', function($scope, $log, $state, $timeout, $ionicHistory, lodash, glideraService, popupService, profileService, ongoingProcess, walletService, configService, platformInfo, txFormatService) {
var amount;
var currency;
@@ -36,8 +36,8 @@ angular.module('copayApp.controllers').controller('sellGlideraController', funct
};
$scope.$on("$ionicView.beforeEnter", function(event, data) {
- $scope.isFiat = data.stateParams.currency ? true : false;
- var parsedAmount = glideraService.parseAmount(
+ $scope.isFiat = data.stateParams.currency != 'bits' && data.stateParams.currency != 'BTC' ? true : false;
+ var parsedAmount = txFormatService.parseAmount(
data.stateParams.amount,
data.stateParams.currency);
@@ -49,8 +49,15 @@ angular.module('copayApp.controllers').controller('sellGlideraController', funct
$scope.wallets = profileService.getWallets({
m: 1, // Only 1-signature wallet
onlyComplete: true,
- network: $scope.network
+ network: $scope.network,
+ hasFunds: true,
+ minAmount: parsedAmount.amountSat
});
+
+ if (lodash.isEmpty($scope.wallets)) {
+ showErrorAndBack('Insufficient funds');
+ return;
+ }
$scope.wallet = $scope.wallets[0]; // Default first wallet
ongoingProcess.set('connectingGlidera', true);
diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index 4073e08f9..5281be998 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -145,6 +145,22 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
});
};
+ $scope.shouldShowReceiveAddressFromHardware = function() {
+ var wallet = $scope.wallet;
+ if (wallet.isPrivKeyExternal() && wallet.credentials.hwInfo) {
+ return (wallet.credentials.hwInfo.name == walletService.externalSource.intelTEE.id);
+ } else {
+ return false;
+ }
+ };
+
+ $scope.showReceiveAddressFromHardware = function() {
+ var wallet = $scope.wallet;
+ if (wallet.isPrivKeyExternal() && wallet.credentials.hwInfo) {
+ walletService.showReceiveAddressFromHardware(wallet, $scope.addr, function(){});
+ }
+ };
+
$scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.wallets = profileService.getWallets();
@@ -165,6 +181,10 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
return w.id == $scope.wallet.id;
});
if (w) $scope.updateCurrentWallet();
+ else if (screen.width > 700 && screen.height > 700 && $scope.wallets[0]) {
+ $scope.setWallet(0)
+ $scope.walletPosition(0);
+ }
}
});
diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js
index ca350bc51..843059c84 100644
--- a/src/js/controllers/tab-settings.js
+++ b/src/js/controllers/tab-settings.js
@@ -51,7 +51,12 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
$scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.isCordova = platformInfo.isCordova;
+ $scope.isDevel = platformInfo.isDevel;
$scope.appName = appConfigService.nameCase;
+ configService.whenAvailable(function(config) {
+ $scope.locked = config.lock && config.lock.method;
+ $scope.method = $scope.locked ? config.lock.method.charAt(0).toUpperCase() + config.lock.method.slice(1) : gettextCatalog.getString('Disabled');
+ });
});
$scope.$on("$ionicView.enter", function(event, data) {
diff --git a/src/js/controllers/topup.js b/src/js/controllers/topup.js
index 44c8e4148..43b1b4f43 100644
--- a/src/js/controllers/topup.js
+++ b/src/js/controllers/topup.js
@@ -1,10 +1,11 @@
'use strict';
-angular.module('copayApp.controllers').controller('topUpController', function($scope, $log, $state, $timeout, $ionicHistory, lodash, popupService, profileService, ongoingProcess, walletService, configService, platformInfo, bitpayService, bitpayCardService, payproService, bwcError) {
+angular.module('copayApp.controllers').controller('topUpController', function($scope, $log, $state, $timeout, $ionicHistory, lodash, popupService, profileService, ongoingProcess, walletService, configService, platformInfo, bitpayService, bitpayCardService, payproService, bwcError, txFormatService, sendMaxService) {
var amount;
var currency;
var cardId;
+ var sendMax;
$scope.isCordova = platformInfo.isCordova;
@@ -49,16 +50,32 @@ angular.module('copayApp.controllers').controller('topUpController', function($s
}
};
+ var checkDailyLimit = function() {
+ if (currency == 'USD' && amount > 10000) {
+ showErrorAndBack('Top up is limited to USD 10,000 per day');
+ return;
+ }
+
+ bitpayCardService.getRates('USD', function(err, data) {
+ if (err) $log.error(err);
+ $scope.rate = data.rate;
+ if (currency == 'BTC' && (amount * data.rate) > 10000) {
+ showErrorAndBack('Top up is limited to USD 10,000 per day');
+ return;
+ }
+ });
+ };
+
$scope.$on("$ionicView.beforeEnter", function(event, data) {
- $scope.isFiat = data.stateParams.currency ? true : false;
cardId = data.stateParams.id;
+ sendMax = data.stateParams.useSendMax;
if (!cardId) {
showErrorAndBack('No card selected');
return;
}
-
- var parsedAmount = bitpayCardService.parseAmount(
+
+ var parsedAmount = txFormatService.parseAmount(
data.stateParams.amount,
data.stateParams.currency);
@@ -80,11 +97,6 @@ angular.module('copayApp.controllers').controller('topUpController', function($s
}
$scope.onWalletSelect($scope.wallets[0]); // Default first wallet
- bitpayCardService.getRates(currency, function(err, data) {
- if (err) $log.error(err);
- $scope.rate = data.rate;
- });
-
bitpayCardService.get({ cardId: cardId, noRefresh: true }, function(err, card) {
if (err) {
showErrorAndBack(err);
@@ -189,6 +201,32 @@ angular.module('copayApp.controllers').controller('topUpController', function($s
$scope.onWalletSelect = function(wallet) {
$scope.wallet = wallet;
+ if (sendMax) {
+ ongoingProcess.set('retrievingInputs', true);
+ sendMaxService.getInfo($scope.wallet, function(err, values) {
+ ongoingProcess.set('retrievingInputs', false);
+ if (err) {
+ showErrorAndBack(err);
+ return;
+ }
+ var config = configService.getSync().wallet.settings;
+ var unitName = config.unitName;
+ var amountUnit = txFormatService.satToUnit(values.amount);
+ var parsedAmount = txFormatService.parseAmount(
+ amountUnit,
+ unitName);
+
+ amount = parsedAmount.amount;
+ currency = parsedAmount.currency;
+ checkDailyLimit();
+ $scope.amountUnitStr = parsedAmount.amountUnitStr;
+ $timeout(function() {
+ $scope.$digest();
+ }, 100);
+ });
+ } else {
+ checkDailyLimit();
+ }
};
$scope.goBackHome = function() {
diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js
index ecf849b10..8e9022236 100644
--- a/src/js/directives/directives.js
+++ b/src/js/directives/directives.js
@@ -157,7 +157,7 @@ angular.module('copayApp.directives')
scope.$emit('Wallet/Changed', scope.wallets ? scope.wallets[0] : null);
});
- scope.$on("$ionicSlides.slideChangeEnd", function(event, data) {
+ scope.$on("$ionicSlides.slideChangeStart", function(event, data) {
scope.$emit('Wallet/Changed', scope.wallets ? scope.wallets[data.slider.activeIndex] : null);
});
}
diff --git a/src/js/routes.js b/src/js/routes.js
index e95c63bb4..9e6a82016 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -119,6 +119,30 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
})
+ /*
+ *
+ * Pin
+ *
+ */
+
+ .state('pin', {
+ url: '/pin/',
+ controller: 'pinController',
+ templateUrl: 'views/pin.html',
+ })
+
+ /*
+ *
+ * Locked
+ *
+ */
+
+ .state('lockedView', {
+ url: '/lockedView/',
+ controller: 'lockedViewController',
+ templateUrl: 'views/lockedView.html',
+ })
+
/*
*
* URI
@@ -439,6 +463,25 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
}
})
+ .state('tabs.lockSetup', {
+ url: '/lockSetup',
+ views: {
+ 'tab-settings@tabs': {
+ controller: 'lockSetupController',
+ templateUrl: 'views/lockSetup.html',
+ }
+ }
+ })
+ .state('tabs.pin', {
+ url: '/pin/:fromSettings/:locking',
+ views: {
+ 'tab-settings@tabs': {
+ controller: 'pinController',
+ templateUrl: 'views/pin.html',
+ cache: false
+ }
+ }
+ })
/*
*
@@ -536,6 +579,15 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
}
})
+ .state('tabs.preferences.preferencesExternal', {
+ url: '/preferencesExternal',
+ views: {
+ 'tab-settings@tabs': {
+ controller: 'preferencesExternalController',
+ templateUrl: 'views/preferencesExternal.html'
+ }
+ }
+ })
.state('tabs.preferences.delete', {
url: '/delete',
views: {
@@ -725,15 +777,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
}
})
- .state('onboarding.notifications', {
- url: '/notifications/:walletId',
- views: {
- 'onboarding': {
- templateUrl: 'views/onboarding/notifications.html',
- controller: 'notificationsController'
- }
- }
- })
.state('onboarding.backupRequest', {
url: '/backupRequest/:walletId',
views: {
@@ -1061,7 +1104,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
params: {
id: null,
currency: 'USD',
- forceCurrency: true
+ useSendMax: null
}
})
.state('tabs.bitpayCard.amount', {
@@ -1092,7 +1135,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
});
})
- .run(function($rootScope, $state, $location, $log, $timeout, $ionicHistory, $ionicPlatform, $window, appConfigService, lodash, platformInfo, profileService, uxLanguage, gettextCatalog, openURLService, storageService, scannerService, /* plugins START HERE => */ coinbaseService, glideraService, amazonService, bitpayCardService) {
+ .run(function($rootScope, $state, $location, $log, $timeout, startupService, fingerprintService, $ionicHistory, $ionicPlatform, $window, appConfigService, lodash, platformInfo, profileService, uxLanguage, gettextCatalog, openURLService, storageService, scannerService, configService, /* plugins START HERE => */ coinbaseService, glideraService, amazonService, bitpayCardService) {
uxLanguage.init();
@@ -1124,12 +1167,11 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
var matchWelcome = $ionicHistory.currentStateName() == 'onboarding.welcome' ? true : false;
var matchCollectEmail = $ionicHistory.currentStateName() == 'onboarding.collectEmail' ? true : false;
var matchBackupRequest = $ionicHistory.currentStateName() == 'onboarding.backupRequest' ? true : false;
- var matchNotifications = $ionicHistory.currentStateName() == 'onboarding.notifications' ? true : false;
var backedUp = $ionicHistory.backView().stateName == 'onboarding.backup' ? true : false;
var noBackView = $ionicHistory.backView().stateName == 'starting' ? true : false;
var matchDisclaimer = $ionicHistory.currentStateName() == 'onboarding.disclaimer' && (backedUp || noBackView) ? true : false;
- var fromOnboarding = matchCollectEmail | matchBackupRequest | matchNotifications | matchWelcome | matchDisclaimer;
+ var fromOnboarding = matchCollectEmail | matchBackupRequest | matchWelcome | matchDisclaimer;
//views with disable backbutton
var matchComplete = $ionicHistory.currentStateName() == 'tabs.rate.complete' ? true : false;
@@ -1153,8 +1195,54 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
// Nothing to do
});
+
+ function checkAndApplyLock(onResume) {
+ var defaultView = 'tabs.home';
+
+ if (!platformInfo.isCordova && !platformInfo.isDevel) {
+ goTo(defaultView);
+ }
+
+ if (onResume) {
+ var now = Math.floor(Date.now() / 1000);
+ if (now < openURLService.unlockUntil) {
+ openURLService.unlockUntil = null;
+ $log.debug('Skip startup locking');
+ return;
+ }
+ }
+
+ function goTo(nextView) {
+ nextView = nextView || defaultView;
+ $state.transitionTo(nextView).then(function() {
+ if (nextView == 'lockedView')
+ $ionicHistory.clearHistory();
+ });
+ };
+
+ startupService.ready();
+
+ configService.whenAvailable(function(config) {
+ var lockMethod = config.lock && config.lock.method;
+ $log.debug('App Lock:' + (lockMethod || 'no'));
+
+ if (lockMethod == 'fingerprint' && fingerprintService.isAvailable()) {
+ fingerprintService.check('unlockingApp', function(err) {
+ if (err)
+ goTo('lockedView');
+ if ($ionicHistory.currentStateName() == 'lockedView' || !onResume)
+ goTo('tabs.home');
+ });
+ } else if (lockMethod == 'pin') {
+ goTo('pin');
+ } else {
+ goTo(defaultView);
+ }
+ });
+ }
+
$ionicPlatform.on('resume', function() {
- // Nothing to do
+ checkAndApplyLock(true);
});
$ionicPlatform.on('menubutton', function() {
@@ -1197,17 +1285,14 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
disableAnimate: true,
historyRoot: true
});
- $state.transitionTo('tabs.home').then(function() {
- // Clear history
- $ionicHistory.clearHistory();
- });
- });
- }
+ checkAndApplyLock();
+ });
+ };
// After everything have been loaded, initialize handler URL
$timeout(function() {
openURLService.init();
- }, 1000);
+ });
});
});
diff --git a/src/js/services/amazonService.js b/src/js/services/amazonService.js
index cfd990f1e..c0dee597e 100644
--- a/src/js/services/amazonService.js
+++ b/src/js/services/amazonService.js
@@ -72,8 +72,10 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo
if (opts && opts.remove) {
delete(inv[gc.invoiceId]);
}
+
inv = JSON.stringify(inv);
+
storageService.setAmazonGiftCards(network, inv, function(err) {
homeIntegrationsService.register(homeItem);
diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js
index ed3157cf6..d1aea6b19 100644
--- a/src/js/services/bitpayCardService.js
+++ b/src/js/services/bitpayCardService.js
@@ -1,6 +1,6 @@
'use strict';
-angular.module('copayApp.services').factory('bitpayCardService', function($log, $rootScope, $filter, lodash, storageService, bitauthService, platformInfo, moment, appIdentityService, bitpayService, nextStepsService, configService, txFormatService, appConfigService, rateService) {
+angular.module('copayApp.services').factory('bitpayCardService', function($log, $rootScope, $filter, lodash, storageService, bitauthService, platformInfo, moment, appIdentityService, bitpayService, nextStepsService, configService, txFormatService, appConfigService) {
var root = {};
var _setError = function(msg, e) {
@@ -39,33 +39,6 @@ angular.module('copayApp.services').factory('bitpayCardService', function($log,
return history;
};
- root.parseAmount = function(amount, currency) {
- var config = configService.getSync().wallet.settings;
- var satToBtc = 1 / 100000000;
- var unitToSatoshi = config.unitToSatoshi;
- var amountUnitStr;
- var amountSat;
-
- // IF 'USD'
- if (currency) {
- amountUnitStr = $filter('formatFiatAmount')(amount) + ' ' + currency;
- amountSat = rateService.fromFiat(amount, currency).toFixed(0);
- } else {
- amountSat = parseInt((amount * unitToSatoshi).toFixed(0));
- amountUnitStr = txFormatService.formatAmountStr(amountSat);
- // convert unit to BTC
- amount = (amountSat * satToBtc).toFixed(8);
- currency = 'BTC';
- }
-
- return {
- amount: amount,
- currency: currency,
- amountSat: amountSat,
- amountUnitStr: amountUnitStr
- };
- };
-
root.sync = function(apiContext, cb) {
var json = {
method: 'getDebitCards'
diff --git a/src/js/services/coinbaseService.js b/src/js/services/coinbaseService.js
index 07aca04c8..ac3bca0aa 100644
--- a/src/js/services/coinbaseService.js
+++ b/src/js/services/coinbaseService.js
@@ -107,30 +107,6 @@ angular.module('copayApp.services').factory('coinbaseService', function($http, $
};
};
- root.parseAmount = function(amount, currency) {
- var config = configService.getSync().wallet.settings;
- var satToBtc = 1 / 100000000;
- var unitToSatoshi = config.unitToSatoshi;
- var amountUnitStr;
-
- // IF 'USD'
- if (currency) {
- amountUnitStr = $filter('formatFiatAmount')(amount) + ' ' + currency;
- } else {
- var amountSat = parseInt((amount * unitToSatoshi).toFixed(0));
- amountUnitStr = txFormatService.formatAmountStr(amountSat);
- // convert unit to BTC
- amount = (amountSat * satToBtc).toFixed(8);
- currency = 'BTC';
- }
-
- return {
- amount: amount,
- currency: currency,
- amountUnitStr: amountUnitStr
- };
- };
-
root.getSignupUrl = function() {
return credentials.HOST + '/signup';
}
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index 747554ca1..2b92e58ff 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -53,6 +53,13 @@ angular.module('copayApp.services').factory('configService', function(storageSer
}
},
+ lock: {
+ method: null,
+ value: null,
+ bannedUntil: null,
+ attempts: null,
+ },
+
// External services
recentTransactions: {
enabled: true,
diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js
index 584bb0628..0e4deabc7 100644
--- a/src/js/services/feeService.js
+++ b/src/js/services/feeService.js
@@ -51,10 +51,9 @@ angular.module('copayApp.services').factory('feeService', function($log, $stateP
if (errLivenet || errTestnet) {
return cb(gettextCatalog.getString('Could not get dynamic fee'));
} else {
- for (var i = 0; i < 4; i++) {
- levelsLivenet[i]['feePerKBUnit'] = txFormatService.formatAmount(levelsLivenet[i].feePerKB) + ' ' + unitName;
- levelsTestnet[i]['feePerKBUnit'] = txFormatService.formatAmount(levelsTestnet[i].feePerKB) + ' ' + unitName;
- }
+ lodash.each(lodash.union(levelsLivenet, levelsTestnet), function(level) {
+ level.feePerKBUnit = txFormatService.formatAmount(level.feePerKB) + ' ' + unitName;
+ });
}
return cb(null, {
diff --git a/src/js/services/fingerprintService.js b/src/js/services/fingerprintService.js
index 39e937360..30e288a79 100644
--- a/src/js/services/fingerprintService.js
+++ b/src/js/services/fingerprintService.js
@@ -14,7 +14,7 @@ angular.module('copayApp.services').factory('fingerprintService', function($log,
function(msg) {
FingerprintAuth.isAvailable(function(result) {
- if (result.isAvailable)
+ if (result.isAvailable)
_isAvailable = 'ANDROID';
}, function() {
@@ -40,7 +40,7 @@ angular.module('copayApp.services').factory('fingerprintService', function($log,
},
function(msg) {
$log.debug('Finger Failed:' + JSON.stringify(msg));
- return cb(gettextCatalog.getString('Finger Scan Failed') + ': ' + msg.localizedDescription);
+ return cb(gettextCatalog.getString('Finger Scan Failed'));
}
);
} catch (e) {
@@ -60,7 +60,7 @@ angular.module('copayApp.services').factory('fingerprintService', function($log,
},
function(msg) {
$log.debug('Touch ID Failed:' + JSON.stringify(msg));
- return cb(gettextCatalog.getString('Touch ID Failed') + ': ' + msg.localizedDescription);
+ return cb(gettextCatalog.getString('Touch ID Failed'));
}
);
} catch (e) {
@@ -71,6 +71,7 @@ angular.module('copayApp.services').factory('fingerprintService', function($log,
var isNeeded = function(client) {
if (!_isAvailable) return false;
+ if (client === 'unlockingApp') return true;
var config = configService.getSync();
config.touchIdFor = config.touchIdFor || {};
@@ -84,7 +85,7 @@ angular.module('copayApp.services').factory('fingerprintService', function($log,
root.check = function(client, cb) {
if (isNeeded(client)) {
- $log.debug('FingerPrint Service:', _isAvailable);
+ $log.debug('FingerPrint Service:', _isAvailable);
if (_isAvailable == 'IOS')
return requestTouchId(cb);
else
diff --git a/src/js/services/glideraService.js b/src/js/services/glideraService.js
index 79bee5f38..f60230cdf 100644
--- a/src/js/services/glideraService.js
+++ b/src/js/services/glideraService.js
@@ -53,30 +53,6 @@ angular.module('copayApp.services').factory('glideraService', function($http, $l
return 'USD';
};
- root.parseAmount = function(amount, currency) {
- var config = configService.getSync().wallet.settings;
- var satToBtc = 1 / 100000000;
- var unitToSatoshi = config.unitToSatoshi;
- var amountUnitStr;
-
- // IF 'USD'
- if (currency) {
- amountUnitStr = $filter('formatFiatAmount')(amount) + ' ' + currency;
- } else {
- var amountSat = parseInt((amount * unitToSatoshi).toFixed(0));
- amountUnitStr = txFormatService.formatAmountStr(amountSat);
- // convert unit to BTC
- amount = (amountSat * satToBtc).toFixed(8);
- currency = 'BTC';
- }
-
- return {
- amount: amount,
- currency: currency,
- amountUnitStr: amountUnitStr
- };
- };
-
root.getSignupUrl = function() {
return credentials.HOST + '/register';
}
diff --git a/src/js/services/hwWallet.js b/src/js/services/hwWallet.js
index 1c9314164..f3553bf37 100644
--- a/src/js/services/hwWallet.js
+++ b/src/js/services/hwWallet.js
@@ -6,9 +6,11 @@ angular.module('copayApp.services')
// Ledger magic number to get xPub without user confirmation
root.ENTROPY_INDEX_PATH = "0xb11e/";
+ root.M = 'm/';
root.UNISIG_ROOTPATH = 44;
root.MULTISIG_ROOTPATH = 48;
root.LIVENET_PATH = 0;
+ root.TESTNET_PATH = 1;
root._err = function(data) {
var msg = data.error || data.message || 'unknown';
@@ -17,26 +19,49 @@ angular.module('copayApp.services')
root.getRootPath = function(device, isMultisig, account) {
- if (!isMultisig) return root.UNISIG_ROOTPATH;
-
- // Compat
- if (device == 'ledger' && account == 0) return root.UNISIG_ROOTPATH;
-
- return root.MULTISIG_ROOTPATH;
+ var path;
+ if (isMultisig) {
+ path = root.MULTISIG_ROOTPATH;
+ } else {
+ if (device == 'ledger' && account > 0) {
+ path = root.MULTISIG_ROOTPATH;
+ } else {
+ path = root.UNISIG_ROOTPATH;
+ }
+ }
+ if (device == 'intelTEE') {
+ path = root.M + path;
+ }
+ return path;
};
- root.getAddressPath = function(device, isMultisig, account) {
- return root.getRootPath(device, isMultisig, account) + "'/" + root.LIVENET_PATH + "'/" + account + "'";
- }
+ root.getAddressPath = function(device, isMultisig, account, network) {
+ network = network || 'livenet';
+ var networkPath = root.LIVENET_PATH;
+ if (network == 'testnet') {
+ networkPath = root.TESTNET_PATH;
+ }
+ return root.getRootPath(device, isMultisig, account) + "'/" + networkPath + "'/" + account + "'";
+ };
root.getEntropyPath = function(device, isMultisig, account) {
- var path;
+ var path = root.ENTROPY_INDEX_PATH;
+ if (isMultisig) {
+ path = path + "48'/"
+ } else {
+ path = path + "44'/"
+ }
// Old ledger wallet compat
- if (device == 'ledger' && account == 0)
- return root.ENTROPY_INDEX_PATH + "0'";
+ if (device == 'ledger' && account == 0) {
+ return path + "0'/";
+ }
- return root.ENTROPY_INDEX_PATH + root.getRootPath(device, isMultisig, account) + "'/" + account + "'";
+ if (device == 'intelTEE') {
+ path = root.M + path;
+ }
+
+ return path + account + "'";
};
root.pubKeyToEntropySource = function(xPubKey) {
diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js
index 0c730ed79..c9d633eb8 100644
--- a/src/js/services/incomingData.js
+++ b/src/js/services/incomingData.js
@@ -1,6 +1,6 @@
'use strict';
-angular.module('copayApp.services').factory('incomingData', function($log, $state, $timeout, $ionicHistory, bitcore, $rootScope, payproService, scannerService, appConfigService) {
+angular.module('copayApp.services').factory('incomingData', function($log, $state, $timeout, $ionicHistory, bitcore, $rootScope, payproService, scannerService, appConfigService, popupService, gettextCatalog) {
var root = {};
@@ -93,10 +93,10 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
if (parsed.r) {
payproService.getPayProDetails(parsed.r, function(err, details) {
- if (err && addr && amount) {
- goSend(addr, amount, message);
- }
- handlePayPro(details);
+ if (err) {
+ if (addr && amount) goSend(addr, amount, message);
+ else popupService.showAlert(gettextCatalog.getString('Error'), err);
+ } else handlePayPro(details);
});
} else {
goSend(addr, amount, message);
diff --git a/src/js/services/intelTEE.js b/src/js/services/intelTEE.js
new file mode 100644
index 000000000..39859c863
--- /dev/null
+++ b/src/js/services/intelTEE.js
@@ -0,0 +1,195 @@
+'use strict';
+
+angular.module('copayApp.services')
+ .factory('intelTEE', function($log, $timeout, gettext, lodash, bitcore, hwWallet, bwcService, platformInfo) {
+
+ var root = {};
+
+ root.description = {
+ supported: platformInfo.supportsIntelTEE,
+ version: platformInfo.versionIntelTEE,
+ id: 'intelTEE',
+ name: 'Intel TEE',
+ longName: 'Intel TEE Hardware Wallet',
+ derivationStrategy: 'BIP44',
+ isEmbeddedHardware: true,
+ supportsTestnet: true
+ };
+
+ if (!root.description.supported) {
+ return root;
+ }
+
+ var IntelWallet = require('intelWalletCon');
+ var TEE_APP_ID = '63279de1b6cb4dcf8c206716bd318092f8c206716bd31809263279de1b6cb4dc';
+
+ root.walletEnclave = new IntelWallet.Wallet();
+ var walletEnclaveStatus = root.walletEnclave.initializeEnclave();
+ if (walletEnclaveStatus != 0) {
+ $log.error('Failed to create Intel Wallet enclave');
+ }
+
+ root.getInfoForNewWallet = function(isMultisig, account, networkName, callback) {
+ var opts = {};
+ initSource(opts, function(err, opts) {
+ if (err) return callback(err);
+
+ root.getEntropySource(opts.hwInfo.id, isMultisig, account, function(err, entropySource) {
+ if (err) return callback(err);
+
+ opts.entropySource = entropySource;
+ root.getXPubKey(opts.hwInfo.id, hwWallet.getAddressPath(root.description.id, isMultisig, account, networkName), function(data) {
+ if (!data.success) {
+ $log.warn(data.message);
+ return callback(data);
+ }
+ opts.extendedPublicKey = data.xpubkey;
+ opts.externalSource = root.description.id;
+ opts.derivationStrategy = root.description.derivationStrategy;
+
+ return callback(null, opts);
+ });
+ });
+ });
+ };
+
+ root.getXPubKey = function(teeWalletId, path, callback) {
+ $log.debug('TEE deriving xPub path:', path);
+
+ // Expected to be a extended public key.
+ var xpubkey = root.walletEnclave.getPublicKey(teeWalletId, path);
+
+ // Error messages returned in value.
+ var result = {
+ success: false,
+ message: xpubkey.ExtendedPublicKey
+ };
+
+ // Success indicated by status being equal to the tee wallet id.
+ if (xpubkey.Status == teeWalletId) {
+ result.success = true;
+ result.message = 'OK';
+ result.xpubkey = xpubkey.ExtendedPublicKey;
+ } else {
+ $log.error('Failed to get xpubkey from TEE wallet: ' + result.message);
+ }
+
+ callback(result);
+ };
+
+ root.getEntropySource = function(teeWalletId, isMultisig, account, callback) {
+ root.getXPubKey(teeWalletId, hwWallet.getEntropyPath(root.description.id, isMultisig, account), function(data) {
+ if (!data.success)
+ return callback(hwWallet._err(data));
+
+ return callback(null, hwWallet.pubKeyToEntropySource(data.xpubkey));
+ });
+ };
+
+ root.showMneumonic = function(teeWalletId, cb) {
+ var result = root.walletEnclave.displayWordList(teeWalletId, 'en');
+ if (result != teeWalletId) {
+ cb(result);
+ } else {
+ cb();
+ }
+ };
+
+ root.showReceiveAddress = function(teeWalletId, address, cb) {
+ var isMultisig = false; // TODO
+ var account = 0; // TODO
+ var basePath = hwWallet.getAddressPath(root.description.id, isMultisig, account, address.network);
+ var keyPath = address.path.replace('m', basePath);
+
+ var result = root.walletEnclave.displayReceiveAddress(teeWalletId, keyPath);
+ if (result != teeWalletId) {
+ cb(result);
+ } else {
+ cb();
+ }
+ };
+
+ root.signTx = function(teeWalletId, txp, callback) {
+ var account = 0; // TODO
+ var isMultisig = txp.requiredSignatures > 1;
+ var basePath = hwWallet.getAddressPath(root.description.id, isMultisig, account, txp.network);
+
+ var rawTx = bwcService.Client.getRawTx(txp);
+ var keypaths = lodash.map(lodash.pluck(txp.inputs, 'path'), function(path) {
+ return path.replace('m', basePath);
+ });
+ var publicKeys = lodash.pluck(txp.inputs, 'publicKeys');
+ var changePublicKeys = txp.changeAddress.publicKeys;
+ publicKeys.push(changePublicKeys);
+
+ var changeaddrpath;
+ if (txp.changeAddress) {
+ changeaddrpath = txp.changeAddress.path.replace('m', basePath);
+ }
+
+ var result;
+ if (txp.requiredSignatures == 1) {
+ result = root.walletEnclave.signTransaction(teeWalletId, rawTx, changeaddrpath, keypaths);
+ } else {
+ result = root.walletEnclave.signTransaction(teeWalletId, rawTx, changeaddrpath, keypaths, publicKeys, txp.requiredSignatures, changePublicKeys, txp.requiredSignatures);
+ }
+
+ if (result.Status != teeWalletId) {
+ return callback('TEE failed to sign transction: ' + result.Status);
+ }
+ return callback(null, result);
+ };
+
+ function initSource(opts, callback) {
+ var args = {
+ "Testnet" : (opts.networkName == 'livenet'? false : true),
+ "PINUnlockRequired" : false,
+ "PINSignatureDataRequired" : false,
+ "PINSignatureTransaction" : 0,
+ "ExportCount" : 10,
+ "MaxPINAttempts" : 3,
+ "PINTimeout" : 30
+ };
+
+ var teeStatus = root.walletEnclave.createWallet(TEE_APP_ID, args);
+ switch (teeStatus) {
+ case "CREATE WALLET FAILURE":
+ case "CREATE WALLET FAILED TO INITIALIZE":
+ case "CREATE WALLET FAILURE BAD INPUT":
+ case "CREATE WALLET FAILURE case SERIALIZATION":
+ case "DELETE_WALLET_AUTHORIZATION_UNSUCCESSFUL":
+ case "LOAD_WALLET_FAILTURE":
+ case "IMPORT WORD LIST FAILTURE":
+ case "IMPORT WORD LIST FAILURE BAD INPUT":
+ case "IMPORT WORD NOT IN DICTIONARY":
+ case "INVALID PIN":
+ case "INVALID APPLICATION ID":
+ case "DISPLAY WORD LIST FAILURE":
+ case "DELETE WALLET NO SUCH APPLICATION ID":
+ case "SIGN DATA FAILURE":
+ case "SIGN DATA INVALID HASH":
+ case "SIGN DATA BUFFER TOO SMALL":
+ case "SIGN DATA INVALID PIN":
+ case "RECEIVE ADDRESS INVALID INPUT":
+ case "RECEIVE ADDRESS NULL":
+ case "RECEIVE ADDRESS BUFFER TOO SMALL":
+ case "PUBLIC KEY BUFFER TOO SMALL":
+ case "LOAD WALLET FAILURE":
+ case "PUBLIC KEY FAILURE":
+ case "PUBLIC KEY FAIL TO SERIALIZE":
+ case "UKNOWN ERROR CODE":
+ $log.error(teeStatus);
+ return callback(teeStatus); // TODO: translate error text for display
+ break;
+ default:
+ opts.hwInfo = {
+ name: root.description.id,
+ id: teeStatus
+ };
+ $log.debug('TEE wallet created: ' + opts.hwInfo.id);
+ return callback(null, opts);
+ }
+ };
+
+ return root;
+});
\ No newline at end of file
diff --git a/src/js/services/ledger.js b/src/js/services/ledger.js
index a58aa2906..abfe6c8f7 100644
--- a/src/js/services/ledger.js
+++ b/src/js/services/ledger.js
@@ -1,10 +1,19 @@
'use strict';
angular.module('copayApp.services')
- .factory('ledger', function($log, bwcService, gettext, hwWallet) {
+ .factory('ledger', function($log, bwcService, gettext, hwWallet, platformInfo) {
var root = {};
var LEDGER_CHROME_ID = "kkdpmhnladdopljabkgpacgpliggeeaf";
+ root.description = {
+ supported: platformInfo.supportsLedger,
+ id: 'ledger',
+ name: 'Ledger',
+ longName: 'Ledger Hardware Wallet',
+ isEmbeddedHardware: false,
+ supportsTestnet: false
+ };
+
root.callbacks = {};
root.hasSession = function() {
root._message({
@@ -13,7 +22,7 @@ angular.module('copayApp.services')
}
root.getEntropySource = function(isMultisig, account, callback) {
- root.getXPubKey(hwWallet.getEntropyPath('ledger', isMultisig, account), function(data) {
+ root.getXPubKey(hwWallet.getEntropyPath(root.description.id, isMultisig, account), function(data) {
if (!data.success)
return callback(hwWallet._err(data));
@@ -30,21 +39,28 @@ angular.module('copayApp.services')
});
};
- root.getInfoForNewWallet = function(isMultisig, account, callback) {
+ root.initSource = function(opts, callback) {
+ // No initialization for this hardware source.
+ return callback(opts);
+ };
+
+ root.getInfoForNewWallet = function(isMultisig, account, networkName, callback) {
+ // networkName not used for this hardware (always livenet)
root.getEntropySource(isMultisig, account, function(err, entropySource) {
if (err) return callback(err);
- root.getXPubKey(hwWallet.getAddressPath('ledger', isMultisig, account), function(data) {
- if (!data.success) return callback(data);
-
- var opts = {};
- opts.entropySource = entropySource;
+ var opts = {};
+ opts.entropySource = entropySource;
+ root.getXPubKey(hwWallet.getAddressPath(root.description.id, isMultisig, account), function(data) {
+ if (!data.success) {
+ $log.warn(data.message);
+ return callback(data);
+ }
opts.extendedPublicKey = data.xpubkey;
- opts.externalSource = 'ledger';
- opts.account = account;
+ opts.externalSource = root.description.id;
// Old ledger compat
- opts.derivationStrategy = account ? 'BIP48' : 'BIP44';
+ opts.derivationStrategy = opts.account ? 'BIP48' : 'BIP44';
return callback(null, opts);
});
});
@@ -57,7 +73,7 @@ angular.module('copayApp.services')
var tx = bwcService.getUtils().buildTx(txp);
for (var i = 0; i < tx.inputs.length; i++) {
redeemScripts.push(new ByteString(tx.inputs[i].redeemScript.toBuffer().toString('hex'), GP.HEX).toString());
- paths.push(hwWallet.getAddressPath('ledger', isMultisig, account) + txp.inputs[i].path.substring(1));
+ paths.push(hwWallet.getAddressPath(root.description.id, isMultisig, account) + txp.inputs[i].path.substring(1));
}
var splitTransaction = root._splitTransaction(new ByteString(tx.toString(), GP.HEX));
var inputs = [];
diff --git a/src/js/services/onGoingProcess.js b/src/js/services/onGoingProcess.js
index 2e0692b17..763cccfbb 100644
--- a/src/js/services/onGoingProcess.js
+++ b/src/js/services/onGoingProcess.js
@@ -3,6 +3,7 @@
angular.module('copayApp.services').factory('ongoingProcess', function($log, $timeout, $filter, lodash, $ionicLoading, gettext, platformInfo) {
var root = {};
var isCordova = platformInfo.isCordova;
+ var isWP = platformInfo.isWP;
var ongoingProcess = {};
@@ -49,7 +50,7 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
root.clear = function() {
ongoingProcess = {};
- if (isCordova) {
+ if (isCordova && !isWP) {
window.plugins.spinnerDialog.hide();
} else {
$ionicLoading.hide();
@@ -79,21 +80,23 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
if (customHandler) {
customHandler(processName, showName, isOn);
} else if (root.onGoingProcessName) {
- if (isCordova) {
+ if (isCordova && !isWP) {
window.plugins.spinnerDialog.show(null, showName, root.clear);
} else {
- var tmpl = '' + showName + '
';
+ var tmpl;
+ if (isWP) tmpl = '' + showName +'
';
+ else tmpl = '' + showName + '
';
$ionicLoading.show({
template: tmpl
});
}
} else {
- if (isCordova) {
+ if (isCordova && !isWP) {
window.plugins.spinnerDialog.hide();
} else {
- $ionicLoading.hide();
- }
+ $ionicLoading.hide();
+ }
}
};
diff --git a/src/js/services/openURL.js b/src/js/services/openURL.js
index 7c1af7417..8e6a768cf 100644
--- a/src/js/services/openURL.js
+++ b/src/js/services/openURL.js
@@ -1,9 +1,15 @@
'use strict';
angular.module('copayApp.services').factory('openURLService', function($rootScope, $ionicHistory, $document, $log, $state, platformInfo, lodash, profileService, incomingData, appConfigService) {
+ var DELAY_UNLOCK_TIME = 2 * 60;
var root = {};
+ root.unlockUntil = null;
+
var handleOpenURL = function(args) {
+ root.unlockUntil = Math.floor(Date.now() / 1000) + DELAY_UNLOCK_TIME;
+ $log.debug('Set unlock time until: ' + root.unlockUntil);
+
$log.info('Handling Open URL: ' + JSON.stringify(args));
// Stop it from caching the first view as one to return when the app opens
$ionicHistory.nextViewOptions({
@@ -103,5 +109,5 @@ angular.module('copayApp.services').factory('openURLService', function($rootScop
});
};
-return root;
+ return root;
});
diff --git a/src/js/services/payproService.js b/src/js/services/payproService.js
index ba5adb4b9..96ed90441 100644
--- a/src/js/services/payproService.js
+++ b/src/js/services/payproService.js
@@ -1,51 +1,39 @@
'use strict';
angular.module('copayApp.services').factory('payproService',
-function($window, profileService, platformInfo, popupService, gettextCatalog, ongoingProcess, $log) {
+ function(profileService, platformInfo, gettextCatalog, ongoingProcess, $log) {
- var ret = {};
+ var ret = {};
- ret.getPayProDetails = function(uri, cb, disableLoader) {
- if (!cb) cb = function() {};
+ ret.getPayProDetails = function(uri, cb, disableLoader) {
+ if (!cb) cb = function() {};
- var wallet = profileService.getWallets({
- onlyComplete: true
- })[0];
+ var wallet = profileService.getWallets({
+ onlyComplete: true
+ })[0];
- if (!wallet) return cb();
+ if (!wallet) return cb();
- if (platformInfo.isChromeApp) {
- popupService.showAlert(gettextCatalog.getString('Payment Protocol not supported on Chrome App'));
- return cb(true);
- }
-
- $log.debug('Fetch PayPro Request...', uri);
-
- if(!disableLoader) {
- ongoingProcess.set('fetchingPayPro', true);
- }
-
- wallet.fetchPayPro({
- payProUrl: uri,
- }, function(err, paypro) {
-
- if(!disableLoader) {
- ongoingProcess.set('fetchingPayPro', false);
+ if (platformInfo.isChromeApp) {
+ return cb(gettextCatalog.getString('Payment Protocol not supported on Chrome App'));
}
- if (err) {
- return cb(true);
- }
+ $log.debug('Fetch PayPro Request...', uri);
- if (!paypro.verified) {
- $log.warn('Failed to verify payment protocol signatures');
- popupService.showAlert(gettextCatalog.getString('Payment Protocol Invalid'));
- return cb(true);
- }
- cb(null, paypro);
+ if (!disableLoader) ongoingProcess.set('fetchingPayPro', true);
- });
- };
+ wallet.fetchPayPro({
+ payProUrl: uri,
+ }, function(err, paypro) {
+ if (!disableLoader) ongoingProcess.set('fetchingPayPro', false);
+ if (err) return cb(err);
+ else if (!paypro.verified) {
+ $log.warn('Failed to verify payment protocol signatures');
+ return cb(gettextCatalog.getString('Payment Protocol Invalid'));
+ }
+ return cb(null, paypro);
+ });
+ };
- return ret;
-});
+ return ret;
+ });
diff --git a/src/js/services/platformInfo.js b/src/js/services/platformInfo.js
index ee7d4c221..8396afa07 100644
--- a/src/js/services/platformInfo.js
+++ b/src/js/services/platformInfo.js
@@ -23,6 +23,27 @@ angular.module('copayApp.services').factory('platformInfo', function($window) {
}
};
+ var getVersionIntelTee = function() {
+ var v = '';
+ var isWindows = navigator.platform.indexOf('Win') > -1;
+
+ if (!isNodeWebkit() || !isWindows) {
+ return v;
+ }
+
+ try {
+ var IntelWallet = require('intelWalletCon');
+ if (IntelWallet.getVersion) {
+ v = IntelWallet.getVersion();
+ } else {
+ v = 'Alpha';
+ }
+ if (v.length > 0) {
+ $log.info('Intel TEE library ' + v);
+ }
+ } catch (e) {}
+ return v;
+ };
// Detect mobile devices
var ret = {
@@ -39,5 +60,11 @@ angular.module('copayApp.services').factory('platformInfo', function($window) {
ret.isChromeApp = $window.chrome && chrome.runtime && chrome.runtime.id && !ret.isNW;
ret.isDevel = !ret.isMobile && !ret.isChromeApp && !ret.isNW;
+ ret.supportsLedger = ret.isChromeApp;
+ ret.supportsTrezor = ret.isChromeApp || ret.isDevel;
+
+ ret.versionIntelTEE = getVersionIntelTee();
+ ret.supportsIntelTEE = ret.versionIntelTEE.length > 0;
+
return ret;
});
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index e5af8bc22..6ef9b96b0 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -347,6 +347,7 @@ angular.module('copayApp.services')
account: opts.account || 0,
derivationStrategy: opts.derivationStrategy || 'BIP44',
});
+ walletClient.credentials.hwInfo = opts.hwInfo;
} catch (ex) {
$log.warn("Creating wallet from Extended Public Key Arg:", ex, opts);
return cb(gettextCatalog.getString('Could not create using the specified extended public key'));
diff --git a/src/js/services/sendMax.js b/src/js/services/sendMax.js
new file mode 100644
index 000000000..13af6024a
--- /dev/null
+++ b/src/js/services/sendMax.js
@@ -0,0 +1,36 @@
+'use strict';
+
+angular.module('copayApp.services').service('sendMaxService', function(feeService, configService, walletService) {
+
+ /**
+ * Get sendMaxInfo
+ *
+ * @param {Obj} Wallet
+ * @param {Callback} Function (optional)
+ *
+ */
+ this.getInfo = function(wallet, cb) {
+ feeService.getCurrentFeeValue(wallet.credentials.network, function(err, feePerKb) {
+ if (err) return cb(err);
+
+ var config = configService.getSync().wallet;
+
+ walletService.getSendMaxInfo(wallet, {
+ feePerKb: feePerKb,
+ excludeUnconfirmedUtxos: !config.spendUnconfirmed,
+ returnInputs: true,
+ }, function(err, resp) {
+ if (err) return cb(err);
+
+ return cb(null, {
+ sendMax: true,
+ amount: resp.amount,
+ inputs: resp.inputs,
+ fee: resp.fee,
+ feePerKb: feePerKb,
+ });
+ });
+ });
+ };
+
+});
diff --git a/src/js/services/trezor.js b/src/js/services/trezor.js
index 3a3c48215..0411386fc 100644
--- a/src/js/services/trezor.js
+++ b/src/js/services/trezor.js
@@ -1,14 +1,24 @@
'use strict';
angular.module('copayApp.services')
- .factory('trezor', function($log, $timeout, lodash, bitcore, hwWallet) {
+ .factory('trezor', function($log, $timeout, lodash, bitcore, hwWallet, platformInfo) {
var root = {};
var SETTLE_TIME = 3000;
root.callbacks = {};
+ root.description = {
+ supported: platformInfo.supportsTrezor,
+ id: 'trezor',
+ name: 'Trezor',
+ longName: 'Trezor Hardware Wallet',
+ derivationStrategy: 'BIP48',
+ isEmbeddedHardware: false,
+ supportsTestnet: false
+ };
+
root.getEntropySource = function(isMultisig, account, callback) {
- root.getXPubKey(hwWallet.getEntropyPath('trezor', isMultisig, account), function(data) {
+ root.getXPubKey(hwWallet.getEntropyPath(root.description.id, isMultisig, account), function(data) {
if (!data.success)
return callback(hwWallet._err(data));
@@ -26,8 +36,13 @@ angular.module('copayApp.services')
}
};
+ root.initSource = function(opts, callback) {
+ // No initialization for this hardware source.
+ return callback(opts);
+ };
- root.getInfoForNewWallet = function(isMultisig, account, callback) {
+ root.getInfoForNewWallet = function(isMultisig, account, networkName, callback) {
+ // networkName not used for this hardware (always livenet)
var opts = {};
root.getEntropySource(isMultisig, account, function(err, data) {
if (err) return callback(err);
@@ -35,13 +50,12 @@ angular.module('copayApp.services')
$log.debug('Waiting TREZOR to settle...');
$timeout(function() {
- root.getXPubKey(hwWallet.getAddressPath('trezor', isMultisig, account), function(data) {
+ root.getXPubKey(hwWallet.getAddressPath(root.description.id, isMultisig, account), function(data) {
if (!data.success)
return callback(hwWallet._err(data));
opts.extendedPublicKey = data.xpubkey;
- opts.externalSource = 'trezor';
- opts.account = account;
+ opts.externalSource = root.description.id;
if (isMultisig)
opts.derivationStrategy = 'BIP48';
diff --git a/src/js/services/txFormatService.js b/src/js/services/txFormatService.js
index 77533b692..7524bb548 100644
--- a/src/js/services/txFormatService.js
+++ b/src/js/services/txFormatService.js
@@ -155,5 +155,42 @@ angular.module('copayApp.services').factory('txFormatService', function($filter,
return txps;
};
+ root.parseAmount = function(amount, currency) {
+ var config = configService.getSync().wallet.settings;
+ var satToBtc = 1 / 100000000;
+ var unitToSatoshi = config.unitToSatoshi;
+ var amountUnitStr;
+ var amountSat;
+ var alternativeIsoCode = config.alternativeIsoCode;
+
+ // If fiat currency
+ if (currency != 'bits' && currency != 'BTC') {
+ amountUnitStr = $filter('formatFiatAmount')(amount) + ' ' + currency;
+ amountSat = rateService.fromFiat(amount, currency).toFixed(0);
+ } else {
+ amountSat = parseInt((amount * unitToSatoshi).toFixed(0));
+ amountUnitStr = root.formatAmountStr(amountSat);
+ // convert unit to BTC
+ amount = (amountSat * satToBtc).toFixed(8);
+ currency = 'BTC';
+ }
+
+ return {
+ amount: amount,
+ currency: currency,
+ alternativeIsoCode: alternativeIsoCode,
+ amountSat: amountSat,
+ amountUnitStr: amountUnitStr
+ };
+ };
+
+ root.satToUnit = function(amount) {
+ var config = configService.getSync().wallet.settings;
+ var unitToSatoshi = config.unitToSatoshi;
+ var satToUnit = 1 / unitToSatoshi;
+ var unitDecimals = config.unitDecimals;
+ return parseFloat((amount * satToUnit).toFixed(unitDecimals));
+ };
+
return root;
});
diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js
index 7c3b98f07..558f422a2 100644
--- a/src/js/services/walletService.js
+++ b/src/js/services/walletService.js
@@ -1,10 +1,16 @@
'use strict';
-angular.module('copayApp.services').factory('walletService', function($log, $timeout, lodash, trezor, ledger, storageService, configService, rateService, uxLanguage, $filter, gettextCatalog, bwcError, $ionicPopup, fingerprintService, ongoingProcess, gettext, $rootScope, txFormatService, $ionicModal, $state, bwcService, bitcore, popupService) {
+angular.module('copayApp.services').factory('walletService', function($log, $timeout, lodash, trezor, ledger, intelTEE, storageService, configService, rateService, uxLanguage, $filter, gettextCatalog, bwcError, $ionicPopup, fingerprintService, ongoingProcess, gettext, $rootScope, txFormatService, $ionicModal, $state, bwcService, bitcore, popupService) {
// `wallet` is a decorated version of client.
var root = {};
+ root.externalSource = {
+ ledger: ledger.description,
+ trezor: trezor.description,
+ intelTEE: intelTEE.description
+ }
+
root.WALLET_STATUS_MAX_TRIES = 7;
root.WALLET_STATUS_DELAY_BETWEEN_TRIES = 1.4 * 1000;
root.SOFT_CONFIRMATION_LIMIT = 12;
@@ -40,6 +46,43 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
});
};
+ var _signWithIntelTEE = function(wallet, txp, cb) {
+ $log.info('Requesting Intel TEE to sign the transaction');
+
+ intelTEE.signTx(wallet.credentials.hwInfo.id, txp, function(err, result) {
+ if (err) return cb(err);
+
+ $log.debug('Intel TEE response', result);
+ txp.signatures = result.Signatures;
+ return wallet.signTxProposal(txp, cb);
+ });
+ };
+
+ root.showMneumonicFromHardware = function(wallet, cb) {
+ switch (wallet.getPrivKeyExternalSourceName()) {
+ case root.externalSource.intelTEE.id:
+ return intelTEE.showMneumonic(wallet.credentials.hwInfo.id, cb);
+ break;
+ default:
+ cb('Error: unrecognized external source');
+ break;
+ }
+ };
+
+ root.showReceiveAddressFromHardware = function(wallet, address, cb) {
+ switch (wallet.getPrivKeyExternalSourceName()) {
+ case root.externalSource.intelTEE.id:
+ root.getAddressObj(wallet, address, function(err, addrObj) {
+ if (err) return cb(err);
+ return intelTEE.showReceiveAddress(wallet.credentials.hwInfo.id, addrObj, cb);
+ });
+ break;
+ default:
+ cb('Error: unrecognized external source');
+ break;
+ }
+ };
+
root.invalidateCache = function(wallet) {
if (wallet.cachedStatus)
wallet.cachedStatus.isValid = false;
@@ -629,10 +672,12 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
if (wallet.isPrivKeyExternal()) {
switch (wallet.getPrivKeyExternalSourceName()) {
- case 'ledger':
+ case root.externalSource.ledger.id:
return _signWithLedger(wallet, txp, cb);
- case 'trezor':
+ case root.externalSource.trezor.id:
return _signWithTrezor(wallet, txp, cb);
+ case root.externalSource.intelTEE.id:
+ return _signWithIntelTEE(wallet, txp, cb);
default:
var msg = 'Unsupported External Key:' + wallet.getPrivKeyExternalSourceName();
$log.error(msg);
@@ -845,6 +890,21 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
});
};
+ root.getAddressObj = function(wallet, address, cb) {
+ wallet.getMainAddresses({
+ reverse: true
+ }, function(err, addr) {
+ if (err) return cb(err);
+ var addrObj = lodash.find(addr, function(a) {
+ return a.address == address;
+ });
+ var err = null;
+ if (!addrObj) {
+ err = 'Error: specified address not in wallet';
+ }
+ return cb(err, addrObj);
+ });
+ };
root.isReady = function(wallet, cb) {
if (!wallet.isComplete())
diff --git a/src/sass/variables.scss b/src/sass/variables.scss
index 7b1b4e882..d91baa647 100644
--- a/src/sass/variables.scss
+++ b/src/sass/variables.scss
@@ -116,7 +116,6 @@ $v-onboarding-checkbox-on-border: $v-success-color !default;
$v-onboarding-tour-phone-bg: url(../img/onboarding-tour-phone.svg) !default;
$v-onboarding-tour-currency-bg: url(../img/onboarding-tour-currency-bg.svg) !default;
$v-onboarding-tour-control-bg: url(../img/onboarding-tour-control.svg) !default;
-$v-onboarding-push-notification-bg: url(../img/onboarding-push-notifications.svg) !default;
$v-onboarding-backup-warning-bg: url(../img/backup-warning.svg) !default;
$v-onboarding-button-back-color: #ffffff !default;
diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss
index ab77ddcad..1ee5702a1 100644
--- a/src/sass/views/includes/txp-details.scss
+++ b/src/sass/views/includes/txp-details.scss
@@ -89,6 +89,17 @@
flex-grow: 1;
}
}
+ &.low-fees {
+ border-top: none;
+ display: flex;
+ font-size: 14px;
+ color: #aaa;
+ align-items: center;
+ margin-top: -20px;
+ i {
+ padding-right: 20px;
+ }
+ }
}
.item-divider {
padding-top: 1.2rem;
diff --git a/src/sass/views/lockedView.scss b/src/sass/views/lockedView.scss
new file mode 100644
index 000000000..23fed7a83
--- /dev/null
+++ b/src/sass/views/lockedView.scss
@@ -0,0 +1,42 @@
+#locked-view {
+ @mixin img-frame {
+ height: 60px;
+ width: 60px;
+ box-shadow: none;
+ margin: auto;
+ }
+ .img-container-copay {
+ padding: 20%;
+ @media(min-width: 480px) {
+ max-height: 150px;
+ }
+ .big-icon-svg {
+ > .bg {
+ @include img-frame;
+ background-image: url("../img/icon-fingerprint-copay.svg");
+ }
+ }
+ }
+ .img-container-bitpay {
+ padding: 20%;
+ @media(min-width: 480px) {
+ max-height: 150px;
+ }
+ .big-icon-svg {
+ > .bg {
+ @include img-frame;
+ background-image: url("../img/icon-fingerprint-bitpay.svg");
+ }
+ }
+ }
+ .comments {
+ text-align: center;
+ .header {
+ font-size: 20px;
+ }
+ .text-content {
+ width: 90%;
+ margin: 5% auto;
+ }
+ }
+}
diff --git a/src/sass/views/onboarding/onboard-push-notifications.scss b/src/sass/views/onboarding/onboard-push-notifications.scss
deleted file mode 100644
index 09f939953..000000000
--- a/src/sass/views/onboarding/onboard-push-notifications.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-#onboarding-push-notifications {
- #notifications-topic {
- margin-top: 3rem;
- }
- #cta-buttons {
- @extend %cta-buttons;
- padding-bottom: 1rem;
- }
-}
diff --git a/src/sass/views/onboarding/onboarding.scss b/src/sass/views/onboarding/onboarding.scss
index c7129a68a..60bf824f7 100644
--- a/src/sass/views/onboarding/onboarding.scss
+++ b/src/sass/views/onboarding/onboarding.scss
@@ -82,7 +82,6 @@
@import "onboard-backup-request";
@import "../backup-warning";
@import "onboard-disclaimer";
-@import "onboard-push-notifications";
%onboarding-illustration {
width: 100%;
@@ -124,10 +123,6 @@
@extend %onboarding-illustration;
background-image: $v-onboarding-tour-control-bg;
}
- &-notifications {
- @extend %onboarding-illustration;
- background-image: $v-onboarding-push-notification-bg;
- }
&-backup-warning {
@extend %onboarding-illustration;
background-image: $v-onboarding-backup-warning-bg;
diff --git a/src/sass/views/pin.scss b/src/sass/views/pin.scss
new file mode 100644
index 000000000..3d695f185
--- /dev/null
+++ b/src/sass/views/pin.scss
@@ -0,0 +1,95 @@
+#pin {
+ background-color: #FAFAFA;
+ .bar.bar-clear {
+ background-color: transparent;
+ border: none;
+ .back-button .icon:before {
+ color: #2d3f50;
+ }
+ }
+ .content {
+ text-align: center;
+ width: 100%;
+ height: 100%;
+ .app-icon {
+ margin-top: -55px;
+ .big-icon-svg {
+ > .bg {
+ background-image: url("../img/app/icon.png");
+ height: 60px;
+ width: 60px;
+ margin: auto;
+ }
+ }
+ }
+ .block-text {
+ align-items: center;
+ background-color: #F1F1F1;
+ height: 30%;
+ border-bottom: 1px solid #c5c5c5;
+ .message {
+ margin: auto;
+ }
+ span {
+ width: 60%;
+ margin: 10% auto;
+ }
+ @media(min-width: 480px) {
+ span {
+ font-size: 30px;
+ width: 90%;
+ }
+ }
+ }
+ .block-code {
+ width: 50%;
+ margin: auto;
+ @media(min-width: 480px) {
+ width: 25%;
+ }
+ }
+ .block-buttons {
+ .col {
+ padding: 5%;
+ }
+ color: $v-dark-gray;
+ font-size: 1.7rem;
+ font-family: $v-font-family-light;
+ cursor: pointer;
+ position: absolute;
+ bottom: 3%;
+ left: 5%;
+ width: 90%;
+ @media(min-width: 480px) {
+ left: 15%;
+ width: 70%;
+ max-height: 55%;
+ }
+ }
+ }
+ @mixin circle {
+ border-radius: 50%;
+ box-shadow: 0 0 3px 0px #5b5b5b;
+ transition: background-color .2s ease-in-out;
+ padding: 7%;
+ margin: 5%;
+ }
+ .circle-copay {
+ @include circle;
+ border: 1px solid $v-accent-color;
+ }
+ .circle-bitpay {
+ @include circle;
+ border: 1px solid $v-primary-color;
+ }
+ .filled-copay {
+ background-color: $v-accent-color;
+ }
+ .filled-bitpay {
+ background-color: #1f3598;
+ }
+ .error {
+ color: #f13333;
+ max-width: 70%;
+ }
+}
diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss
index 2228ed07a..483f988c3 100644
--- a/src/sass/views/tab-receive.scss
+++ b/src/sass/views/tab-receive.scss
@@ -162,6 +162,17 @@
transform: translate(100%, -40%);
}
}
+ .overlay {
+ position: absolute;
+ width: 220px;
+ height: 100%;
+ background-color: rgba(255,255,255,0.8);
+ button {
+ width: 100%;
+ top: 50%;
+ transform: translateY(-50%);
+ }
+ }
@media(max-height: 700px) {
padding: 10vh 0 4vh;
}
diff --git a/src/sass/views/tab-settings.scss b/src/sass/views/tab-settings.scss
index b31dca0fa..08d87ef94 100644
--- a/src/sass/views/tab-settings.scss
+++ b/src/sass/views/tab-settings.scss
@@ -3,6 +3,13 @@
.icon-bitpay {
background-image: url("../img/icon-bitpay.svg");
}
+ .warning {
+ color: $v-warning-color;
+ }
+ .centered {
+ width: 100%;
+ text-align: center;
+ }
.disabled {
color: $v-light-gray;
}
diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss
index a4648928f..bd8520c01 100644
--- a/src/sass/views/views.scss
+++ b/src/sass/views/views.scss
@@ -46,3 +46,5 @@
@import "includes/accountSelector";
@import "integrations/integrations";
@import "custom-amount";
+@import "pin";
+@import "lockedView";
diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss
index 4b99238d5..b726710f9 100644
--- a/src/sass/views/walletDetails.scss
+++ b/src/sass/views/walletDetails.scss
@@ -209,6 +209,20 @@
font-size: 13px;
color: $v-mid-gray;
}
+ .low-fees {
+ .comment {
+ color: $v-mid-gray;
+ font-size: 12.5px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ margin-left: 25px;
+ }
+ img {
+ position: absolute;
+ margin-top: 3px;
+ }
+ }
}
.wallet-details-wallet-info {
@@ -238,7 +252,7 @@ a.item {
.recent svg {
margin-left:5px;
- width:0.7em;
+ width:0.7em;
height:0.7em;
stroke: #eee;
}
diff --git a/www/img/icon-fingerprint-bitpay.svg b/www/img/icon-fingerprint-bitpay.svg
new file mode 100644
index 000000000..edf9f95da
--- /dev/null
+++ b/www/img/icon-fingerprint-bitpay.svg
@@ -0,0 +1,52 @@
+
+
+
+
diff --git a/www/img/icon-fingerprint-copay.svg b/www/img/icon-fingerprint-copay.svg
new file mode 100644
index 000000000..dcad0d889
--- /dev/null
+++ b/www/img/icon-fingerprint-copay.svg
@@ -0,0 +1,52 @@
+
+
+
+
diff --git a/www/img/icon-inteltee-white.svg b/www/img/icon-inteltee-white.svg
new file mode 100644
index 000000000..92f9bc4ba
--- /dev/null
+++ b/www/img/icon-inteltee-white.svg
@@ -0,0 +1,28 @@
+
+
+
+
\ No newline at end of file
diff --git a/www/img/icon-warning.png b/www/img/icon-warning.png
new file mode 100644
index 000000000..fa33cfcdc
Binary files /dev/null and b/www/img/icon-warning.png differ
diff --git a/www/views/advancedSettings.html b/www/views/advancedSettings.html
index 9905fdec2..7181505f8 100644
--- a/www/views/advancedSettings.html
+++ b/www/views/advancedSettings.html
@@ -13,7 +13,7 @@
-
+
-
-
+
{{wallet.m}}-of-{{wallet.n}}
#{{wallet.credentials.account || 0}}
diff --git a/www/views/lockSetup.html b/www/views/lockSetup.html
new file mode 100644
index 000000000..1bab91b8b
--- /dev/null
+++ b/www/views/lockSetup.html
@@ -0,0 +1,17 @@
+
+ 
- {{'Share'|translate}} {{appName}}
+ Share {{appName}}
@@ -89,6 +89,16 @@
+
+
+
+ {{'Lock App' | translate}}
+
+ {{method}}
+
+
+
+
diff --git a/www/views/tx-details.html b/www/views/tx-details.html
index ef8a7c35d..c9a030c1a 100644
--- a/www/views/tx-details.html
+++ b/www/views/tx-details.html
@@ -84,6 +84,10 @@
{{feeFiatStr}}
+ This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender
+