Wallet Service Error
+Wallet Service Error
{{index.clientError.error || index.clientError.message || index.clientError}}
diff --git a/public/views/includes/loading.html b/public/views/includes/loading.html
deleted file mode 100644
index 4734a3fc0..000000000
--- a/public/views/includes/loading.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/public/views/includes/photo.html b/public/views/includes/photo.html
deleted file mode 100644
index 3e039d6c2..000000000
--- a/public/views/includes/photo.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/public/views/includes/pin.html b/public/views/includes/pin.html
deleted file mode 100644
index ea012ef97..000000000
--- a/public/views/includes/pin.html
+++ /dev/null
@@ -1,54 +0,0 @@
-
- 
-
-
- {{title|translate}}...
-
-
diff --git a/public/views/includes/sidebar.html b/public/views/includes/sidebar.html
index 5a1712f7a..74045f34e 100644
--- a/public/views/includes/sidebar.html
+++ b/public/views/includes/sidebar.html
@@ -12,7 +12,7 @@
- Setup a PIN - Repeat PIN -
-
- {{(pin.error || cp.error)|translate}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{{(item.name || item.id) | limitTo: 1}}
{{item.name || item.id}}
- {{item.m}} of {{item.n}}
+ {{item.m}} of {{item.n}}
-
+
diff --git a/public/views/modals/address-book.html b/public/views/modals/address-book.html
deleted file mode 100644
index a862e5dd8..000000000
--- a/public/views/modals/address-book.html
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-
-
-
- Add entry
-
-
-
diff --git a/public/views/modals/paypro.html b/public/views/modals/paypro.html
index 61641b8e0..c04c077e0 100644
--- a/public/views/modals/paypro.html
+++ b/public/views/modals/paypro.html
@@ -24,24 +24,24 @@
Address Book
-Add a new entry
-- Empty. Create an alias for your addresses -
-
-
- {{success|translate}}
-
-
- | Entry | -Creator | -Date | -Visible | -
|---|---|---|---|
|
- {{info.label}} - {{::addr}} - |
- {{$root.wallet.publicKeyRing.nicknameForCopayer(info.copayerId)}} | -- | - - - - | -
- To: {{paypro.domain}}
+ To: {{paypro.domain}}
- Certified by:
+ Certified by:
{{paypro.verifyData.caName}}
Untrusted
- Merchant Message:
+ Merchant message:
{{paypro.memo}}
- Expires: {{paypro.expires | amTimeAgo }}
+ Expires: {{paypro.expires | amTimeAgo }}
-
diff --git a/public/views/modals/scanner.html b/public/views/modals/scanner.html
index 30ec401c4..cc23eb242 100644
--- a/public/views/modals/scanner.html
+++ b/public/views/modals/scanner.html
@@ -5,7 +5,7 @@
diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html
index c2c669151..efb5a01f4 100644
--- a/public/views/modals/tx-details.html
+++ b/public/views/modals/tx-details.html
@@ -24,7 +24,7 @@
- {{addr}}
-
- change
-
-
-
-Information
- - To: + To: {{btx.merchant.domain}} @@ -36,25 +36,25 @@
- - Date: + Date:
- - Note: + Note: {{btx.message}}
- - Merchant Message: + Merchant message: {{btx.merchant.pr.pd.memo}}
-
- Confirmations:
+ Confirmations:
Unconfirmed
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index e0d86829b..48b35ed4b 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -14,35 +14,35 @@
Information
- - To: + To: {{tx.toAddress}}
- - Amount: + Amount: {{amountStr}} {{alternativeAmountStr}}
- - Time: + Time:
- - Create by: + Created by: {{tx.creatorName}}
- - Note: + Note: {{tx.message}}
-PAYMENT DETAILS
+Payment details
- - To: + To: {{tx.paypro.domain}} @@ -52,7 +52,7 @@
- - Expires: + Expires: @@ -65,7 +65,7 @@
-Signatures:
+Signatures
- diff --git a/public/views/modals/walletSelection.html b/public/views/modals/walletSelection.html deleted file mode 100644 index 8dd20c7ad..000000000 --- a/public/views/modals/walletSelection.html +++ /dev/null @@ -1,30 +0,0 @@ - - diff --git a/public/views/preferences.html b/public/views/preferences.html index 9ce5d791a..5c746f40c 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -26,12 +26,21 @@
- + Language + + + {{index.defaultLanguageName}} + + +
- Unit {{preferences.unitName}} - +
-
diff --git a/public/views/preferencesLanguage.html b/public/views/preferencesLanguage.html
new file mode 100644
index 000000000..6cd2eabbd
--- /dev/null
+++ b/public/views/preferencesLanguage.html
@@ -0,0 +1,10 @@
+++ diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 61136d5cc..dbce3f15d 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -88,7 +88,7 @@Applying changes++ {{lang.name}} + ++
Spend proposals
-diff --git a/src/js/controllers/createProfile.js b/src/js/controllers/createProfile.js index 514176e10..a9dc91307 100644 --- a/src/js/controllers/createProfile.js +++ b/src/js/controllers/createProfile.js @@ -6,24 +6,21 @@ angular.module('copayApp.controllers').controller('createProfileController', fun if (profileService.profile) go.walletHome(); - var pin=''; - // $rootScope.$on('pin', function(event, pin) { - self.creatingProfile = true; + self.creatingProfile = true; - $timeout(function() { - profileService.create(pin, function(err) { - if (err) { - self.creatingProfile = false; - $log.warn(err); - self.error = err; - $scope.$apply(); - $timeout(function() { - go.reload(); - }, 3000); - } else { - go.walletHome(); - } - }); - }, 100); - // }); + $timeout(function() { + profileService.create(function(err) { + if (err) { + self.creatingProfile = false; + $log.warn(err); + self.error = err; + $scope.$apply(); + $timeout(function() { + go.reload(); + }, 3000); + } else { + go.walletHome(); + } + }); + }, 100); }); diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index ee699b1c1..d24b42bee 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -28,6 +28,23 @@ angular.module('copayApp.controllers').controller('indexController', function($r 'link': 'history' }]; + self.availableLanguages = [{ + name: 'English', + isoCode: 'en', + }, { + name: 'Spanish', + isoCode: 'es', + }, { + name: 'Français', + isoCode: 'fr', + }, { + name: '日本人', + isoCode: 'ja', + }]; + + self.defaultLanguage = configService.getSync().wallet.settings.defaultLanguage || 'en'; + self.defaultLanguageName = lodash.result(lodash.find(this.availableLanguages, { 'isoCode': self.defaultLanguage }), 'name'); + self.setOngoingProcess = function(processName, isOn) { $log.debug('onGoingProcess', processName, isOn); self[processName] = isOn; @@ -419,7 +436,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); }; - // UX event handlers $rootScope.$on('Local/ColorUpdated', function(event) { self.updateColor(); diff --git a/src/js/controllers/pinController.js b/src/js/controllers/pinController.js deleted file mode 100644 index f8037b859..000000000 --- a/src/js/controllers/pinController.js +++ /dev/null @@ -1,73 +0,0 @@ -'use strict'; - -angular.module('copayApp.controllers').controller('pinController', function($scope, $timeout) { - this.init = function(confirmPin, testPin) { - this._firstpin = null; - this.askForPin = 1; - this.confirmPin = confirmPin; - this.clear(); - if (testPin) { - console.log('WARN: using test pin:', testPin); - $timeout(function() { - $scope.$emit('pin', testPin); - }, 100); - } - }; - - this.clear = function() { - this.digits = []; - this.defined = []; - }; - - this.press = function(digit) { - var self = this; - $timeout(function() { - self._press(digit); - }, 1); - }; - - this._press = function(digit) { - var self = this; - this.error = null; - this.digits.push(digit); - this.defined.push(true); - - if (this.digits.length == 4) { - var pin = this.digits.join(''); - - if (this.confirmPin) { - if (!this._firstpin) { - this._firstpin = pin; - this.askForPin = 2; - $timeout(function() { - self.clear(); - }, 100); - return; - } else { - if (pin === this._firstpin) { - $scope.$emit('pin', pin); - return; - } else { - this._firstpin = null; - this.askForPin = 1; - $timeout(function() { - self.clear(); - self.error = 'Entered PINs were not equal. Try again'; - var _self = self; - $timeout(function() { - _self.error = null; - }, 2000); - }, 100); - return; - } - } - } else { - $scope.$emit('pin', pin); - } - } - }; - - this.skip = function() { - $scope.$emit('pin', null); - }; -}); diff --git a/src/js/controllers/preferencesLanguage.js b/src/js/controllers/preferencesLanguage.js new file mode 100644 index 000000000..2714ec74a --- /dev/null +++ b/src/js/controllers/preferencesLanguage.js @@ -0,0 +1,23 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('preferencesLanguageController', + function($scope, $timeout, configService, applicationService) { + + this.save = function(newLang) { + var opts = { + wallet: { + settings: { + defaultLanguage: newLang + } + } + }; + + this.loading = true; + $timeout(function() { + configService.set(opts, function(err) { + if (err) console.log(err); + applicationService.restart(); + }); + }, 100); + }; + }); diff --git a/src/js/controllers/receive.js b/src/js/controllers/receive.js index fddd93ff4..bd5d47acc 100644 --- a/src/js/controllers/receive.js +++ b/src/js/controllers/receive.js @@ -59,31 +59,5 @@ angular.module('copayApp.controllers').controller('receiveController', } }; - this.openAddressModal = function(address) { - var self = this; - var ModalInstanceCtrl = function($scope, $modalInstance, address) { - $scope.address = address; - $scope.isCordova = self.isCordova; - $scope.copyAddress = function(addr) { - self.copyAddress(addr); - }; - - $scope.cancel = function() { - $modalInstance.dismiss('cancel'); - }; - }; - - $modal.open({ - templateUrl: 'views/modals/qr-address.html', - windowClass: 'full', - controller: ModalInstanceCtrl, - resolve: { - address: function() { - return address; - } - } - }); - }; - } ); diff --git a/src/js/controllers/send.js b/src/js/controllers/send.js index d91abae99..8a38e65a5 100644 --- a/src/js/controllers/send.js +++ b/src/js/controllers/send.js @@ -430,90 +430,4 @@ angular.module('copayApp.controllers').controller('sendController', return value; } }; - - this.openAddressBook = function() { - var w = $rootScope.wallet; - var modalInstance = $modal.open({ - templateUrl: 'views/modals/address-book.html', - windowClass: 'full', - controller: function($scope, $modalInstance) { - - $scope.showForm = null; - $scope.addressBook = w.addressBook; - - $scope.hasEntry = function() { - return _.keys($scope.addressBook).length > 0 ? true : false; - }; - - $scope.toggleAddressBookEntry = function(key) { - w.toggleAddressBookEntry(key); - }; - - $scope.copyToSend = function(addr) { - $modalInstance.close(addr); - }; - - $scope.cancel = function(form) { - $scope.error = $scope.success = $scope.newaddress = $scope.newlabel = null; - clearForm(form); - $scope.toggleForm(); - }; - - $scope.toggleForm = function() { - $scope.showForm = !$scope.showForm; - }; - - var clearForm = function(form) { - form.newaddress.$pristine = true; - form.newaddress.$setViewValue(''); - form.newaddress.$render(); - - form.newlabel.$pristine = true; - form.newlabel.$setViewValue(''); - form.newlabel.$render(); - form.$setPristine(); - }; - - // TODO change to modal - $scope.submitAddressBook = function(form) { - if (form.$invalid) { - return; - } - $scope.blockUx = true; - $timeout(function() { - var errorMsg; - var entry = { - "address": form.newaddress.$modelValue, - "label": form.newlabel.$modelValue - }; - try { - w.setAddressBook(entry.address, entry.label); - } catch (e) { - $log.warn(e); - errorMsg = e.message; - } - - if (errorMsg) { - $scope.error = errorMsg; - } else { - clearForm(form); - $scope.toggleForm(); - notification.success('Entry created', 'New addressbook entry created') - } - $scope.blockUx = false; - $rootScope.$digest(); - }, 100); - return; - }; - - $scope.close = function() { - $modalInstance.dismiss('cancel'); - }; - }, - }); - - modalInstance.result.then(function(addr) { - $scope.setForm(addr); - }); - }; }); diff --git a/src/js/routes.js b/src/js/routes.js index e2326fc01..53dfaeeec 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -254,6 +254,23 @@ angular } } }) + .state('preferencesLanguage', { + url: '/preferencesLanguage', + walletShouldBeComplete: true, + needProfile: true, + views: { + 'main': { + templateUrl: 'views/preferencesLanguage.html' + }, + 'topbar': { + templateUrl: 'views/includes/topbar.html', + controller: function($scope) { + $scope.titleSection = 'Language'; + $scope.goBackToState = 'preferences'; + } + } + } + }) .state('preferencesUnit', { url: '/preferencesUnit', templateUrl: 'views/preferencesUnit.html', @@ -415,22 +432,32 @@ angular needProfile: false }); }) - .run(function($rootScope, $state, $log, gettextCatalog, uriHandler, isCordova, amMoment, profileService) { + .run(function($rootScope, $state, $log, gettextCatalog, uriHandler, isCordova, amMoment, profileService, configService) { - // Auto-detect browser language - // (default: English) - var userLang, androidLang; - - if (navigator && navigator.userAgent && (androidLang = navigator.userAgent.match(/android.*\W(\w\w)-(\w\w)\W/i))) { - userLang = androidLang[1]; - } else { - // works for iOS and Android 4.x - userLang = navigator.userLanguage || navigator.language; + var userLang = configService.getSync().wallet.settings.defaultLanguage; + if (!userLang) { + // Auto-detect browser language + var androidLang; + + if (navigator && navigator.userAgent && (androidLang = navigator.userAgent.match(/android.*\W(\w\w)-(\w\w)\W/i))) { + userLang = androidLang[1]; + } else { + // works for iOS and Android 4.x + userLang = navigator.userLanguage || navigator.language; + } + userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en'; } - userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en'; - gettextCatalog.setCurrentLanguage(userLang); - amMoment.changeLocale(userLang); + configService.set({ + wallet: { + settings: { + defaultLanguage: userLang + } + } + }, function() { + gettextCatalog.setCurrentLanguage(userLang); + amMoment.changeLocale(userLang); + }); // Register URI handler, not for mobileApp if (!isCordova) { @@ -446,6 +473,7 @@ angular preferencesColor: 12, backup: 12, delete: 12, + preferencesLanguage: 12, preferencesUnit: 12, preferencesAltCurrency: 12, preferencesBwsUrl: 12, diff --git a/src/js/services/configService.js b/src/js/services/configService.js index 1efdf20fa..99554e9b3 100644 --- a/src/js/services/configService.js +++ b/src/js/services/configService.js @@ -58,8 +58,6 @@ angular.module('copayApp.services').factory('configService', function(localStora var configCache = null; - - root.getSync = function() { if (!configCache) throw new Error('configService#getSync called when cache is not initialized'); diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 420bce8b5..385779b3e 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -136,7 +136,7 @@ angular.module('copayApp.services') }); }; - root._createNewProfile = function(pin, cb) { + root._createNewProfile = function(cb) { var walletClient = bwcService.getClient(); walletClient.createWallet('Personal Wallet', 'me', 1, 1, { @@ -260,8 +260,8 @@ angular.module('copayApp.services') - root.create = function(pin, cb) { - root._createNewProfile(pin, function(err, p) { + root.create = function(cb) { + root._createNewProfile(function(err, p) { if (err) return cb(err); root.bindProfile(p, function(err) { storageService.storeNewProfile(p, function(err) {
Global settings
+ +