'
- }
+ template: '
'
+ };
});
diff --git a/src/js/directives/incomingDataMenu.js b/src/js/directives/incomingDataMenu.js
index a43351438..629ee2562 100644
--- a/src/js/directives/incomingDataMenu.js
+++ b/src/js/directives/incomingDataMenu.js
@@ -13,8 +13,8 @@ angular.module('copayApp.directives')
scope.showMenu = true;
scope.https = false;
- if(scope.type === 'url') {
- if(scope.data.indexOf('https://') === 0) {
+ if (scope.type === 'url') {
+ if (scope.data.indexOf('https://') === 0) {
scope.https = true;
}
}
@@ -24,14 +24,16 @@ angular.module('copayApp.directives')
scope.showMenu = false;
$rootScope.$broadcast('incomingDataMenu.menuHidden');
};
- scope.goToUrl = function(url){
+ scope.goToUrl = function(url) {
externalLinkService.open(url);
};
scope.sendPaymentToAddress = function(bitcoinAddress) {
scope.showMenu = false;
$state.go('tabs.send').then(function() {
$timeout(function() {
- $state.transitionTo('tabs.send.amount', {toAddress: bitcoinAddress});
+ $state.transitionTo('tabs.send.amount', {
+ toAddress: bitcoinAddress
+ });
}, 50);
});
};
@@ -40,11 +42,23 @@ angular.module('copayApp.directives')
$timeout(function() {
$state.go('tabs.send').then(function() {
$timeout(function() {
- $state.transitionTo('tabs.send.addressbook', {addressbookEntry: bitcoinAddress});
+ $state.transitionTo('tabs.send.addressbook', {
+ addressbookEntry: bitcoinAddress
+ });
});
});
}, 100);
};
+ scope.scanPaperWallet = function(privateKey) {
+ scope.showMenu = false;
+ $state.go('tabs.home').then(function() {
+ $timeout(function() {
+ $state.transitionTo('tabs.home.paperWallet', {
+ privateKey: privateKey
+ });
+ }, 50);
+ });
+ };
}
};
});
diff --git a/src/js/directives/slideToAccept.js b/src/js/directives/slideToAccept.js
index a396e2b0d..e57aaecff 100644
--- a/src/js/directives/slideToAccept.js
+++ b/src/js/directives/slideToAccept.js
@@ -8,7 +8,8 @@ angular.module('copayApp.directives')
transclude: true,
scope: {
sendStatus: '=slideSendStatus',
- onConfirm: '&slideOnConfirm'
+ onConfirm: '&slideOnConfirm',
+ wallet: '=hasWalletChosen'
},
link: function(scope, element, attrs) {
@@ -33,9 +34,9 @@ angular.module('copayApp.directives')
scope.displaySendStatus = '';
scope.$watch('sendStatus', function() {
- if(!scope.sendStatus) {
+ if (!scope.sendStatus) {
reset();
- } else if(scope.sendStatus === 'success') {
+ } else if (scope.sendStatus === 'success') {
scope.displaySendStatus = '';
$timeout(function() {
reset();
@@ -51,19 +52,20 @@ angular.module('copayApp.directives')
var startTime = currentEaseStartTime;
var initialPct = fromPct;
var distance = pct - fromPct;
+
function ease() {
- if(startTime !== currentEaseStartTime) {
+ if (startTime !== currentEaseStartTime) {
return;
}
$window.requestAnimationFrame(function() {
var now = Date.now();
var elapsed = now - startTime;
- var normalizedElapsedTime = elapsed/duration;
+ var normalizedElapsedTime = elapsed / duration;
var newVal = easeFx(normalizedElapsedTime);
- var newPct = newVal*distance + initialPct;
+ var newPct = newVal * distance + initialPct;
animateFx(newPct);
scope.$digest();
- if(elapsed < duration) {
+ if (elapsed < duration) {
ease();
} else {
deferred.resolve();
@@ -93,31 +95,33 @@ angular.module('copayApp.directives')
function setNewSliderStyle(pct) {
var knobWidthPct = getKnobWidthPercentage();
var translatePct = pct - knobWidthPct;
- if(isSliding) {
- translatePct += 0.35*pct;
+ if (isSliding) {
+ translatePct += 0.35 * pct;
}
scope.sliderStyle = getTransformStyle(translatePct);
curSliderPct = pct;
}
function setNewBitcoinStyle(pct) {
- var translatePct = -2.25*pct;
+ var translatePct = -2.25 * pct;
scope.bitcoinStyle = getTransformStyle(translatePct);
curBitcoinPct = pct;
}
function setNewTextStyle(pct) {
- var translatePct = -0.1*pct;
+ var translatePct = -0.1 * pct;
scope.textStyle = getTransformStyle(translatePct);
curTextPct = pct;
}
function getTransformStyle(translatePct) {
- return {'transform': 'translateX(' + translatePct + '%)'};
+ return {
+ 'transform': 'translateX(' + translatePct + '%)'
+ };
}
- function getKnobWidthPercentage() {
- var knobWidthPct = (KNOB_WIDTH/elm.clientWidth)*100;
+ function getKnobWidthPercentage() {
+ var knobWidthPct = (KNOB_WIDTH / elm.clientWidth) * 100;
return knobWidthPct;
}
@@ -175,8 +179,8 @@ angular.module('copayApp.directives')
function getTouchXPosition($event) {
var x;
- if($event.touches || $event.changedTouches) {
- if($event.touches.length) {
+ if ($event.touches || $event.changedTouches) {
+ if ($event.touches.length) {
x = $event.touches[0].clientX;
} else {
x = $event.changedTouches[0].clientX;
@@ -190,18 +194,18 @@ angular.module('copayApp.directives')
function getSlidPercentage($event) {
var x = getTouchXPosition($event);
var width = elm.clientWidth;
- var pct = (x/width)*100;
- if(x >= width) {
+ var pct = (x / width) * 100;
+ if (x >= width) {
pct = 100;
}
return pct;
}
scope.onTouchstart = function($event) {
- if(scope.isSlidFully) {
+ if (scope.isSlidFully) {
return;
}
- if(!isSliding) {
+ if (!isSliding) {
var pct = getSlidPercentage($event);
if (pct > MAX_SLIDE_START_PERCENTAGE) {
jiggleSlider();
@@ -209,7 +213,7 @@ angular.module('copayApp.directives')
} else {
isSliding = true;
var knobWidthPct = getKnobWidthPercentage();
- if(pct < knobWidthPct) {
+ if (pct < knobWidthPct) {
pct = knobWidthPct;
}
pct += PERCENTAGE_BUMP;
@@ -219,12 +223,12 @@ angular.module('copayApp.directives')
};
scope.onTouchmove = function($event) {
- if(!isSliding || scope.isSlidFully) {
+ if (!isSliding || scope.isSlidFully) {
return;
}
var pct = getSlidPercentage($event);
var knobWidthPct = getKnobWidthPercentage();
- if(pct < knobWidthPct) {
+ if (pct < knobWidthPct) {
pct = knobWidthPct;
}
pct += PERCENTAGE_BUMP;
@@ -233,11 +237,11 @@ angular.module('copayApp.directives')
};
scope.onTouchend = function($event) {
- if(scope.isSlidFully) {
+ if (scope.isSlidFully) {
return;
}
var pct = getSlidPercentage($event);
- if(isSliding && pct > FULLY_SLID_PERCENTAGE) {
+ if (isSliding && pct > FULLY_SLID_PERCENTAGE) {
pct = 100;
setSliderPosition(pct);
alertSlidFully();
diff --git a/src/js/directives/walletSelector.js b/src/js/directives/walletSelector.js
index 97149d528..c5dfff59a 100644
--- a/src/js/directives/walletSelector.js
+++ b/src/js/directives/walletSelector.js
@@ -7,6 +7,7 @@ angular.module('copayApp.directives')
templateUrl: 'views/includes/walletSelector.html',
transclude: true,
scope: {
+ title: '=walletSelectorTitle',
show: '=walletSelectorShow',
wallets: '=walletSelectorWallets',
selectedWallet: '=walletSelectorSelectedWallet',
diff --git a/src/js/routes.js b/src/js/routes.js
index 7c81ba150..278d24646 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -151,7 +151,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
*/
.state('tabs.wallet', {
- url: '/wallet/{walletId}/{fromOnboarding}',
+ url: '/wallet/:walletId/:fromOnboarding',
views: {
'tab-home@tabs': {
controller: 'walletDetailsController',
@@ -182,7 +182,24 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
views: {
'tab-home@tabs': {
controller: 'txDetailsController',
- templateUrl: 'views/modals/tx-details.html'
+ templateUrl: 'views/tx-details.html'
+ }
+ }
+ })
+ .state('tabs.wallet.backupWarning', {
+ url: '/backupWarning/:from/:walletId',
+ views: {
+ 'tab-home@tabs': {
+ templateUrl: 'views/backupWarning.html'
+ }
+ }
+ })
+ .state('tabs.wallet.backup', {
+ url: '/backup/:walletId',
+ views: {
+ 'tab-home@tabs': {
+ templateUrl: 'views/backup.html',
+ controller: 'backupController'
}
}
})
@@ -269,7 +286,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
})
.state('tabs.send.confirm', {
- url: '/confirm/:isWallet/:toAddress/:toName/:toAmount/:toEmail/:description',
+ url: '/confirm/:isWallet/:toAddress/:toName/:toAmount/:toEmail/:description/:useSendMax',
views: {
'tab-send@tabs': {
controller: 'confirmController',
@@ -538,15 +555,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
}
})
- .state('tabs.preferences.paperWallet', {
- url: '/paperWallet',
- views: {
- 'tab-settings@tabs': {
- controller: 'paperWalletController',
- templateUrl: 'views/paperWallet.html'
- }
- }
- })
/*
*
@@ -601,7 +609,57 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
/*
*
- * Back flow from receive
+ * Addresses
+ *
+ */
+
+ .state('tabs.receive.addresses', {
+ url: '/addresses/:walletId',
+ views: {
+ 'tab-receive@tabs': {
+ controller: 'addressesController',
+ templateUrl: 'views/addresses.html'
+ }
+ }
+ })
+ .state('tabs.receive.allAddresses', {
+ url: '/allAddresses/:walletId',
+ views: {
+ 'tab-receive@tabs': {
+ controller: 'addressesController',
+ templateUrl: 'views/allAddresses.html'
+ }
+ }
+ })
+
+ /*
+ *
+ * Request Specific amount
+ *
+ */
+
+ .state('tabs.receive.amount', {
+ url: '/amount/:customAmount/:toAddress',
+ views: {
+ 'tab-receive@tabs': {
+ controller: 'amountController',
+ templateUrl: 'views/amount.html'
+ }
+ }
+ })
+ .state('tabs.receive.customAmount', {
+ url: '/customAmount/:toAmount/:toAddress',
+ views: {
+ 'tab-receive@tabs': {
+ controller: 'customAmountController',
+ templateUrl: 'views/customAmount.html'
+ }
+ }
+ })
+
+ /*
+ *
+ * Init backup flow
*
*/
@@ -625,10 +683,25 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
/*
*
- * Onboarding
+ * Paper Wallet
*
*/
+ .state('tabs.home.paperWallet', {
+ url: '/paperWallet/:privateKey',
+ views: {
+ 'tab-home@tabs': {
+ controller: 'paperWalletController',
+ templateUrl: 'views/paperWallet.html'
+ }
+ }
+ })
+ /*
+ *
+ * Onboarding
+ *
+ */
+
.state('onboarding', {
url: '/onboarding',
abstract: true,
@@ -695,7 +768,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
url: '/disclaimer/:walletId/:backedUp/:resume',
views: {
'onboarding': {
- templateUrl: 'views/onboarding/disclaimer.html'
+ templateUrl: 'views/onboarding/disclaimer.html',
+ controller: 'disclaimerController'
}
}
})
@@ -720,6 +794,67 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
},
})
+ /*
+ *
+ * Feedback
+ *
+ */
+
+ .state('tabs.feedback', {
+ url: '/feedback',
+ views: {
+ 'tab-settings@tabs': {
+ templateUrl: 'views/feedback/send.html',
+ controller: 'sendController'
+ }
+ }
+ })
+ .state('tabs.shareApp', {
+ url: '/shareApp/:score/:skipped/:fromSettings',
+ views: {
+ 'tab-settings@tabs': {
+ controller: 'completeController',
+ templateUrl: 'views/feedback/complete.html'
+ }
+ }
+ })
+ .state('tabs.rate', {
+ url: '/rate',
+ abstract: true
+ })
+ .state('tabs.rate.send', {
+ url: '/send/:score',
+ views: {
+ 'tab-home@tabs': {
+ templateUrl: 'views/feedback/send.html',
+ controller: 'sendController'
+ }
+ }
+ })
+ .state('tabs.rate.complete', {
+ url: '/complete/:score/:skipped',
+ views: {
+ 'tab-home@tabs': {
+ controller: 'completeController',
+ templateUrl: 'views/feedback/complete.html'
+ }
+ },
+ customConfig: {
+ hideStatusBar: true
+ }
+ })
+ .state('tabs.rate.rateApp', {
+ url: '/rateApp/:score',
+ views: {
+ 'tab-home@tabs': {
+ controller: 'rateAppController',
+ templateUrl: 'views/feedback/rateApp.html'
+ }
+ },
+ customConfig: {
+ hideStatusBar: true
+ }
+ })
/*
*
@@ -753,30 +888,28 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
}
})
- .state('tabs.buyandsell.glidera.buy', {
- url: '/buy',
+ .state('tabs.buyandsell.glidera.amount', {
+ url: '/amount/:isGlidera/:glideraAccessToken',
views: {
'tab-home@tabs': {
- controller: 'buyGlideraController',
- controllerAs: 'buy',
- templateUrl: 'views/buyGlidera.html'
+ controller: 'amountController',
+ templateUrl: 'views/amount.html'
}
}
})
- .state('tabs.buyandsell.glidera.sell', {
- url: '/sell',
+ .state('tabs.buyandsell.glidera.confirm', {
+ url: '/confirm/:toAmount/:isGlidera/:glideraAccessToken',
views: {
'tab-home@tabs': {
- controller: 'sellGlideraController',
- controllerAs: 'sell',
- templateUrl: 'views/sellGlidera.html'
+ controller: 'confirmController',
+ templateUrl: 'views/confirm.html'
}
}
})
- .state('tabs.buyandsell.glidera.preferences', {
- url: '/preferences',
+ .state('tabs.preferences.glidera', {
+ url: '/glidera',
views: {
- 'tab-home@tabs': {
+ 'tab-settings@tabs': {
controller: 'preferencesGlideraController',
templateUrl: 'views/preferencesGlidera.html'
}
@@ -830,16 +963,36 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
controller: 'amazonController',
templateUrl: 'views/amazon.html'
}
+ },
+ params: {
+ cardClaimCode: null
}
})
- .state('tabs.giftcards.amazon.buy', {
- url: '/buy',
+ .state('tabs.giftcards.amazon.amount', {
+ url: '/amount',
views: {
'tab-home@tabs': {
- controller: 'buyAmazonController',
- controllerAs: 'buy',
- templateUrl: 'views/buyAmazon.html'
+ controller: 'amountController',
+ templateUrl: 'views/amount.html'
}
+ },
+ params: {
+ isGiftCard: true,
+ toName: 'Amazon.com Gift Card'
+ }
+ })
+ .state('tabs.giftcards.amazon.confirm', {
+ url: '/confirm/:toAmount/:toAddress/:description/:giftCardAmountUSD/:giftCardAccessKey/:giftCardInvoiceTime/:giftCardUUID',
+ views: {
+ 'tab-home@tabs': {
+ controller: 'confirmController',
+ templateUrl: 'views/confirm.html'
+ }
+ },
+ params: {
+ isGiftCard: true,
+ toName: 'Amazon.com Gift Card',
+ paypro: null
}
})
@@ -889,10 +1042,10 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
paypro: null
}
})
- .state('tabs.bitpayCard.preferences', {
- url: '/preferences',
+ .state('tabs.preferences.bitpayCard', {
+ url: '/bitpay-card',
views: {
- 'tab-home@tabs': {
+ 'tab-settings@tabs': {
controller: 'preferencesBitpayCardController',
templateUrl: 'views/preferencesBitpayCard.html'
}
@@ -1030,4 +1183,14 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
$log.debug(' toParams:' + JSON.stringify(toParams || {}));
$log.debug(' fromParams:' + JSON.stringify(fromParams || {}));
});
+
+ $rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams) {
+ if ($window.StatusBar) {
+ if (toState.customConfig && toState.customConfig.hideStatusBar) {
+ $window.StatusBar.hide();
+ } else {
+ $window.StatusBar.show();
+ }
+ }
+ });
});
diff --git a/src/js/services/amazonService.js b/src/js/services/amazonService.js
index 6a39d7812..4d82bc337 100644
--- a/src/js/services/amazonService.js
+++ b/src/js/services/amazonService.js
@@ -70,7 +70,7 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo
});
// Show pending task from the UI
- storageService.setNextStep('AmazonGiftCards', true, function(err) {});
+ storageService.setNextStep('AmazonGiftCards', 'true', function(err) {});
};
root.getPendingGiftCards = function(cb) {
diff --git a/src/js/services/backupService.js b/src/js/services/backupService.js
index b39834627..165aa4a2e 100644
--- a/src/js/services/backupService.js
+++ b/src/js/services/backupService.js
@@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.services')
- .factory('backupService', function backupServiceFactory($log, $timeout, $stateParams, profileService, sjcl) {
+ .factory('backupService', function backupServiceFactory($log, $timeout, $stateParams, profileService, sjcl, $window) {
var root = {};
@@ -80,7 +80,7 @@ angular.module('copayApp.services')
var walletName = (wallet.alias || '') + (wallet.alias ? '-' : '') + wallet.credentials.walletName;
if (opts.noSign) walletName = walletName + '-noSign'
- var filename = walletName + '-Copaybackup.aes.json';
+ var filename = walletName + '-' + $window.appConfig.nameCase + 'backup.aes.json';
_download(ew, filename, cb)
};
return root;
diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js
index 4ae042f6c..bf57b805a 100644
--- a/src/js/services/bitpayCardService.js
+++ b/src/js/services/bitpayCardService.js
@@ -7,7 +7,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
var _setError = function(msg, e) {
$log.error(msg);
- var error = e.data ? e.data.error : msg;
+ var error = (e && e.data && e.data.error) ? e.data.error : msg;
return error;
};
@@ -104,7 +104,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
};
root.bitAuthPair = function(obj, cb) {
- var deviceName = 'Unknow device';
+ var deviceName = 'Unknown device';
if (platformInfo.isNW) {
deviceName = require('os').platform();
} else if (platformInfo.isCordova) {
@@ -143,7 +143,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
root.getBitpayDebitCards(function(err, data) {
if (err) return cb(err);
var card = lodash.find(data, {id : cardId});
- if (!card) return cb(_setError('Not card found'));
+ if (!card) return cb(_setError('Card not found'));
// Get invoices
$http(_post('/api/v2/' + card.token, json, appIdentity)).then(function(data) {
$log.info('BitPay Get Invoices: SUCCESS');
@@ -180,7 +180,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
root.getBitpayDebitCards(function(err, data) {
if (err) return cb(err);
var card = lodash.find(data, {id : cardId});
- if (!card) return cb(_setError('Not card found'));
+ if (!card) return cb(_setError('Card not found'));
$http(_post('/api/v2/' + card.token, json, appIdentity)).then(function(data) {
$log.info('BitPay TopUp: SUCCESS');
if(data.data.error) {
@@ -258,13 +258,30 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
root.remove = function(card, cb) {
storageService.removeBitpayDebitCard(BITPAY_CARD_NETWORK, card, function(err) {
+ if (err) {
+ $log.error('Error removing BitPay debit card: ' + err);
+ // Continue, try to remove/cleanup card history
+ }
storageService.removeBitpayDebitCardHistory(BITPAY_CARD_NETWORK, card, function(err) {
- $log.info('BitPay Debit Card(s) Removed: SUCCESS');
+ if (err) {
+ $log.error('Error removing BitPay debit card transaction history: ' + err);
+ return cb(err);
+ }
+ $log.info('Successfully removed BitPay debit card');
return cb();
});
});
};
+ root.getRates = function(currency, cb) {
+ $http(_get('/rates/' + currency)).then(function(data) {
+ $log.info('BitPay Get Rates: SUCCESS');
+ return cb(data.data.error, data.data.data);
+ }, function(data) {
+ return cb(_setError('BitPay Error: Get Rates', data));
+ });
+ };
+
/*
* CONSTANTS
*/
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index 618118e35..5bd6c3cc6 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -15,6 +15,16 @@ angular.module('copayApp.services').factory('configService', function(storageSer
url: 'https://bws.bitpay.com/bws/api',
},
+ download: {
+ url: 'https://bitpay.com/wallet',
+ },
+
+ rateApp: {
+ ios: 'http://itunes.apple.com/WebObjects/MZStore.woa/wa/viewContentsUserReviews?id=1149581638&pageNumber=0&sortOrdering=2&type=Purple+Software&mt=8',
+ android: 'https://play.google.com/store/apps/details?id=com.bitpay.wallet',
+ wp: ''
+ },
+
// wallet default config
wallet: {
requiredCopayers: 2,
diff --git a/src/js/services/externalLinkService.js b/src/js/services/externalLinkService.js
index a9818d9df..b47dd7857 100644
--- a/src/js/services/externalLinkService.js
+++ b/src/js/services/externalLinkService.js
@@ -21,14 +21,10 @@ angular.module('copayApp.services').service('externalLinkService', function(plat
_restoreHandleOpenURL(old);
} else {
if (optIn) {
- var message = gettextCatalog.getString(message),
- title = gettextCatalog.getString(title),
- okText = gettextCatalog.getString(okText),
- cancelText = gettextCatalog.getString(cancelText),
- openBrowser = function(res) {
- if (res) window.open(url, '_system');
- _restoreHandleOpenURL(old);
- };
+ var openBrowser = function(res) {
+ if (res) window.open(url, '_system');
+ _restoreHandleOpenURL(old);
+ };
popupService.showConfirm(title, message, okText, cancelText, openBrowser);
} else {
window.open(url, '_system');
diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js
index de1caa722..6a9691ebc 100644
--- a/src/js/services/feeService.js
+++ b/src/js/services/feeService.js
@@ -1,6 +1,6 @@
'use strict';
-angular.module('copayApp.services').factory('feeService', function($log, $stateParams, bwcService, walletService, configService, gettext, lodash, txFormatService) {
+angular.module('copayApp.services').factory('feeService', function($log, $stateParams, bwcService, walletService, configService, gettext, lodash, txFormatService, gettextCatalog) {
var root = {};
// Constant fee options to translate
@@ -15,48 +15,48 @@ angular.module('copayApp.services').factory('feeService', function($log, $stateP
return configService.getSync().wallet.settings.feeLevel || 'normal';
};
- root.getCurrentFeeValue = function(cb) {
- console.log('[feeService.js.18:getCurrentFeeValue:] TODO TODO TODO'); //TODO
- // TODO TODO TODO
- var wallet = profileService.getWallet($stateParams.walletId);
+ root.getCurrentFeeValue = function(network, cb) {
+ network = network || 'livenet';
var feeLevel = root.getCurrentFeeLevel();
- wallet.getFeeLevels(wallet.credentials.network, function(err, levels) {
- if (err)
- return cb({
- message: 'Could not get dynamic fee'
- });
+ root.getFeeLevels(function(err, levels) {
+ if (err) return cb(err);
- var feeLevelValue = lodash.find(levels, {
+ var feeLevelValue = lodash.find(levels[network], {
level: feeLevel
});
- if (!feeLevelValue || !feeLevelValue.feePerKB)
+
+ if (!feeLevelValue || !feeLevelValue.feePerKB) {
return cb({
- message: 'Could not get dynamic fee for level: ' + feeLevel
+ message: gettextCatalog.getString("Could not get dynamic fee for level: {{feeLevel}}", {
+ feeLevel: feeLevel
+ })
});
+ }
var fee = feeLevelValue.feePerKB;
$log.debug('Dynamic fee: ' + feeLevel + ' ' + fee + ' SAT');
+
return cb(null, fee);
});
};
root.getFeeLevels = function(cb) {
var walletClient = bwcService.getClient();
-
var unitName = configService.getSync().wallet.settings.unitName;
walletClient.getFeeLevels('livenet', function(errLivenet, levelsLivenet) {
walletClient.getFeeLevels('testnet', function(errTestnet, levelsTestnet) {
- if (errLivenet || errTestnet) $log.debug('Could not get dynamic fee');
- else {
+ 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;
}
}
- return cb({
+ return cb(null, {
'livenet': levelsLivenet,
'testnet': levelsTestnet
});
diff --git a/src/js/services/feedbackService.js b/src/js/services/feedbackService.js
new file mode 100644
index 000000000..b35c4c323
--- /dev/null
+++ b/src/js/services/feedbackService.js
@@ -0,0 +1,58 @@
+'use strict';
+angular.module('copayApp.services').factory('feedbackService', function($http, $log, $httpParamSerializer, configService) {
+ var root = {};
+ var URL = "https://script.google.com/macros/s/AKfycbybtvNSQKUfgzgXcj3jYLlvCKrcBoktjiJ1V8_cwd2yVkpUBGe3/exec";
+
+ root.send = function(dataSrc, cb) {
+ $http(_post(dataSrc)).then(function() {
+ $log.info("SUCCESS: Feedback sent");
+ return cb();
+ }, function(err) {
+ $log.info("ERROR: Feedback sent anyway.");
+ return cb(err);
+ });
+ };
+
+ var _post = function(dataSrc) {
+ return {
+ method: 'POST',
+ url: URL,
+ headers: {
+ 'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'
+ },
+ data: $httpParamSerializer(dataSrc)
+ };
+ };
+
+ root.isVersionUpdated = function(currentVersion, savedVersion) {
+
+ if (!verifyTagFormat(currentVersion))
+ return 'Cannot verify the format of version tag: ' + currentVersion;
+ if (!verifyTagFormat(savedVersion))
+ return 'Cannot verify the format of the saved version tag: ' + savedVersion;
+
+ var current = formatTagNumber(currentVersion);
+ var saved = formatTagNumber(savedVersion);
+ if (saved.major > current.major || (saved.major == current.major && saved.minor > current.minor))
+ return false;
+
+ return true;
+
+ function verifyTagFormat(tag) {
+ var regex = /^v?\d+\.\d+\.\d+$/i;
+ return regex.exec(tag);
+ };
+
+ function formatTagNumber(tag) {
+ var formattedNumber = tag.replace(/^v/i, '').split('.');
+ return {
+ major: +formattedNumber[0],
+ minor: +formattedNumber[1],
+ patch: +formattedNumber[2]
+ };
+ };
+
+ };
+
+ return root;
+});
diff --git a/src/js/services/glideraService.js b/src/js/services/glideraService.js
index 5d0f687b3..06e30cf14 100644
--- a/src/js/services/glideraService.js
+++ b/src/js/services/glideraService.js
@@ -81,7 +81,7 @@ angular.module('copayApp.services').factory('glideraService', function($http, $l
$http(req).then(function(data) {
$log.info('Glidera Authorization Access Token: SUCCESS');
// Show pending task from the UI
- storageService.setNextStep('BuyAndSell', true, function(err) {});
+ storageService.setNextStep('BuyAndSell', 'true', function(err) {});
return cb(null, data.data);
}, function(data) {
$log.error('Glidera Authorization Access Token: ERROR ' + data.statusText);
@@ -192,8 +192,13 @@ angular.module('copayApp.services').factory('glideraService', function($http, $l
};
root.get2faCode = function(token, cb) {
- if (!token) return cb('Invalid Token');
+ if (!token) {
+ $log.error('Glidera Sent 2FA code by SMS: ERROR Invalid Token');
+ return cb('Invalid Token');
+ }
+
$http(_get('/authentication/get2faCode', token)).then(function(data) {
+
$log.info('Glidera Sent 2FA code by SMS: SUCCESS');
return cb(null, data.status == 200 ? true : false);
}, function(data) {
diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js
index 2db4832a7..7600dcb79 100644
--- a/src/js/services/incomingData.js
+++ b/src/js/services/incomingData.js
@@ -31,17 +31,31 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
if (!url) return;
name = name.replace(/[\[\]]/g, "\\$&");
var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
- results = regex.exec(url);
+ results = regex.exec(url);
if (!results) return null;
if (!results[2]) return '';
return decodeURIComponent(results[2].replace(/\+/g, " "));
}
+ function checkPrivateKey(privateKey) {
+ try {
+ new bitcore.PrivateKey(privateKey, 'livenet');
+ } catch (err) {
+ return false;
+ }
+ return true;
+ }
+
// data extensions for Payment Protocol with non-backwards-compatible request
if ((/^bitcoin:\?r=[\w+]/).exec(data)) {
data = decodeURIComponent(data.replace('bitcoin:?r=', ''));
- $state.go('tabs.send', {}, {'reload': true, 'notify': $state.current.name == 'tabs.send' ? false : true}).then(function() {
- $state.transitionTo('tabs.send.confirm', {paypro: data});
+ $state.go('tabs.send', {}, {
+ 'reload': true,
+ 'notify': $state.current.name == 'tabs.send' ? false : true
+ }).then(function() {
+ $state.transitionTo('tabs.send.confirm', {
+ paypro: data
+ });
});
return true;
}
@@ -55,31 +69,43 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
var addr = parsed.address ? parsed.address.toString() : '';
var message = parsed.message;
- var amount = parsed.amount ? parsed.amount : '';
+ var amount = parsed.amount ? parsed.amount : '';
if (parsed.r) {
payproService.getPayProDetails(parsed.r, function(err, details) {
handlePayPro(details);
});
} else {
- $state.go('tabs.send', {}, {'reload': true, 'notify': $state.current.name == 'tabs.send' ? false : true});
+ $state.go('tabs.send', {}, {
+ 'reload': true,
+ 'notify': $state.current.name == 'tabs.send' ? false : true
+ });
// Timeout is required to enable the "Back" button
$timeout(function() {
if (amount) {
- $state.transitionTo('tabs.send.confirm', {toAmount: amount, toAddress: addr, description:message});
+ $state.transitionTo('tabs.send.confirm', {
+ toAmount: amount,
+ toAddress: addr,
+ description: message
+ });
} else {
- $state.transitionTo('tabs.send.amount', {toAddress: addr});
+ $state.transitionTo('tabs.send.amount', {
+ toAddress: addr
+ });
}
}, 100);
}
return true;
- // Plain URL
+ // Plain URL
} else if (/^https?:\/\//.test(data)) {
payproService.getPayProDetails(data, function(err, details) {
- if(err) {
- root.showMenu({data: data, type: 'url'});
+ if (err) {
+ root.showMenu({
+ data: data,
+ type: 'url'
+ });
return;
}
handlePayPro(details);
@@ -87,47 +113,75 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
});
// Plain Address
} else if (bitcore.Address.isValid(data, 'livenet') || bitcore.Address.isValid(data, 'testnet')) {
- if($state.includes('tabs.scan')) {
- root.showMenu({data: data, type: 'bitcoinAddress'});
+ if ($state.includes('tabs.scan')) {
+ root.showMenu({
+ data: data,
+ type: 'bitcoinAddress'
+ });
} else {
goToAmountPage(data);
}
} else if (data && data.indexOf($window.appConfig.name + '://glidera') === 0) {
- return $state.go('uriglidera', {url: data});
+ return $state.go('uriglidera', {
+ url: data
+ });
} else if (data && data.indexOf($window.appConfig.name + '://coinbase') === 0) {
- return $state.go('uricoinbase', {url: data});
+ return $state.go('uricoinbase', {
+ url: data
+ });
// BitPayCard Authentication
} else if (data && data.indexOf($window.appConfig.name + '://') === 0) {
- var secret = getParameterByName('secret', data);
- var email = getParameterByName('email', data);
- var otp = getParameterByName('otp', data);
- $state.go('tabs.home', {}, {'reload': true, 'notify': $state.current.name == 'tabs.home' ? false : true}).then(function() {
- $state.transitionTo('tabs.bitpayCardIntro', {
- secret: secret,
- email: email,
- otp: otp
- });
+ var secret = getParameterByName('secret', data);
+ var email = getParameterByName('email', data);
+ var otp = getParameterByName('otp', data);
+ $state.go('tabs.home', {}, {
+ 'reload': true,
+ 'notify': $state.current.name == 'tabs.home' ? false : true
+ }).then(function() {
+ $state.transitionTo('tabs.bitpayCardIntro', {
+ secret: secret,
+ email: email,
+ otp: otp
});
- return true;
+ });
+ return true;
- // Join
+ // Join
} else if (data && data.match(/^copay:[0-9A-HJ-NP-Za-km-z]{70,80}$/)) {
- $state.go('tabs.home', {}, {'reload': true, 'notify': $state.current.name == 'tabs.home' ? false : true}).then(function() {
- $state.transitionTo('tabs.add.join', {url: data});
+ $state.go('tabs.home', {}, {
+ 'reload': true,
+ 'notify': $state.current.name == 'tabs.home' ? false : true
+ }).then(function() {
+ $state.transitionTo('tabs.add.join', {
+ url: data
+ });
});
return true;
- // Old join
+ // Old join
} else if (data && data.match(/^[0-9A-HJ-NP-Za-km-z]{70,80}$/)) {
- $state.go('tabs.home', {}, {'reload': true, 'notify': $state.current.name == 'tabs.home' ? false : true}).then(function() {
- $state.transitionTo('tabs.add.join', {url: data});
+ $state.go('tabs.home', {}, {
+ 'reload': true,
+ 'notify': $state.current.name == 'tabs.home' ? false : true
+ }).then(function() {
+ $state.transitionTo('tabs.add.join', {
+ url: data
+ });
});
return true;
+ } else if (data && (data.substring(0, 2) == '6P' || checkPrivateKey(data))) {
+ root.showMenu({
+ data: data,
+ type: 'privateKey'
+ });
} else {
- if($state.includes('tabs.scan')) {
- root.showMenu({data: data, type: 'text'});
+ if ($state.includes('tabs.scan')) {
+ root.showMenu({
+ data: data,
+ type: 'text'
+ });
}
}
@@ -136,13 +190,18 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
};
function goToAmountPage(toAddress) {
- $state.go('tabs.send', {}, {'reload': true, 'notify': $state.current.name == 'tabs.send' ? false : true});
+ $state.go('tabs.send', {}, {
+ 'reload': true,
+ 'notify': $state.current.name == 'tabs.send' ? false : true
+ });
$timeout(function() {
- $state.transitionTo('tabs.send.amount', {toAddress: toAddress});
+ $state.transitionTo('tabs.send.amount', {
+ toAddress: toAddress
+ });
}, 100);
}
- function handlePayPro(payProDetails){
+ function handlePayPro(payProDetails) {
var stateParams = {
toAmount: payProDetails.amount,
toAddress: payProDetails.toAddress,
@@ -150,7 +209,10 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
paypro: payProDetails
};
scannerService.pausePreview();
- $state.go('tabs.send', {}, {'reload': true, 'notify': $state.current.name == 'tabs.send' ? false : true}).then(function() {
+ $state.go('tabs.send', {}, {
+ 'reload': true,
+ 'notify': $state.current.name == 'tabs.send' ? false : true
+ }).then(function() {
$timeout(function() {
$state.transitionTo('tabs.send.confirm', stateParams);
});
diff --git a/src/js/services/localStorage.js b/src/js/services/localStorage.js
index 8a0cc1610..e6327e300 100644
--- a/src/js/services/localStorage.js
+++ b/src/js/services/localStorage.js
@@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.services')
- .factory('localStorageService', function(platformInfo, $timeout, $log) {
+ .factory('localStorageService', function(platformInfo, $timeout, $log, lodash) {
var isNW = platformInfo.isNW;
var isChromeApp = platformInfo.isChromeApp;
var root = {};
@@ -45,6 +45,14 @@ angular.module('copayApp.services')
root.set = function(k, v, cb) {
if (isChromeApp || isNW) {
var obj = {};
+
+ if (lodash.isObject(v)) {
+ v = JSON.stringify(v);
+ }
+ if (!lodash.isString(v)) {
+ v = v.toString();
+ }
+
obj[k] = v;
chrome.storage.local.set(obj, cb);
diff --git a/src/js/services/onGoingProcess.js b/src/js/services/onGoingProcess.js
index d1bcf2fe0..b543430ab 100644
--- a/src/js/services/onGoingProcess.js
+++ b/src/js/services/onGoingProcess.js
@@ -25,7 +25,7 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
'recreating': gettext('Recreating Wallet...'),
'rejectTx': gettext('Rejecting payment proposal'),
'removeTx': gettext('Deleting payment proposal'),
- 'retrivingInputs': gettext('Retrieving inputs information'),
+ 'retrievingInputs': gettext('Retrieving inputs information'),
'scanning': gettext('Scanning Wallet funds...'),
'sendingTx': gettext('Sending transaction'),
'signingTx': gettext('Signing transaction'),
@@ -33,6 +33,13 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
'validatingWallet': gettext('Validating wallet integrity...'),
'validatingWords': gettext('Validating recovery phrase...'),
'loadingTxInfo': gettext('Loading transaction info...'),
+ 'sendingFeedback': gettext('Sending feedback...'),
+ 'generatingNewAddress': gettext('Generating new address...'),
+ 'gettingAddresses': gettext('Getting addresses...'),
+ 'sendingByEmail': gettext('Preparing addresses...'),
+ 'sending2faCode': gettext('Sending 2FA code...'),
+ 'buyingBitcoin': gettext('Buying Bitcoin...'),
+ 'sellingBitcoin': gettext('Selling Bitcoin...')
};
root.clear = function() {
@@ -64,7 +71,7 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
var showName = $filter('translate')(processNames[name] || name);
- if(customHandler) {
+ if (customHandler) {
customHandler(processName, showName, isOn);
} else if (root.onGoingProcessName) {
if (isCordova) {
diff --git a/src/js/services/popupService.js b/src/js/services/popupService.js
index 8a78b6035..7810771b8 100644
--- a/src/js/services/popupService.js
+++ b/src/js/services/popupService.js
@@ -34,7 +34,8 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
$ionicPopup.prompt({
title: title,
subTitle: message,
- inputType: opts.inputType,
+ cssClass: opts.class,
+ template: '',
inputPlaceholder: opts.inputPlaceholder,
defaultText: opts.defaultText
}).then(function(res) {
@@ -51,12 +52,12 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
var _cordovaConfirm = function(title, message, okText, cancelText, cb) {
var onConfirm = function(buttonIndex) {
- if (buttonIndex == 1) return cb(true);
+ if (buttonIndex == 2) return cb(true);
else return cb(false);
}
okText = okText || gettextCatalog.getString('OK');
cancelText = cancelText || gettextCatalog.getString('Cancel');
- navigator.notification.confirm(message, onConfirm, title, [okText, cancelText]);
+ navigator.notification.confirm(message, onConfirm, title, [cancelText, okText]);
};
var _cordovaPrompt = function(title, message, opts, cb) {
@@ -118,7 +119,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
this.showPrompt = function(title, message, opts, cb) {
$log.warn(title ? (title + ': ' + message) : message);
- opts = opts || {};
+ opts = opts || {};
if (isCordova && !opts.forceHTMLPrompt)
_cordovaPrompt(title, message, opts, cb);
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 4c65a3f48..e4bef4483 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.services')
- .factory('profileService', function profileServiceFactory($rootScope, $timeout, $filter, $log, sjcl, lodash, storageService, bwcService, configService, pushNotificationsService, gettext, gettextCatalog, bwcError, uxLanguage, platformInfo, txFormatService, $state) {
+ .factory('profileService', function profileServiceFactory($rootScope, $timeout, $filter, $log, sjcl, lodash, storageService, bwcService, configService, pushNotificationsService, gettextCatalog, bwcError, uxLanguage, platformInfo, txFormatService, $state) {
var isChromeApp = platformInfo.isChromeApp;
@@ -361,14 +361,14 @@ angular.module('copayApp.services')
} catch (ex) {
$log.info(ex);
- return cb(gettext('Could not create: Invalid wallet recovery phrase'));
+ return cb(gettextCatalog.getString('Could not create: Invalid wallet recovery phrase'));
}
} else if (opts.extendedPrivateKey) {
try {
walletClient.seedFromExtendedPrivateKey(opts.extendedPrivateKey);
} catch (ex) {
$log.warn(ex);
- return cb(gettext('Could not create using the specified extended private key'));
+ return cb(gettextCatalog.getString('Could not create using the specified extended private key'));
}
} else if (opts.extendedPublicKey) {
try {
@@ -378,7 +378,7 @@ angular.module('copayApp.services')
});
} catch (ex) {
$log.warn("Creating wallet from Extended Public Key Arg:", ex, opts);
- return cb(gettext('Could not create using the specified extended public key'));
+ return cb(gettextCatalog.getString('Could not create using the specified extended public key'));
}
} else {
var lang = uxLanguage.getCurrentLanguage();
@@ -421,7 +421,7 @@ angular.module('copayApp.services')
singleAddress: opts.singleAddress,
walletPrivKey: opts.walletPrivKey,
}, function(err, secret) {
- if (err) return bwcError.cb(err, gettext('Error creating wallet'), cb);
+ if (err) return bwcError.cb(err, gettextCatalog.getString('Error creating wallet'), cb);
return cb(null, walletClient, secret);
});
});
@@ -451,11 +451,11 @@ angular.module('copayApp.services')
if (lodash.find(root.profile.credentials, {
'walletId': walletData.walletId
})) {
- return cb(gettext('Cannot join the same wallet more that once'));
+ return cb(gettextCatalog.getString('Cannot join the same wallet more that once'));
}
} catch (ex) {
$log.debug(ex);
- return cb(gettext('Bad wallet invitation'));
+ return cb(gettextCatalog.getString('Bad wallet invitation'));
}
opts.networkName = walletData.network;
$log.debug('Joining Wallet:', opts);
@@ -464,7 +464,7 @@ angular.module('copayApp.services')
if (err) return cb(err);
walletClient.joinWallet(opts.secret, opts.myName || 'me', {}, function(err) {
- if (err) return bwcError.cb(err, gettext('Could not join wallet'), cb);
+ if (err) return bwcError.cb(err, gettextCatalog.getString('Could not join wallet'), cb);
addAndBindWalletClient(walletClient, {
bwsurl: opts.bwsurl
}, cb);
@@ -521,12 +521,12 @@ angular.module('copayApp.services')
// Adds and bind a new client to the profile
var addAndBindWalletClient = function(client, opts, cb) {
if (!client || !client.credentials)
- return cb(gettext('Could not access wallet'));
+ return cb(gettextCatalog.getString('Could not access wallet'));
var walletId = client.credentials.walletId
if (!root.profile.addWallet(JSON.parse(client.export())))
- return cb(gettext('Wallet already in Copay'));
+ return cb(gettextCatalog.getString('Wallet already in Copay'));
var skipKeyValidation = root.profile.isChecked(platformInfo.ua, walletId);
@@ -595,15 +595,7 @@ angular.module('copayApp.services')
password: opts.password
});
} catch (err) {
- return cb(gettext('Could not import. Check input file and spending password'));
- }
-
- if (walletClient.hasPrivKeyEncrypted()) {
- try {
- walletClient.disablePrivateKeyEncryption();
- } catch (e) {
- $log.warn(e);
- }
+ return cb(gettextCatalog.getString('Could not import. Check input file and spending password'));
}
str = JSON.parse(str);
@@ -634,7 +626,7 @@ angular.module('copayApp.services')
if (err instanceof errors.NOT_AUTHORIZED)
return cb(err);
- return bwcError.cb(err, gettext('Could not import'), cb);
+ return bwcError.cb(err, gettextCatalog.getString('Could not import'), cb);
}
addAndBindWalletClient(walletClient, {
@@ -665,7 +657,7 @@ angular.module('copayApp.services')
if (err instanceof errors.NOT_AUTHORIZED)
return cb(err);
- return bwcError.cb(err, gettext('Could not import'), cb);
+ return bwcError.cb(err, gettextCatalog.getString('Could not import'), cb);
}
addAndBindWalletClient(walletClient, {
@@ -688,7 +680,7 @@ angular.module('copayApp.services')
if (err instanceof errors.NOT_AUTHORIZED)
err.name = 'WALLET_DOES_NOT_EXIST';
- return bwcError.cb(err, gettext('Could not import'), cb);
+ return bwcError.cb(err, gettextCatalog.getString('Could not import'), cb);
}
addAndBindWalletClient(walletClient, {
@@ -773,6 +765,12 @@ angular.module('copayApp.services')
});
}
+ if (opts.m) {
+ ret = lodash.filter(ret, function(w) {
+ return (w.credentials.m == opts.m);
+ });
+ }
+
if (opts.onlyComplete) {
ret = lodash.filter(ret, function(w) {
return w.isComplete();
@@ -795,7 +793,7 @@ angular.module('copayApp.services')
root.getNotifications = function(opts, cb) {
opts = opts || {};
- var TIME_STAMP = 60 * 60 * 24 * 7;
+ var TIME_STAMP = 60 * 60 * 6;
var MAX = 100;
var typeFilter = {
@@ -861,26 +859,25 @@ angular.module('copayApp.services')
var finale = shown; // GROUPING DISABLED!
- // var finale = [],
- // prev;
- //
- //
- // // Item grouping... DISABLED.
- //
- // // REMOVE (if we want 1-to-1 notification) ????
- // lodash.each(shown, function(x) {
- // if (prev && prev.walletId === x.walletId && prev.txpId && prev.txpId === x.txpId && prev.creatorId && prev.creatorId === x.creatorId) {
- // prev.types.push(x.type);
- // prev.data = lodash.assign(prev.data, x.data);
- // prev.txid = prev.txid || x.txid;
- // prev.amountStr = prev.amountStr || x.amountStr;
- // prev.creatorName = prev.creatorName || x.creatorName;
- // } else {
- // finale.push(x);
- // prev = x;
- // }
- // });
- //
+ var finale = [],
+ prev;
+
+
+ // Item grouping... DISABLED.
+
+ // REMOVE (if we want 1-to-1 notification) ????
+ lodash.each(shown, function(x) {
+ if (prev && prev.walletId === x.walletId && prev.txpId && prev.txpId === x.txpId && prev.creatorId && prev.creatorId === x.creatorId) {
+ prev.types.push(x.type);
+ prev.data = lodash.assign(prev.data, x.data);
+ prev.txid = prev.txid || x.txid;
+ prev.amountStr = prev.amountStr || x.amountStr;
+ prev.creatorName = prev.creatorName || x.creatorName;
+ } else {
+ finale.push(x);
+ prev = x;
+ }
+ });
var u = bwcService.getUtils();
lodash.each(finale, function(x) {
diff --git a/src/js/services/rateService.js b/src/js/services/rateService.js
index 394c556b4..9cbfe2821 100644
--- a/src/js/services/rateService.js
+++ b/src/js/services/rateService.js
@@ -111,18 +111,24 @@ RateService.prototype.fromFiat = function(amount, code) {
return amount / this.getRate(code) * this.BTC_TO_SAT;
};
-RateService.prototype.listAlternatives = function() {
+RateService.prototype.listAlternatives = function(sort) {
var self = this;
if (!this.isAvailable()) {
return [];
}
- return self.lodash.map(this.getAlternatives(), function(item) {
+ var alternatives = self.lodash.map(this.getAlternatives(), function(item) {
return {
name: item.name,
isoCode: item.isoCode
}
});
+ if (sort) {
+ alternatives.sort(function(a, b) {
+ return a.name.toLowerCase() > b.name.toLowerCase() ? 1 : -1;
+ });
+ }
+ return self.lodash.uniq(alternatives, 'isoCode');
};
angular.module('copayApp.services').factory('rateService', function($http, lodash) {
diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js
index 340b25eb5..bd1d41fd8 100644
--- a/src/js/services/storageService.js
+++ b/src/js/services/storageService.js
@@ -77,23 +77,23 @@ angular.module('copayApp.services')
////////////////////////////////////////////////////////////////////////////
//
// UPGRADING STORAGE
- //
+ //
// 1. Write a function to upgrade the desired storage key(s). The function should have the protocol:
- //
+ //
// _upgrade_x(key, network, cb), where:
- //
+ //
// `x` is the name of the storage key
- // `key` is the name of the storage key being upgraded
+ // `key` is the name of the storage key being upgraded
// `network` is one of 'livenet', 'testnet'
//
// 2. Add the storage key to `_upgraders` object using the name of the key as the `_upgrader` object key
// with the value being the name of the upgrade function (e.g., _upgrade_x). In order to avoid conflicts
// when a storage key is involved in multiple upgraders as well as predicte the order in which upgrades
- // occur the `_upgrader` object key should be prefixed with '##_' (e.g., '01_') to create a unique and
+ // occur the `_upgrader` object key should be prefixed with '##_' (e.g., '01_') to create a unique and
// sortable name. This format is interpreted by the _upgrade() function.
- //
+ //
// Upgraders are executed in numerical order per the '##_' object key prefix.
- //
+ //
var _upgraders = {
'00_bitpayDebitCards' : _upgrade_bitpayDebitCards, // 2016-11: Upgrade bitpayDebitCards-x to bitpayAccounts-x
'01_bitpayCardCredentials' : _upgrade_bitpayCardCredentials // 2016-11: Upgrade bitpayCardCredentials-x to appIdentity-x
@@ -244,6 +244,14 @@ angular.module('copayApp.services')
storage.remove('profile', cb);
};
+ root.setFeedbackInfo = function(feedbackValues, cb) {
+ storage.set('feedback', feedbackValues, cb);
+ };
+
+ root.getFeedbackInfo = function(cb) {
+ storage.get('feedback', cb);
+ };
+
root.storeFocusedWalletId = function(id, cb) {
storage.set('focusedWalletId', id || '', cb);
};
@@ -390,6 +398,14 @@ angular.module('copayApp.services')
storage.remove('nextStep-' + service, cb);
};
+ root.setLastCurrencyUsed = function(lastCurrencyUsed, cb) {
+ storage.set('lastCurrencyUsed', lastCurrencyUsed, cb)
+ };
+
+ root.getLastCurrencyUsed = function(cb) {
+ storage.get('lastCurrencyUsed', cb)
+ };
+
root.checkQuota = function() {
var block = '';
// 50MB
@@ -459,7 +475,10 @@ angular.module('copayApp.services')
if (lodash.isEmpty(data) || !data.email) return cb('No card(s) to set');
storage.get('bitpayAccounts-' + network, function(err, bitpayAccounts) {
if (err) return cb(err);
- bitpayAccounts = JSON.parse(bitpayAccounts) || {};
+ if (lodash.isString(bitpayAccounts)) {
+ bitpayAccounts = JSON.parse(bitpayAccounts);
+ }
+ bitpayAccounts = bitpayAccounts || {};
bitpayAccounts[data.email] = bitpayAccounts[data.email] || {};
bitpayAccounts[data.email]['bitpayDebitCards-' + network] = data;
storage.set('bitpayAccounts-' + network, JSON.stringify(bitpayAccounts), cb);
@@ -468,7 +487,10 @@ angular.module('copayApp.services')
root.getBitpayDebitCards = function(network, cb) {
storage.get('bitpayAccounts-' + network, function(err, bitpayAccounts) {
- bitpayAccounts = JSON.parse(bitpayAccounts) || {};
+ if (lodash.isString(bitpayAccounts)) {
+ bitpayAccounts = JSON.parse(bitpayAccounts);
+ }
+ bitpayAccounts = bitpayAccounts || {};
var cards = [];
Object.keys(bitpayAccounts).forEach(function(email) {
// For the UI, add the account email to the card object.
@@ -490,15 +512,20 @@ angular.module('copayApp.services')
if (lodash.isEmpty(card) || !card.eid) return cb('No card to remove');
storage.get('bitpayAccounts-' + network, function(err, bitpayAccounts) {
if (err) cb(err);
- bitpayAccounts = JSON.parse(bitpayAccounts) || {};
+ if (lodash.isString(bitpayAccounts)) {
+ bitpayAccounts = JSON.parse(bitpayAccounts);
+ }
+ bitpayAccounts = bitpayAccounts || {};
Object.keys(bitpayAccounts).forEach(function(userId) {
var data = bitpayAccounts[userId]['bitpayDebitCards-' + network];
- var newCards = lodash.reject(data.cards, {'eid': card.eid});
+ var newCards = lodash.reject(data.cards, {
+ 'eid': card.eid
+ });
data.cards = newCards;
root.setBitpayDebitCards(network, data, function(err) {
if (err) cb(err);
// If there are no more cards in storage then re-enable the next step entry.
- root.getBitpayDebitCards(network, function(err, cards){
+ root.getBitpayDebitCards(network, function(err, cards) {
if (err) cb(err);
if (cards.length == 0) {
root.removeNextStep('BitpayCard', cb);
diff --git a/src/js/services/trezor.js b/src/js/services/trezor.js
index 199709886..f0a40c9dd 100644
--- a/src/js/services/trezor.js
+++ b/src/js/services/trezor.js
@@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.services')
- .factory('trezor', function($log, $timeout, gettext, lodash, bitcore, hwWallet) {
+ .factory('trezor', function($log, $timeout, lodash, bitcore, hwWallet) {
var root = {};
var SETTLE_TIME = 3000;
@@ -82,7 +82,7 @@ angular.module('copayApp.services')
if (txp.outputs.length > 1)
return callback('Only single output TXPs are supported in TREZOR');
} else {
- return callback('Unknown TXP at TREZOR');
+ return callback('Unknown TXP at TREZOR');
}
if (txp.outputs) {
diff --git a/src/js/services/uxLanguage.js b/src/js/services/uxLanguage.js
index 2f9e76043..9a5621825 100644
--- a/src/js/services/uxLanguage.js
+++ b/src/js/services/uxLanguage.js
@@ -8,42 +8,39 @@ angular.module('copayApp.services')
root.availableLanguages = [{
name: 'English',
isoCode: 'en',
- }, {
- name: 'Český',
- isoCode: 'cs',
- }, {
- name: 'Français',
- isoCode: 'fr',
- }, {
- name: 'Italiano',
- isoCode: 'it',
- }, {
- name: 'Deutsch',
- isoCode: 'de',
}, {
name: 'Español',
isoCode: 'es',
}, {
- name: '日本語',
- isoCode: 'ja',
- useIdeograms: true,
- }, {
- name: '中文（简体）',
- isoCode: 'zh',
- useIdeograms: true,
- }, {
- name: 'Polski',
- isoCode: 'pl',
- }, {
- name: 'Pусский',
- isoCode: 'ru',
+ name: 'Français',
+ isoCode: 'fr',
+ // }, {
+ // name: 'Český',
+ // isoCode: 'cs',
+ // }, {
+ // name: 'Italiano',
+ // isoCode: 'it',
+ // }, {
+ // name: 'Deutsch',
+ // isoCode: 'de',
+ // }, {
+ // name: '日本語',
+ // isoCode: 'ja',
+ // useIdeograms: true,
+ // }, {
+ // name: '中文（简体）',
+ // isoCode: 'zh',
+ // useIdeograms: true,
+ // }, {
+ // name: 'Polski',
+ // isoCode: 'pl',
+ // }, {
+ // name: 'Pусский',
+ // isoCode: 'ru',
}];
root._detect = function(cb) {
-
- return cb('en'); //disable auto detection for release;
-
var userLang, androidLang;
if (navigator && navigator.globalization) {
diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js
index a2dea86dc..4546dc4af 100644
--- a/src/js/services/walletService.js
+++ b/src/js/services/walletService.js
@@ -29,16 +29,6 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
});
};
- // // RECEIVE
- // // Check address
- // root.isUsed(wallet.walletId, balance.byAddress, function(err, used) {
- // if (used) {
- // $log.debug('Address used. Creating new');
- // $rootScope.$emit('Local/AddressIsUsed');
- // }
- // });
- //
-
var _signWithLedger = function(wallet, txp, cb) {
$log.info('Requesting Ledger Chrome app to sign the transaction');
@@ -67,32 +57,6 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
});
};
- // TODO
- // This handles errors from BWS/index which normally
- // trigger from async events (like updates).
- // Debounce function avoids multiple popups
- var _handleError = function(err) {
- $log.warn('wallet ERROR: ', err);
-
- $log.warn('TODO');
- return; // TODO!!!
- if (err instanceof errors.NOT_AUTHORIZED) {
-
- console.log('[walletService.js.93] TODO NOT AUTH'); //TODO
- // TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO TODO
- wallet.notAuthorized = true;
- $state.go('tabs.home');
- } else if (err instanceof errors.NOT_FOUND) {
- popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Could not access Wallet Service: Not found'));
- } else {
- var msg = ""
- $rootScope.$emit('Local/ClientError', (err.error ? err.error : err));
- popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err, gettextCatalog.getString('Error at Wallet Service')));
- }
- };
- root.handleError = lodash.debounce(_handleError, 1000);
-
-
root.invalidateCache = function(wallet) {
if (wallet.cachedStatus)
wallet.cachedStatus.isValid = false;
@@ -180,8 +144,9 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
if (err instanceof errors.NOT_AUTHORIZED) {
return cb('WALLET_NOT_REGISTERED');
}
- return cb(bwcError.msg(err, gettext('Could not update Wallet')));
+ return cb(err);
}
+
return cb(null, ret);
});
};
@@ -196,19 +161,22 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
// Address with Balance
cache.balanceByAddress = balance.byAddress;
+ // Total wallet balance is same regardless of 'spend unconfirmed funds' setting.
+ cache.totalBalanceSat = balance.totalAmount;
+
// Spend unconfirmed funds
if (config.spendUnconfirmed) {
- cache.totalBalanceSat = balance.totalAmount;
cache.lockedBalanceSat = balance.lockedAmount;
cache.availableBalanceSat = balance.availableAmount;
cache.totalBytesToSendMax = balance.totalBytesToSendMax;
- cache.pendingAmount = null;
+ cache.pendingAmount = 0;
+ cache.spendableAmount = balance.totalAmount - balance.lockedAmount;
} else {
- cache.totalBalanceSat = balance.totalConfirmedAmount;
cache.lockedBalanceSat = balance.lockedConfirmedAmount;
cache.availableBalanceSat = balance.availableConfirmedAmount;
cache.totalBytesToSendMax = balance.totalBytesToSendConfirmedMax;
cache.pendingAmount = balance.totalAmount - balance.totalConfirmedAmount;
+ cache.spendableAmount = balance.totalConfirmedAmount - balance.lockedAmount;
}
// Selected unit
@@ -220,25 +188,35 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
cache.totalBalanceStr = txFormatService.formatAmount(cache.totalBalanceSat) + ' ' + cache.unitName;
cache.lockedBalanceStr = txFormatService.formatAmount(cache.lockedBalanceSat) + ' ' + cache.unitName;
cache.availableBalanceStr = txFormatService.formatAmount(cache.availableBalanceSat) + ' ' + cache.unitName;
- cache.pendingBalanceStr = txFormatService.formatAmount(cache.totalBalanceSat + (cache.pendingAmount === null? 0 : cache.pendingAmount)) + ' ' + cache.unitName;
-
- if (cache.pendingAmount !== null && cache.pendingAmount !== 0) {
- cache.pendingAmountStr = txFormatService.formatAmount(cache.pendingAmount) + ' ' + cache.unitName;
- } else {
- cache.pendingAmountStr = null;
- }
+ cache.spendableBalanceStr = txFormatService.formatAmount(cache.spendableAmount) + ' ' + cache.unitName;
+ cache.pendingBalanceStr = txFormatService.formatAmount(cache.pendingAmount) + ' ' + cache.unitName;
cache.alternativeName = config.settings.alternativeName;
cache.alternativeIsoCode = config.settings.alternativeIsoCode;
+ // Check address
+ root.isAddressUsed(wallet, balance.byAddress, function(err, used) {
+ if (used) {
+ $log.debug('Address used. Creating new');
+ // Force new address
+ root.getAddress(wallet, true, function(err, addr) {
+ $log.debug('New address: ', addr);
+ });
+ }
+ });
+
rateService.whenAvailable(function() {
var totalBalanceAlternative = rateService.toFiat(cache.totalBalanceSat, cache.alternativeIsoCode);
+ var pendingBalanceAlternative = rateService.toFiat(cache.pendingAmount, cache.alternativeIsoCode);
var lockedBalanceAlternative = rateService.toFiat(cache.lockedBalanceSat, cache.alternativeIsoCode);
+ var spendableBalanceAlternative = rateService.toFiat(cache.spendableAmount, cache.alternativeIsoCode);
var alternativeConversionRate = rateService.toFiat(100000000, cache.alternativeIsoCode);
cache.totalBalanceAlternative = $filter('formatFiatAmount')(totalBalanceAlternative);
+ cache.pendingBalanceAlternative = $filter('formatFiatAmount')(pendingBalanceAlternative);
cache.lockedBalanceAlternative = $filter('formatFiatAmount')(lockedBalanceAlternative);
+ cache.spendableBalanceAlternative = $filter('formatFiatAmount')(spendableBalanceAlternative);
cache.alternativeConversionRate = $filter('formatFiatAmount')(alternativeConversionRate);
cache.alternativeBalanceAvailable = true;
@@ -337,7 +315,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
return tx.txid != endingTxid;
});
- return cb(null, res, res.length == limit);
+ return cb(null, res, res.length >= limit);
});
};
@@ -428,7 +406,16 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
function getNewTxs(newTxs, skip, cb) {
getTxsFromServer(wallet, skip, endingTxid, requestLimit, function(err, res, shouldContinue) {
- if (err) return cb(err);
+ if (err) {
+ $log.warn(bwcError.msg(err, 'BWS Error')); //TODO
+ if (err instanceof errors.CONNECTION_ERROR || (err.message && err.message.match(/5../))) {
+ log.info('Retrying history download in 5 secs...');
+ return $timeout(function() {
+ return getNewTxs(newTxs, skip, cb);
+ }, 5000);
+ };
+ return cb(err);
+ }
newTxs = newTxs.concat(processNewTxs(wallet, lodash.compact(res)));
@@ -587,20 +574,13 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
if (lodash.isEmpty(txp) || lodash.isEmpty(wallet))
return cb('MISSING_PARAMETER');
- if (txp.sendMax) {
- wallet.createTxProposal(txp, function(err, createdTxp) {
- if (err) return cb(err);
- else return cb(null, createdTxp);
- });
- } else {
- wallet.createTxProposal(txp, function(err, createdTxp) {
- if (err) return cb(err);
- else {
- $log.debug('Transaction created');
- return cb(null, createdTxp);
- }
- });
- }
+ wallet.createTxProposal(txp, function(err, createdTxp) {
+ if (err) return cb(err);
+ else {
+ $log.debug('Transaction created');
+ return cb(null, createdTxp);
+ }
+ });
};
root.publishTx = function(wallet, txp, cb) {
@@ -760,12 +740,13 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
});
};
- root.isUsed = function(wallet, byAddress, cb) {
+ // Check address
+ root.isAddressUsed = function(wallet, byAddress, cb) {
storageService.getLastAddress(wallet.id, function(err, addr) {
var used = lodash.find(byAddress, {
address: addr
});
- return cb(null, used);
+ return cb(err, used);
});
};
@@ -797,13 +778,30 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
});
};
- root.getAddress = function(wallet, forceNew, cb) {
+ root.getMainAddresses = function(wallet, opts, cb) {
+ opts = opts || {};
+ opts.reverse = true;
+ wallet.getMainAddresses(opts, function(err, addresses) {
+ return cb(err, addresses);
+ });
+ };
+ root.getBalance = function(wallet, opts, cb) {
+ opts = opts || {};
+ wallet.getBalance(opts, function(err, resp) {
+ return cb(err, resp);
+ });
+ };
+
+ root.getAddress = function(wallet, forceNew, cb) {
storageService.getLastAddress(wallet.id, function(err, addr) {
if (err) return cb(err);
if (!forceNew && addr) return cb(null, addr);
+ if (!wallet.isComplete())
+ return cb('WALLET_NOT_COMPLETE');
+
createAddress(wallet, function(err, _addr) {
if (err) return cb(err, addr);
storageService.storeLastAddress(wallet.id, _addr, function() {
@@ -829,7 +827,8 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
var askPassword = function(name, title, cb) {
var opts = {
inputType: 'password',
- forceHTMLPrompt: true
+ forceHTMLPrompt: true,
+ class: 'text-warn'
};
popupService.showPrompt(title, name, opts, function(res) {
if (!res) return cb();
@@ -839,9 +838,12 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
root.encrypt = function(wallet, cb) {
- askPassword(wallet.name, gettext('Enter new spending password'), function(password) {
+ var title = gettextCatalog.getString('Enter new spending password');
+ var warnMsg = gettextCatalog.getString('Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down.');
+ askPassword(warnMsg, title, function(password) {
if (!password) return cb('no password');
- askPassword(wallet.name, gettext('Confirm you new spending password'), function(password2) {
+ title = gettextCatalog.getString('Confirm you new spending password');
+ askPassword(warnMsg, gettextCatalog.getString('Confirm you new spending password'), function(password2) {
if (!password2 || password != password2)
return cb('password mismatch');
@@ -854,7 +856,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
root.decrypt = function(wallet, cb) {
$log.debug('Disabling private key encryption for' + wallet.name);
- askPassword(wallet.name, gettext('Enter Spending Password'), function(password) {
+ askPassword(null, gettextCatalog.getString('Enter Spending Password'), function(password) {
if (!password) return cb('no password');
try {
@@ -869,7 +871,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
root.handleEncryptedWallet = function(wallet, cb) {
if (!root.isEncrypted(wallet)) return cb();
- askPassword(wallet.name, gettext('Enter Spending Password'), function(password) {
+ askPassword(wallet.name, gettextCatalog.getString('Enter Spending Password'), function(password) {
if (!password) return cb('No password');
if (!wallet.checkPassword(password)) return cb('Wrong password');
@@ -892,20 +894,14 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
};
- root.onlyPublish = function(wallet, txp, cb) {
- ongoingProcess.set('sendingTx', true);
+ root.onlyPublish = function(wallet, txp, cb, customStatusHandler) {
+ ongoingProcess.set('sendingTx', true, customStatusHandler);
root.publishTx(wallet, txp, function(err, publishedTxp) {
root.invalidateCache(wallet);
-
- ongoingProcess.set('sendingTx', false);
- if (err) return cb(err);
-
- var type = root.getViewStatus(wallet, createdTxp);
- root.openStatusModal(type, createdTxp, function() {
- $rootScope.$emit('Local/TxAction', wallet.id);
- return;
- });
- return cb(null, publishedTxp);
+ ongoingProcess.set('sendingTx', false, customStatusHandler);
+ if (err) return cb(bwcError.msg(err));
+ $rootScope.$emit('Local/TxAction', wallet.id);
+ return cb();
});
};
@@ -934,13 +930,13 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
}
root.prepare(wallet, function(err, password) {
- if (err) return cb('Prepare error: ' + err);
+ if (err) return cb(bwcError.msg(err));
ongoingProcess.set('sendingTx', true, customStatusHandler);
publishFn(wallet, txp, function(err, publishedTxp) {
ongoingProcess.set('sendingTx', false, customStatusHandler);
- if (err) return cb('Send Error: ' + err);
+ if (err) return cb(bwcError.msg(err));
ongoingProcess.set('signingTx', true, customStatusHandler);
root.signTx(wallet, publishedTxp, password, function(err, signedTxp) {
@@ -950,10 +946,9 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
if (err) {
$log.warn('sign error:' + err);
- // TODO?
- var msg = err.message ?
+ var msg = err && err.message ?
err.message :
- gettext('The payment was created but could not be completed. Please try again from home screen');
+ gettextCatalog.getString('The payment was created but could not be completed. Please try again from home screen');
$rootScope.$emit('Local/TxAction', wallet.id);
return cb(msg);
@@ -963,7 +958,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
ongoingProcess.set('broadcastingTx', true, customStatusHandler);
root.broadcastTx(wallet, signedTxp, function(err, broadcastedTxp) {
ongoingProcess.set('broadcastingTx', false, customStatusHandler);
- if (err) return cb('sign error' + err);
+ if (err) return cb(bwcError.msg(err));
$rootScope.$emit('Local/TxAction', wallet.id);
var type = root.getViewStatus(wallet, broadcastedTxp);
@@ -1090,6 +1085,12 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
return type;
};
+ root.getSendMaxInfo = function(wallet, opts, cb) {
+ opts = opts || {};
+ wallet.getSendMaxInfo(opts, function(err, res) {
+ return cb(err, res);
+ });
+ };
return root;
});
diff --git a/src/sass/buttons.scss b/src/sass/buttons.scss
index 7f35657e2..dd750d28f 100644
--- a/src/sass/buttons.scss
+++ b/src/sass/buttons.scss
@@ -19,8 +19,7 @@ $button-secondary-border: transparent;
$button-secondary-active-bg: darken($subtle-gray, 5%);
$button-secondary-active-border: transparent;
-%button-standard,
-click-to-accept {
+%button-standard {
width: 85%;
max-width: 300px;
margin-left: auto;
diff --git a/src/sass/ionic.scss b/src/sass/ionic.scss
index 1c2fc0a87..7a5597fb7 100644
--- a/src/sass/ionic.scss
+++ b/src/sass/ionic.scss
@@ -6,9 +6,6 @@
/* Ionic Overrides and Workarounds */
// Please include a description of the problem solved by the workaround.
-// class to dynamically hide the ion-nav-bar for v1 Amazon flow
-ion-nav-bar.hide { display: block !important; }
-
// the ion tabs element never needs it's own background (backgrounds are
// rendered by the tabs), and the default background would cover the scanner
ion-tabs.ion-tabs-transparent {
@@ -40,3 +37,20 @@ $placeholder-icon-padding: 10px;
.card {
margin: ($content-padding * 2) 14px;
}
+
+// A somewhat dirty solution to the nav-bar "flashing" during page transitions.
+// Since the old nav-bar is hidden before the new one is shown, this pseudo
+// element fills the space with the proper background color.
+ion-view.deflash-blue:before {
+ content: " ";
+ display: block;
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ height: $bar-height;
+ background-color: $royal;
+}
+.platform-ios.platform-cordova:not(.fullscreen) ion-view.deflash-blue:before {
+ height: $bar-height + $ios-statusbar-height;
+}
diff --git a/src/sass/shame.scss b/src/sass/shame.scss
index 3e5e16f68..4100069e0 100644
--- a/src/sass/shame.scss
+++ b/src/sass/shame.scss
@@ -30,6 +30,17 @@
}
}
+.text-warn {
+ .popup-sub-title {
+ margin-top: 15px;
+ color: #e42112 !important;
+ }
+}
+
+.item-toggle, .item {
+ white-space: normal;
+}
+
.input-label {
max-width: none;
width: inherit;
@@ -437,3 +448,7 @@ input[type=file] {
.keyboard-open .has-tabs {
bottom: 0;
}
+
+.white-space-initial {
+ white-space: initial;
+}
diff --git a/src/sass/views/address-book.scss b/src/sass/views/address-book.scss
index 7d2695296..96fefb608 100644
--- a/src/sass/views/address-book.scss
+++ b/src/sass/views/address-book.scss
@@ -20,6 +20,7 @@
}
}
#view-address-book {
+ @extend .deflash-blue;
.scroll {
height:100%;
}
diff --git a/src/sass/views/addresses.scss b/src/sass/views/addresses.scss
new file mode 100644
index 000000000..5401945f7
--- /dev/null
+++ b/src/sass/views/addresses.scss
@@ -0,0 +1,89 @@
+#addresses {
+ .addr {
+ &-explanation, &-button-group {
+ padding: 0 1rem;
+ margin: 1rem 0;
+ }
+ &-description {
+ text-align: center;
+ font-size: 15px;
+ color: $mid-gray;
+ margin: 1rem 0;
+ a {
+ font-weight: bold;
+ cursor: pointer;
+ cursor: hand;
+ }
+ }
+ &-balance {
+ margin-top: 4px;
+ color: #5DD263;
+ }
+ &-path {
+ margin-top: 4px;
+ color: #B8B8B8;
+ }
+ }
+
+ .banner-icon {
+ margin-top: 25px;
+ i {
+ box-shadow: $hovering-box-shadow;
+ }
+ }
+
+ .addr-list {
+ .item {
+ color: $dark-gray;
+ padding-top: 1.3rem;
+ padding-bottom: 1.3rem;
+ &.has-addr-value {
+ padding-top: .65rem;
+ padding-bottom: .65rem;
+ }
+ &.item-divider {
+ color: $mid-gray;
+ padding-bottom: .5rem;
+ font-size: .9rem;
+ }
+ &.view-all {
+ margin: 20px 0px 20px 0px;
+ cursor: pointer;
+ cursor: hand;
+ i {
+ font-size: 35px;
+ margin-right: 5px;
+ color: #647ce8;
+ }
+ span {
+ color: #647ce8;
+ font-weight: bold;
+ }
+ }
+ i {
+ font-size: 35px;
+ margin-right: 2px;
+ }
+ }
+ .box-error {
+ padding: 25px;
+ background-color: #E65555;
+ color: #F4F4F4;
+ h5 {
+ margin: 5px;
+ color: #F4F4F4;
+ text-align: center;
+ font-weight: bold;
+ }
+ a {
+ font-weight: bold;
+ color: #F4F4F4;
+ cursor: pointer;
+ cursor: hand;
+ }
+ }
+ .item-note {
+ color: $light-gray;
+ }
+ }
+}
diff --git a/src/sass/views/amount.scss b/src/sass/views/amount.scss
index eec888643..cc4bf24e3 100644
--- a/src/sass/views/amount.scss
+++ b/src/sass/views/amount.scss
@@ -1,4 +1,5 @@
#view-amount {
+ @extend .deflash-blue;
.recipient-label {
font-size: 14px;
padding-bottom: 0;
@@ -10,6 +11,9 @@
.icon-bitpay-card {
background-image: url("../img/icon-bitpay.svg");
}
+ .icon-amazon {
+ background-image: url("../img/icon-amazon.svg");
+ }
@media(max-width: 480px) {
.bitcoin-address {
.icon {
@@ -33,7 +37,7 @@
position: absolute;
top: 10px;
}
- .amount-pane {
+ .amount-pane-recipient {
position: absolute;
top: 95px;
bottom: 0;
@@ -64,6 +68,42 @@
}
}
}
+ .amount-pane-no-recipient {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ width: 100%;
+ background-color: #fff;
+ padding: 0 16px;
+
+ .amount-bar {
+ padding: 24px 0;
+ font-size: 18px;
+ .title {
+ float: left;
+ padding-top: 10px;
+ color: $dark-gray;
+ font-weight: bold;
+ .limits {
+ margin-top: 10px;
+ color: $light-gray;
+ font-size: 12px;
+ }
+ }
+ }
+ .amount {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ flex-grow: 1;
+ position: absolute;
+ bottom: 254px;
+ top: 66px;
+ .light {
+ color: $light-gray;
+ }
+ }
+ }
.amount {
&__editable {
margin-bottom: 1rem;
diff --git a/src/sass/views/bitpayCard.scss b/src/sass/views/bitpayCard.scss
index 70bd2d762..fb796869c 100644
--- a/src/sass/views/bitpayCard.scss
+++ b/src/sass/views/bitpayCard.scss
@@ -1,4 +1,5 @@
#bitpayCard {
+ background: white;
.bar-header {
border: 0;
background: #1e3186;
@@ -9,15 +10,35 @@
background-color: transparent;
}
}
+ .amount-wrapper {
+ position: relative;
+ overflow: visible;
+
+ .amount-bg {
+ content: '';
+ top: -1000px;
+ left: 0;
+ position: absolute;
+ height: 1000px;
+ width: 100%;
+ background-color: #1e3186;
+ }
+ }
.amount {
width: 100%;
text-align: center;
padding: 2rem 1rem 1.5rem 1rem;
- height: 140px;
+ height: 160px;
border-color: #172565;
background-color: #1e3186;
background-image: linear-gradient(0deg, #172565, #172565 0%, transparent 0%);
color: #fff;
+
+ &__balance {
+ margin-bottom: 25px;
+ font-weight: 600;
+ font-size: 34px;
+ }
}
.wallet-details-wallet-info {
bottom: 5px;
@@ -37,4 +58,26 @@
.item-select select {
color: #667;
}
+
+ .get-started {
+
+ margin-top: 20px;
+
+ &__arrow {
+ font-size: 56px;
+ opacity: .2;
+ }
+
+ h1 {
+ font-size: 28px;
+ color: #4A4A4A;
+ }
+
+ &__text {
+ font-weight: 300;
+ color: #8e8e8e;
+ max-width: 300px;
+ margin: 0 auto;
+ }
+ }
}
diff --git a/src/sass/views/bitpayCardPreferences.scss b/src/sass/views/bitpayCardPreferences.scss
index 670e8752e..7488f9964 100644
--- a/src/sass/views/bitpayCardPreferences.scss
+++ b/src/sass/views/bitpayCardPreferences.scss
@@ -11,5 +11,12 @@
color: $light-gray;
font-size: 14px;
}
+ &.item-icon-right {
+ .icon-hotspot {
+ right: 0px;
+ padding-left: 11px;
+ padding-right: 11px;
+ }
+ }
}
}
diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss
index 172f82173..2372290ce 100644
--- a/src/sass/views/confirm.scss
+++ b/src/sass/views/confirm.scss
@@ -1,3 +1,9 @@
#view-confirm {
-
+ @extend .deflash-blue;
+ .icon-amazon {
+ background-image: url("../img/icon-amazon.svg");
+ }
+ .tx-details-content > .scroll {
+ padding-bottom: .25rem;
+ }
}
diff --git a/src/sass/views/custom-amount.scss b/src/sass/views/custom-amount.scss
new file mode 100644
index 000000000..11d529355
--- /dev/null
+++ b/src/sass/views/custom-amount.scss
@@ -0,0 +1,16 @@
+#custom-amount {
+ .share {
+ justify-content: center;
+ }
+ .info {
+ .single-line {
+ display: flex;
+ align-items: center;
+ padding-top: 17px;
+ padding-bottom: 17px;
+ .item-note {
+ margin-left: 10px;
+ }
+ }
+ }
+}
diff --git a/src/sass/views/feedback/complete.scss b/src/sass/views/feedback/complete.scss
new file mode 100644
index 000000000..fc6413e7a
--- /dev/null
+++ b/src/sass/views/feedback/complete.scss
@@ -0,0 +1,94 @@
+#complete {
+ background-color: #fff;
+ .close-button {
+ color: $dark-gray;
+ position: absolute;
+ top: 5px;
+ right: 10px;
+ padding: 15px;
+ font-size: 36px;
+ }
+ .complete-layout {
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+ &__expand {
+ display: flex;
+ flex-direction: column;
+ flex-grow: 1;
+ align-items: center;
+ justify-content: center;
+ text-align: center;
+ opacity: 0;
+ transition: opacity .3s;
+ &.fade-in {
+ opacity: 1;
+ }
+ }
+ }
+ .share-the-love-illustration {
+ width: 5rem;
+ margin: 1rem;
+ }
+ .send-feedback-illustration {
+ height: 16rem;
+ margin: 1rem;
+ }
+ .feedback-title {
+ font-size: 20px;
+ font-weight: bold;
+ color: $dark-gray;
+ margin: 20px 10px;
+ text-align: center;
+ }
+ .subtitle {
+ padding: 10px 30px 20px;
+ text-align: center;
+ color: $mid-gray;
+ }
+ .icon-svg > img {
+ height: 16rem;
+ width: 16rem;
+ margin: 10px;
+ }
+ .socialsharing-icon {
+ display: inline-block;
+ width: 60px;
+ }
+ .addressbook-icon-svg {
+ display: inline-block;
+ width: 50px;
+ height: 50px;
+ }
+ .share-buttons {
+ padding: 50px 10px 30px;
+ background-color: $subtle-gray;
+ text-align: center;
+ transform: translateY(100%);
+ opacity: 0;
+ animation-name: slideUpFadeIn;
+ animation-duration: .3s;
+ animation-fill-mode: forwards;
+ animation-timing-function: cubic-bezier(0.4, 0.0, 0.2, 1);
+ animation-delay: .2s;
+ }
+ .share-buttons__action {
+ display: inline-block;
+ color: #667;
+ font-size: .9rem;
+ width: 90px;
+ height: 90px;
+ margin-bottom: 20px;
+ }
+}
+
+@keyframes slideUpFadeIn {
+ from {
+ transform: translateY(100%);
+ opacity: 0;
+ }
+ to {
+ transform: translateY(0);
+ opacity: 1;
+ }
+}
diff --git a/src/sass/views/feedback/rateApp.scss b/src/sass/views/feedback/rateApp.scss
new file mode 100644
index 000000000..c484ccc19
--- /dev/null
+++ b/src/sass/views/feedback/rateApp.scss
@@ -0,0 +1,38 @@
+#rate-app {
+ background-color: #ffffff;
+ text-align: center;
+ .skip-rating {
+ color: $dark-gray;
+ position: absolute;
+ top: 5px;
+ right: 10px;
+ padding: 15px;
+ }
+ .icon-svg > img {
+ width: 80px;
+ height: 80px;
+ margin-top: 15px;
+ }
+ .feedback-title {
+ font-size: 20px;
+ font-weight: bold;
+ color: $dark-gray;
+ margin: 80px 50px 10px;
+ text-align: center;
+ }
+ .share-the-love-illustration {
+ width: 5rem;
+ margin: 1rem;
+ }
+ .subtitle {
+ padding: 10px 30px 20px 40px;
+ color: #667;
+ }
+ .rate-buttons {
+ bottom: 0;
+ width: 100%;
+ position: absolute;
+ background-color: $subtle-gray;
+ padding: 30px 0 15px;
+ }
+}
diff --git a/src/sass/views/feedback/rateCard.scss b/src/sass/views/feedback/rateCard.scss
new file mode 100644
index 000000000..9d57643d6
--- /dev/null
+++ b/src/sass/views/feedback/rateCard.scss
@@ -0,0 +1,18 @@
+#rate-card {
+ .item-heading {
+ font-weight: 700;
+ }
+ .row {
+ border: none;
+ }
+ .item-icon-right {
+ margin: 0;
+ }
+ .feedback-flow-button {
+ margin-bottom: 20px;
+ }
+ .icon-svg > img {
+ height: 1.8rem;
+ margin-bottom: 5px;
+ }
+}
diff --git a/src/sass/views/feedback/send.scss b/src/sass/views/feedback/send.scss
new file mode 100644
index 000000000..b9fafa8b1
--- /dev/null
+++ b/src/sass/views/feedback/send.scss
@@ -0,0 +1,54 @@
+#send-feedback {
+ @extend .deflash-blue;
+ background-color: #ffffff;
+ .row {
+ border: none;
+ }
+ .skip {
+ color: rgba(255, 255, 255, 0.3);
+ }
+ .feedback-heading {
+ padding-top: 20px
+ }
+ .feedback-title {
+ padding-left: 10px;
+ font-size: 20px;
+ font-weight: bold;
+ color: $dark-gray;
+ }
+ .rating {
+ text-align: right;
+ padding-right: 15px;
+ }
+ .comment {
+ padding: 0 20px 20px;
+ font-size: 1rem;
+ line-height: 1.5em;
+ font-weight: 300;
+ color: $dark-gray;
+ }
+ .user-feedback {
+ border-top: 1px solid $subtle-gray;
+ border-bottom: 1px solid $subtle-gray;
+ padding: 20px;
+ width: 100%;
+ margin-bottom: 20px;
+ -webkit-appearance: none;
+ }
+ .send-feedback-star {
+ height: 1rem;
+ margin-left: 5px;
+ }
+ .form-fade-in {
+ opacity: 0;
+ animation-name: fadeIn;
+ animation-duration: .5s;
+ animation-fill-mode: forwards;
+ animation-timing-function: ease-in;
+ }
+}
+
+@keyframes fadeIn {
+ from { opacity: 0; }
+ to { opacity: 1; }
+}
diff --git a/src/sass/views/includes/clickToAccept.scss b/src/sass/views/includes/clickToAccept.scss
index 9eb8098e0..3d8b96ada 100644
--- a/src/sass/views/includes/clickToAccept.scss
+++ b/src/sass/views/includes/clickToAccept.scss
@@ -1,7 +1,18 @@
click-to-accept {
+ position: fixed;
+ bottom: 0;
+ height: 92px;
+ width: 100%;
+
.click-to-accept {
+ &__button.button.button-primary.button-standard {
+ height: 100%;
+ max-width: 9999px;
+ width: 100%;
+ }
+
&__button.disable {
pointer-events: none;
}
@@ -18,6 +29,9 @@ click-to-accept {
transform: translateY(2rem);
opacity: 0;
pointer-events: none;
+ display: flex;
+ align-items: center;
+ justify-content: center;
&.enter {
transition: transform 250ms ease, opacity 250ms ease;
diff --git a/src/sass/views/includes/menu-popover.scss b/src/sass/views/includes/menu-popover.scss
new file mode 100644
index 000000000..93139b42d
--- /dev/null
+++ b/src/sass/views/includes/menu-popover.scss
@@ -0,0 +1,12 @@
+#menu-popover {
+ border-radius: 5px;
+ .list {
+ .item {
+ cursor: pointer;
+ cursor: hand;
+ &:hover {
+ background-color: #E4E2E2;
+ }
+ }
+ }
+}
diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss
index 8c5e7c723..5d1d0f9ea 100644
--- a/src/sass/views/includes/txp-details.scss
+++ b/src/sass/views/includes/txp-details.scss
@@ -8,7 +8,7 @@
.list {
background: #f5f5f5;
}
- .slide-to-pay {
+ .add-bottom-for-cta {
bottom: 92px;
}
.head {
@@ -23,6 +23,8 @@
img {
margin-right: 1rem;
+ height: 35px;
+ width: 35px;
}
span {
@@ -243,4 +245,21 @@
color: rgba(58, 58, 58, .6);
margin-bottom: 1.5rem;
}
+ .glidera-success {
+ padding: 20px;
+ margin-top: 15px;
+ span {
+ font-size: 15px;
+ display: block;
+ }
+ }
+ .glidera-explanation {
+ padding: 0 1rem;
+ white-space: normal;
+ }
+ .glidera-description {
+ text-align: center;
+ font-size: 12px;
+ color: $mid-gray;
+ }
}
diff --git a/src/sass/views/includes/wallets.scss b/src/sass/views/includes/wallets.scss
index a3e1a4320..5c73d70c7 100644
--- a/src/sass/views/includes/wallets.scss
+++ b/src/sass/views/includes/wallets.scss
@@ -9,6 +9,7 @@
box-shadow:$subtle-box-shadow;
padding:0;
border-radius: 6px;
+ margin: 0 auto;
@media (min-width: 500px) {
& {
width: 350px;
@@ -17,22 +18,24 @@
}
}
.item{
- padding: calc(100vh - 99vh) calc(100vw - 93vw) calc(100vh - 97vh) calc(100vw - 95vw);
- i{left:auto;}
+ padding: 3vh 3vw 3vh 3vw;
span{
clear:both;
width: 100%;
display: inline-block;
&.wallet-name{
- margin-top:10px;
- margin-bottom:5px;
- font-size:13px;
+ font-size:16px;
+ width: 70%;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ font-weight: 600;
}
&.wallet-number{
visibility: hidden;
}
&.visible{
- visibility: visible !important;
+ visibility: visible !important;
}
}
.big-icon-svg{
@@ -64,10 +67,10 @@
transform: scale(.8);
}
&.swiper-slide-prev {
- left: 10vw;
+ left: 5vw;
}
&.swiper-slide-next {
- left: -10vw;
+ left: -5vw;
}
}
}
diff --git a/src/sass/views/onboarding/onboard-disclaimer.scss b/src/sass/views/onboarding/onboard-disclaimer.scss
index a4e409531..70ceca8e3 100644
--- a/src/sass/views/onboarding/onboard-disclaimer.scss
+++ b/src/sass/views/onboarding/onboard-disclaimer.scss
@@ -1,6 +1,10 @@
#onboarding-disclaimer {
color: #fff;
height: 100%;
+ transition: transform 2.5s ease;
+ &.shrink{
+ transform: scale(.8);
+ }
&-container {
max-width: 450px;
display: flex;
@@ -78,57 +82,94 @@
top:30%;
left:0;
}
- #agree-to-terms {
+}
+#terms-of-use{
+ position: absolute;
+ top: 100%;
+ left: 0;
+ z-index: 10;
+ transition: top 1s ease;
+ transition-delay: .25s;
+ width: 100%;
+ overflow: scroll;
+ background: #fff;
+ height: 100%;
+ ion-nav-bar{
+ position: fixed;
background: #fff;
- padding:1rem;
- position: absolute;
- bottom: 0;
width: 100%;
- &.header-present{
- bottom: 38px;
- }
- &-content{
- max-width: 600px;
- @include center-block();
- }
- .item{
- color:rgb(58,58,58);
- padding-bottom: 2.5rem;
- float: left;
- .item-content{
- white-space: normal;
- }
- }
- p{
- color:rgb(58,58,58);
- text-align: left;
- }
- @media (min-width:450px){
- p{
- position: relative;
- top: .6rem;
- }
- }
- .checkbox input:before,
- .checkbox .checkbox-icon:before{
- border-color:$soft-blue;
- }
- .checkbox input:checked:before,
- .checkbox input:checked + .checkbox-icon:before {
- border-color: rgb(19, 229, 182);
- }
- button{
- margin-top:1.5rem;
+ z-index: 15;
+ }
+ .has-header{
+ width:100%;
+ background:#fff;
+ overflow-y:scroll;
+ position:relative;
+ #terms{
+ max-width:400px;
+ padding-top:.5rem;
position: relative;
+ margin: 0 auto;
+ padding-bottom: 165px;
+ width:90%;
}
}
+ &.slideUp{
+ top:0;
+ }
+}
+#agree-to-terms {
+ background: #fff;
+ padding:1rem;
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ z-index: 10;
+ box-shadow: 0 1px 10px rgba(0, 0, 0, 0.25);
+ &-content{
+ max-width: 450px;
+ @include center-block();
+ }
+ .item{
+ color:rgb(58,58,58);
+ padding-bottom: 2.5rem;
+ float: left;
+ border:none;
+ .item-content{
+ white-space: normal;
+ }
+ }
+ p{
+ color:rgb(58,58,58);
+ text-align: left;
+ }
+ @media (min-width:450px){
+ p{
+ position: relative;
+ top: .6rem;
+ }
+ }
+ .checkbox input:before,
+ .checkbox .checkbox-icon:before{
+ border-color:$soft-blue;
+ background:#fff;
+ }
+ .checkbox input:after,
+ .checkbox .checkbox-icon:after{
+ border-color:#13e5b6;
+ }
+ .checkbox input:checked:before,
+ .checkbox input:checked + .checkbox-icon:before {
+ border-color: rgb(19, 229, 182);
+ }
+ button{
+ margin-top:1.5rem;
+ position: relative;
+ }
}
-
@media (max-height:460px){
- #onboarding-disclaimer{
#agree-to-terms{
position: relative;
float:left;
}
- }
}
diff --git a/src/sass/views/onboarding/onboarding.scss b/src/sass/views/onboarding/onboarding.scss
index 550f8de32..6e480b67c 100644
--- a/src/sass/views/onboarding/onboarding.scss
+++ b/src/sass/views/onboarding/onboarding.scss
@@ -49,9 +49,14 @@
%cta-buttons {
position: absolute;
bottom: 0;
+ left: 0;
width: 100%;
}
+.pane-onboarding{
+ background: #0B1E4F;
+}
+
@import "terms-of-use";
@import "onboard-welcome";
@import "onboard-tour";
diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss
index 2d5368a8d..692224cf2 100644
--- a/src/sass/views/tab-home.scss
+++ b/src/sass/views/tab-home.scss
@@ -1,4 +1,5 @@
#tab-home {
+ @extend .deflash-blue;
.icon-create-wallet {
background-color: #4A90E2; // default wallet color
}
@@ -52,6 +53,15 @@
}
}
}
+ .wallet-details__item.item {
+ padding-top: 0;
+ padding-bottom: 0;
+
+ .wallet-details__tx-icon {
+ background: #fff;
+ border-radius: 50px;
+ }
+ }
.next-step.item {
padding-top: 27px;
padding-bottom: 27px;
@@ -101,6 +111,13 @@
font-weight: 300;
color: $light-gray;
}
+ &__status-icon {
+ font-size: 18px;
+ margin-left: 5px;
+ position: relative;
+ top: 1px;
+ color: $light-gray;
+ }
}
}
.release {
@@ -116,6 +133,6 @@
font-size: 20px;
margin-left: 10px;
position: absolute;
- }
+ }
}
}
diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss
index 1b18083c0..084baed3b 100644
--- a/src/sass/views/tab-receive.scss
+++ b/src/sass/views/tab-receive.scss
@@ -1,36 +1,54 @@
#tab-receive {
- ion-header-bar{
- button{
- i{
+ @extend .deflash-blue;
+ ion-header-bar {
+ button {
+ i {
color:#fff;
font-size: 1.1rem;
}
}
}
- .border-top{
+ .border-top {
border-top:1px solid rgb(228,228,228);
}
- .scroll{height:100%;}
+ .scroll {
+ height:100%;
+ }
#address {
background: #fff;
- height: calc(100vh - 33vh);
+ height: 66vh;
display: flex;
align-items: center;
justify-content: center;
position: relative;
flex-flow: column;
- @media(max-height: 600px){
- height: calc(100vh - 36vh);
+ @media(max-height: 600px) {
+ height: 68vh;
}
- article{
+ @media(max-height: 600px) and (-webkit-device-pixel-ratio: 2) {
+ height: 64vh;
+ }
+ &-info {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ width: 100%;
+ }
+ article {
flex:1;
width: 100%;
}
- #bit-address{
- position: absolute;
- bottom:0;
- width:100%;
- #next-address{
+ #bit-address {
+ width: 100%;
+ align-self: flex-end;
+ margin-top: auto;
+ justify-content: center;
+ align-content: center;
+ position: relative;
+ min-height: 40px;
+ #next-address {
color:$light-gray;
}
}
@@ -52,35 +70,111 @@
.item {
border: none;
font-size: .8rem;
+ z-index: 0;
i {
font-size: 1.3rem;
}
}
+ #qr-options {
+ .item {
+ font-size:.7rem;
+ @media(min-width:350px) {
+ font-size:.9rem;
+ }
+ @media(min-width:450px) {
+ font-size:1rem;
+ }
+ }
+ }
.bit-address {
font-size: .8rem;
+ // left:10%;
+ cursor: pointer;
+ cursor: hand;
+ position: absolute;
+ transition: all .15s ease;
+ width:100%;
+ height: 100%;
+ z-index: 0;
+ position: absolute;
+ top:50%;
+ &, &.next {
+ left:100%;
+ transform: translate(100%, -40%);
+ }
+ &.next, &.prev {
+ z-index:2;
+ }
+ &.current,
+ &.prev {
+ left:50%;
+ }
+ &.current {
+ transform: translate(-50%, -40%);
+ z-index: 3;
+ }
+ &.prev {
+ transform: translate(-150%, -40%);
+ }
.item {
padding-top: 5px;
padding-bottom: 5px;
- display: inline-block;
font-size: .7rem;
+ @media(min-width:350px) {
+ font-size:.9rem;
+ }
+ @media(min-width:450px) {
+ font-size:1rem;
+ }
+ color:$light-gray;
}
}
.qr {
- padding: calc(100vh - 85vh) 0 calc(100vh - 96vh);
- @media(max-height: 700px){
- padding: calc(100vh - 90vh) 0 calc(100vh - 96vh);
+ padding: 15vh 0 4vh;
+ align-self: center;
+ margin-top: auto;
+ height: 220px;
+ position: relative;
+ justify-content: center;
+ flex: 1;
+ z-index: 1;
+ div {
+ transition: all .4s ease;
+ &.current,
+ &.prev,
+ &.next {
+ position: absolute;
+ top:50%;
+ }
+ &.current,
+ &.prev {
+ left:50%;
+ }
+ &.current {
+ transform: translate(-50%, -40%);
+ }
+ &.prev {
+ transform: translate(-150%, -40%);
+ }
+ &.next {
+ left:100%;
+ transform: translate(100%, -40%);
+ }
}
- div{
+ @media(max-height: 700px) {
+ padding: 10vh 0 4vh;
+ }
+ div {
display: flex;
justify-content: center;
align-items: center;
+ position: relative;
+ min-height: 220px;
}
}
- #qr-options{
- display: flex;
- flex-direction: row;
+ #qr-options {
justify-content: center;
- align-content: center;
+ align-self: flex-end;
.item{
i{left:25px;}
}
@@ -90,20 +184,24 @@
color: #fff;
position: absolute;
top: 0;
+ left:0;
+ z-index: 2;
i {
padding: 10px;
}
}
- @media (max-height: 600px){
- &{
- .qr{
+ @media (max-height: 600px) {
+ & {
+ .qr {
padding:6vh 0 0;
- div{
+ div {
-webkit-transform: scale(.7);
transform: scale(.7);
}
}
- #bit-address{position: realtive;}
+ #bit-address {
+ position: relative;
+ }
}
}
}
@@ -122,7 +220,7 @@
left: 50%;
-webkit-transform: translateX(-50%);
transform: translateX(-50%);
- z-index: 2;
+ z-index: 4;
}
}
#first-time-tip {
@@ -165,18 +263,57 @@
border-right: 1px solid rgb(228, 228, 228);
padding-right: 10px;
}
- .wallets{
+ #wallets {
+ #sidebar-wallet{
+ display: none;
+ }
+ }
+ .wallets {
position: relative;
- height: calc(100vh - 83vh);
+ height: calc(27vh - 62px);
+ z-index: 5;
.slides {
- .swiper-container{
+ .swiper-container {
position: absolute;
left: 50%;
top: 50%;
-webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
- @media (max-height: 600px){
- &{
+ max-width: 450px;
+ .swiper-wrapper {
+ height: auto;
+ top: 10%;
+ position:relative;
+ @media(max-height: 600px) {
+ padding-top:.2rem
+ }
+ @media(min-height: 900px) {
+ top:30%;
+ }
+ }
+ .swiper-slide {
+ text-align: center;
+ .card{
+ margin-top: 1vh;
+ display: inline-block;
+ width:80%;
+ @media(min-height: 1000px) and (max-width: 699px) {
+ .item {
+ padding: 2vh 3vw 2vh 3vw;
+ }
+ }
+ }
+ @media(max-width: 500px) {
+ &-next {
+ left:-25%;
+ }
+ &-prev {
+ left:25%;
+ }
+ }
+ }
+ @media (max-height: 600px) {
+ & {
-webkit-transform: translate(-50%, -58%);
transform: translate(-50%, -58%);
}
@@ -184,25 +321,154 @@
}
}
}
- // @media(min-width: 700px) and (min-height: 700px){
- // .wallets{display: none;}
- // #address{
- // height:90vh;
- // width:75%;
- // .qr{
- // height: 70%;
- // div{
- // transform: scale(1.5);
- // }
- // }
- // #bit-address{
- // height: 10%;
- // padding: calc(100vh - 99vh);
- // }
- // }
- // }
+ @media(min-width: 700px) and (min-height: 700px) {
+ .wallets {
+ display: none;
+ }
+ #address {
+ float:left;
+ height:100%;
+ width:calc(100% - 410px);
+ @media(max-width: 1000px){
+ width:65%;
+ }
+ &-info {
+ height: 100%;
+ }
+ #qr-options {
+ .item{
+ font-size:1rem;
+ }
+ }
+ .qr {
+ height: 70%;
+ div {
+ opacity: 0;
+ transition: none;
+ &.current {
+ opacity: 1;
+ }
+ }
+ }
+ .bit-address {
+ opacity: 0;
+ transition: none;
+ &.current {
+ opacity: 1;
+ }
+ }
+ .backup,
+ #bit-address {
+ left:0;
+ }
+ #bit-address {
+ height: 10%;
+ padding: 1vh;
+ .bit-address {
+ .item{
+ top: 40%;
+ transform: translateY(-40%);
+ font-size:1rem;
+ }
+ }
+ }
+ }
+ #wallets {
+ float:left;
+ width:35%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ overflow: visible;
+ max-width: 410px;
+ @media(max-height: 600px) {
+ padding-top:.55rem;
+ }
+ @media(max-width: 1000px) {
+ max-width: none;
+ }
+ #sidebar-wallet {
+ display: block;
+ }
+ .list {
+ height: 100%;overflow: visible;
+ }
+ #wallet-list {
+ position: absolute;
+ width: 110%;
+ overflow-y: auto;
+ height: 100%;
+ left: -6%;
+ }
+ .wallet {
+ &.current {
+ position: relative;
+ .card {
+ opacity: 1;
+ transform: scale(1);
+ }
+ &:before {
+ right: 93%;
+ top: 50%;
+ border: solid transparent;
+ content: " ";
+ height: 0;
+ width: 0;
+ position: absolute;
+ pointer-events: none;
+ border-right-color: #f2f2f2;
+ border-width: 20px;
+ margin-top: -20px;
+ }
+ }
+ }
+ .card {
+ max-width: 350px;
+ box-shadow: 0 1px 36px rgba(0, 0, 0, 0.07);
+ padding:0;
+ border-radius: 6px;
+ padding:2px;
+ width: 80%;
+ position: relative;
+ margin: 1.5rem auto 0;
+ position: relative;
+ opacity: .5;
+ transform:scale(.85);
+ transition:transform .2s ease;
+ .item {
+ padding: 6% 10% 6% 8%;
+ span {
+ clear: both;
+ width: 100%;
+ display: inline-block;
+ &.wallet-name {
+ font-size:16px;
+ width: 79%;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ font-weight: 600;
+ }
+ &.wallet-number {
+ visibility: hidden;
+ }
+ &.visible {
+ visibility: visible !important;
+ }
+ }
+ .big-icon-svg {
+ padding: 0;
+ & > .bg {
+ padding:.3rem;
+ width: 40px;
+ height:40px;
+ }
+ }
+ }
+ }
+ }
+ }
}
-
@keyframes fadeIn {
0% {
opacity: 0;
diff --git a/src/sass/views/tab-send.scss b/src/sass/views/tab-send.scss
index 8308bd90c..1bbb72cb2 100644
--- a/src/sass/views/tab-send.scss
+++ b/src/sass/views/tab-send.scss
@@ -1,19 +1,36 @@
#tab-send {
- .qr-scan-icon a {
- z-index: 10;
- display: block;
- position: absolute;
- top: 55px;
- right: 0;
- padding: 0 10px;
- font-size: 24px;
+ @extend .deflash-blue;
+ .input {
+ input {
+ width: 100%;
+ height: auto;
+ }
+ &.item {
+ height: 55px;
+ }
+ i {
+ &.left {
+ padding-left: 15px;
+ }
+ &.qr {
+ cursor: pointer;
+ cursor: hand;
+ padding-right: 5px;
+ }
+ }
+ }
+ .qr-scan-icon {
cursor: pointer;
+ cursor: hand;
+ border-left: 1px solid rgb(228, 228, 228);
+ padding-left: 10px;
}
.qr-icon {
- line-height: 45px;
+ line-height: 20px;
}
.zero-state-cta {
padding-bottom: 3vh;
+ left: 0;
}
.send-heading {
font-size: 14px;
diff --git a/src/sass/views/tab-settings.scss b/src/sass/views/tab-settings.scss
index d82a890b1..7ecc5abc7 100644
--- a/src/sass/views/tab-settings.scss
+++ b/src/sass/views/tab-settings.scss
@@ -1,8 +1,21 @@
.settings {
+ @extend .deflash-blue;
+ .icon-bitpay-card {
+ background-image: url("../img/icon-card.svg");
+ background-color: #1e3186;
+ }
.item {
color: $dark-gray;
border-color: rgba(221, 221, 221, 0.3);
}
+ .has-comment {
+ border-bottom: 0 none;
+ }
+ .comment {
+ padding: 15px;
+ background-color: #fff;
+ color: $mid-gray;
+ }
&-explanation, &-button-group {
padding: 0 1rem;
margin: 1rem 0;
@@ -63,6 +76,13 @@
.item-note {
color: $light-gray;
}
+ .item-toggle .toggle,
+ .item-button-right > .button {
+ top: 16px;
+ }
+ .item-button-right > .button {
+ font-size: 16px;
+ }
}
}
@@ -126,7 +146,6 @@
}
.fee-policies {
border-color: #fff;
- border-width: 2px 0;
border-style: solid;
}
}
diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss
index a14abf8f0..8e241aba7 100644
--- a/src/sass/views/views.scss
+++ b/src/sass/views/views.scss
@@ -9,19 +9,26 @@
@import "tab-scan";
@import "tab-send";
@import "tab-settings";
+@import "walletBalance";
@import "walletDetails";
@import "advancedSettings";
@import "bitpayCard";
@import "bitpayCardIntro";
@import "bitpayCardPreferences";
@import "address-book";
+@import "addresses";
@import "wallet-backup-phrase";
@import "zero-state";
@import "onboarding/onboarding";
+@import "feedback/rateCard";
+@import "feedback/send";
+@import "feedback/complete";
+@import "feedback/rateApp";
@import "includes/actionSheet";
@import "export";
@import "import";
@import "join";
+@import "includes/menu-popover";
@import "includes/walletActivity";
@import "includes/wallets";
@import "includes/modals/modals";
@@ -35,3 +42,4 @@
@import "includes/walletSelector";
@import "integrations/coinbase";
@import "integrations/glidera";
+@import "custom-amount";
diff --git a/src/sass/views/wallet-backup-phrase.scss b/src/sass/views/wallet-backup-phrase.scss
index 10a9f3f15..68e55f414 100644
--- a/src/sass/views/wallet-backup-phrase.scss
+++ b/src/sass/views/wallet-backup-phrase.scss
@@ -1,4 +1,31 @@
#wallet-backup-phrase {
+ h3 {
+ padding: 15px;
+ }
+ .button-confirm {
+ margin-top: 1rem;
+ }
+ .password-required {
+ padding: 1rem;
+ }
+ .password-prompt {
+ background-color: $subtle-gray;
+ padding: 2rem;
+ .explanation {
+ padding: 0 1rem;
+ margin: 1rem 0;
+ }
+ .description {
+ text-align: center;
+ font-size: 15px;
+ color: #000;
+ margin: 1rem 0;
+ }
+ input {
+ width: 100%;
+ padding: 1rem;
+ }
+ }
.bar.bar-royal .title {
font-size: 1rem;
}
diff --git a/src/sass/views/walletBalance.scss b/src/sass/views/walletBalance.scss
new file mode 100644
index 000000000..84ec41109
--- /dev/null
+++ b/src/sass/views/walletBalance.scss
@@ -0,0 +1,113 @@
+.wallet-balance {
+
+ &__amount {
+
+ font-size: 16px;
+
+ &--total {
+ color: $mid-gray;
+ }
+
+ &--available {
+ color: #09C286;;
+ }
+
+ &--confirming {
+ color: #FF9900;
+ }
+
+ &--locked {
+ color: #FF9900;
+ }
+
+ &--alternative {
+ color: $light-gray;
+ font-size: 14px;
+ }
+
+ }
+
+ &__title {
+ flex-grow: 1;
+ color: $dark-gray;
+ overflow: hidden;
+ }
+
+ &__icon {
+ float: left;
+ margin-right: 1rem;
+ color: $light-gray;
+ font-size: 24px;
+ }
+
+ &__list {
+ background: #f5f5f5;
+ }
+
+ .item {
+ display: flex;
+ align-items: center;
+ background: #fff;
+ padding-left: 1rem;
+ }
+
+ &__item {
+ display: flex;
+ align-items: center;
+ background: #fff;
+ padding: 0;
+ margin: 0;
+ border: 0;
+ padding-left: 1rem;
+ }
+
+ &__content {
+ display: flex;
+ align-items: center;
+ flex-grow: 1;
+ padding: 0.6rem 0;
+ padding-right: 1rem;
+ border-bottom: 1px solid rgb(245, 245, 245);
+ overflow: hidden;
+
+ &.no-border {
+ border: 0;
+ }
+ }
+
+ &__amount {
+ white-space: nowrap;
+ }
+
+ &__heading {
+ font-size: 17px;
+ color: #445;
+ margin: 1rem 1rem 1rem 1rem;
+ }
+
+ &__description {
+ font-size: 12.5px;
+ color: #667;
+ margin: 0.7rem;
+ line-height: 16px;
+ }
+
+}
+
+#wallet-balance {
+ .bar-header {
+ border: 0;
+ background: none;
+ .title, .button {
+ color: #fff;
+ }
+ .button {
+ background-color: transparent;
+ }
+ }
+
+ ion-content {
+ background: #F5F5F5;
+ }
+
+}
diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss
index 37438bc1d..52dd836bc 100644
--- a/src/sass/views/walletDetails.scss
+++ b/src/sass/views/walletDetails.scss
@@ -6,7 +6,7 @@
font-weight: bold;
}
&--received {
- color: #30af6c;
+ color: #09C286;
}
&--sent {
color: $dark-gray;
@@ -14,18 +14,106 @@
}
&__tx-time {
color: $light-gray;
+ font-size: 12.5px;
}
&__tx-title {
- padding-top: 10px;
+ flex-grow: 1;
color: $dark-gray;
+ overflow: hidden;
}
&__tx-icon {
float: left;
- margin-right: 10px;
+ margin-right: 25px;
+ }
+ &__tx-message {
+ margin-right: 1rem;
+ }
+
+ &__list {
+
+ }
+
+ .item {
+ display: flex;
+ align-items: center;
+ background: #fff;
+ padding-left: 1rem;
+ }
+
+ &__item {
+ display: flex;
+ align-items: center;
+ background: #fff;
+ padding: 0;
+ margin: 0;
+ border: 0;
+ padding-left: 1rem;
+
+ &.proposal {
+ position: relative;
+ }
+
+ &__marker {
+ position: absolute;
+ height: 100%;
+ width: 3px;
+ background: #F5A623;
+ left: 0;
+ }
+ }
+
+ &__tx-content {
+ display: flex;
+ align-items: center;
+ flex-grow: 1;
+ padding: 1rem 0;
+ padding-right: 1rem;
+ border-bottom: 1px solid rgb(245, 245, 245);
+ overflow: hidden;
+
+ &.no-border {
+ border: 0;
+ }
+ }
+
+ &__tx-amount {
+ white-space: nowrap;
+ }
+
+ &__group-label {
+ font-size: 14px;
+ font-weight: 300;
+ color: #727272;
+ padding: 2px 1rem;
+ background: #f8f8f9;
}
}
#walletDetails {
+ background: #F8F8F9;
+
+ .scroll-refresher {
+ z-index: 1;
+ margin-top: 3.5rem;
+ }
+
+ .ionic-refresher-content {
+ color: white !important;
+
+ .spinner svg {
+ stroke: white;
+ fill: white;
+ }
+ }
+
+ .bp-content {
+ position: relative;
+ height: 100%;
+
+ &.status-bar {
+ margin-top: 20px;
+ }
+ }
.bar-header {
border: 0;
background: none;
@@ -39,21 +127,75 @@
.nav-bar-block, .bar {
background-color: inherit !important;
}
+ ion-content {
+
+ &.collapsible {
+ margin-top: 210px;
+ }
+
+ padding-top: 0;
+ top: 0;
+ .scroll {
+ background: rgb(248, 248, 249);
+ min-height: 300px;
+ }
+ }
+ .amount-wrapper {
+ position: relative;
+ overflow: visible;
+
+ .amount-bg {
+ content: '';
+ top: 0;
+ left: 0;
+ position: absolute;
+ width: 100%;
+ height: 500px;
+ transform: translateY(-499px);
+
+ &.collapsible {
+ top: initial;
+ bottom: 0;
+ left: 0;
+ position: absolute;
+ width: 100%;
+ height: 200px;
+ transform: translateY(100px);
+ }
+ }
+ }
.amount {
width: 100%;
text-align: center;
- padding: 2rem 1rem 1.5rem 1rem;
color: #fff;
- height: 140px;
- margin-bottom: 10px;
+ height: 210px;
+ padding-top: 40px;
+ display: block;
+ align-items: center;
+ justify-content: center;
+
+ &.collapsible {
+ margin-bottom: 10px;
+ }
+
+ &__balance {
+ transform: scale3d(1, 1, 1) translateY(45px);
+ }
+
+ &__updating {
+ z-index: 999;
+ margin-top: -2.1rem;
+ }
&-alternative {
line-height: 36px;
}
- strong {
- line-height: 100%;
+ &__button-balance {
+ background-color: transparent;
+ border: 1px solid rgba(255,255,255,0.25);
}
+
}
.item.item-footer {
font-weight: lighter;
@@ -73,7 +215,22 @@
position: absolute;
top: inherit;
left: 10px;
- bottom: 15px;
+ bottom: 5px;
font-size: 20px;
color: #fff;
}
+
+.wallet-not-backed-up-warning {
+ background: orange;
+ text-align: center;
+ color: white;
+ font-size: 14px;
+ display: block;
+ text-decoration: none;
+ z-index: 9999;
+ position: relative;
+}
+
+a.item {
+ cursor: pointer;
+}
diff --git a/www/img/contact-placeholder.svg b/www/img/contact-placeholder.svg
new file mode 100644
index 000000000..f730da86b
--- /dev/null
+++ b/www/img/contact-placeholder.svg
@@ -0,0 +1,12 @@
+
+
+
diff --git a/www/img/ico-positive-feedback.svg b/www/img/ico-positive-feedback.svg
new file mode 100644
index 000000000..508cc7ded
--- /dev/null
+++ b/www/img/ico-positive-feedback.svg
@@ -0,0 +1,18 @@
+
+
diff --git a/www/img/ico-star-filled.svg b/www/img/ico-star-filled.svg
new file mode 100644
index 000000000..a475c9e2c
--- /dev/null
+++ b/www/img/ico-star-filled.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/www/img/ico-star.svg b/www/img/ico-star.svg
new file mode 100644
index 000000000..864f2b2ba
--- /dev/null
+++ b/www/img/ico-star.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/www/img/icon-confirming-clear.svg b/www/img/icon-confirming-clear.svg
new file mode 100644
index 000000000..e7cf58529
--- /dev/null
+++ b/www/img/icon-confirming-clear.svg
@@ -0,0 +1,18 @@
+
+
+
+
diff --git a/www/img/icon-confirming.svg b/www/img/icon-confirming.svg
new file mode 100644
index 000000000..989af61aa
--- /dev/null
+++ b/www/img/icon-confirming.svg
@@ -0,0 +1,22 @@
+
+
\ No newline at end of file
diff --git a/www/img/icon-import.svg b/www/img/icon-import.svg
new file mode 100644
index 000000000..1cfba9a50
--- /dev/null
+++ b/www/img/icon-import.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/www/img/icon-important.svg b/www/img/icon-important.svg
new file mode 100644
index 000000000..4f113aaf2
--- /dev/null
+++ b/www/img/icon-important.svg
@@ -0,0 +1,11 @@
+
+
+
+
diff --git a/www/img/icon-language.svg b/www/img/icon-language.svg
index 15adeb549..83c23aaa9 100644
--- a/www/img/icon-language.svg
+++ b/www/img/icon-language.svg
@@ -5,7 +5,7 @@
- New personal wallet
+ New personal wallet
@@ -19,7 +19,7 @@
- Create shared wallet
+ Create shared wallet
@@ -27,7 +27,7 @@
- Join shared wallet
+ Join shared wallet
@@ -35,7 +35,7 @@
- Import wallet
+ Import wallet
diff --git a/www/views/addressbook.add.html b/www/views/addressbook.add.html
index 7a79f858b..088fbf47d 100644
--- a/www/views/addressbook.add.html
+++ b/www/views/addressbook.add.html
@@ -29,7 +29,7 @@
Email
diff --git a/www/views/addressbook.html b/www/views/addressbook.html
index 3e8c78454..0442c5ea6 100644
--- a/www/views/addressbook.html
+++ b/www/views/addressbook.html
@@ -6,8 +6,8 @@
Address Book
+
+ Unused Addresses Limit
+The maximum number of consecutive unused addresses (20) has been reached. When one of your unused addresses receives a payment, a new address will be generated and shown in your Receive tab. Read more
+The restore process will stop when 20 addresses are generated in a row which contain no funds. To safely generate more addresses, make a payment to one of the unused addresses which has already been generated. Read less
+
-
- Enter your password
+Get started
-Your BitPay Card is ready. Add funds to your card to start using your card at stores and ATMs worldwide.
+- BitPay Invoice ID: {{buy.errorInfo.invoiceId}}. -
- Gift card could not be created
-
- -
-
- 1. Visit www.amazon.com/gc -
- 2. Click Apply to Account and enter the Claim Code when prompted. -
- 3. Gift card funds will be applied automatically to eligible orders during the checkout process. -
- 4. You must pay for any remaining balance on your order with another payment method. -
- Your gift card claim code may also be entered when prompted during checkout. To redeem your gift card using - the Amazon.com 1-Click® service, first add the gift card funds to Your Account. -
- -- If you have questions about redeeming your gift card, please visit - www.amazon.com/gc-redeem. - If you have questions regarding the BitPay Introductory offer, please contact BitPay. -
- -- Monthly buy limit: - {{limits.monthlyBuy|currency:'':2}} {{limits.currency}} - (remaining {{limits.monthlyBuyRemaining|currency:'':2}} {{limits.currency}}) -
- A SMS containing a confirmation code was sent to your phone.
- Please, enter the code below
-
- Fiat will be immediately withdrawn from your bank account. The bitcoins will be purchased and deposited to your wallet in 2-4 business days. -
-Purchase initiated
-- A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 2-4 business days. -
- - -
- Sending
+ 
+ Sending
+ Sending maximum amount
+ Buying
+ Selling
+
+
+
+
+ 
@@ -62,43 +68,86 @@
+ 
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Connect your Glidera account to get started.
Glidera Inc. (Glidera) is providing the service of buying or selling bitcoin to BitPay users. To enable this service, Glidera has registered with US Treasury Department’s FinCEN as a Money Service Business (#31000042625755). Users of BitPay must agree to the service agreement presented by Glidera prior to obtaining Glidera’s service of buying or selling bitcoin.
-Service is available in the U.S. and Canada. In the U.S. – AZ, CA, CO, DE, GA, IL, KS, MA, MD, ME, MN, MO, MT, NJ, NV, PA, SC, TN, TX, UT, WI. In Canada – AB, BC, MB, NB, NL, NS, NT, NU, ON, PE, SK, YT.
+Glidera Inc. (Glidera) is providing the service of buying or selling bitcoin to BitPay users. To enable this service, Glidera has registered with US Treasury Department’s FinCEN as a Money Service Business (#31000042625755). Users of BitPay must agree to the service agreement presented by Glidera prior to obtaining Glidera’s service of buying or selling bitcoin.
+Service is available in the U.S. and Canada.
Without a backup, you could lose money
- If something happens to this device, this app is deleted, or your password forgotten, neither you nor Bitpay can revoer your funds. + If something happens to this device, this app is deleted, or your password forgotten, neither you nor Bitpay can recover your funds. diff --git a/www/views/includes/clickToAccept.html b/www/views/includes/clickToAccept.html index cf555153b..ab24cfbd5 100644 --- a/www/views/includes/clickToAccept.html +++ b/www/views/includes/clickToAccept.html @@ -1,4 +1,4 @@ -
+ 
+ 
+
This is a binding Agreement between BitPay, Inc. (“BitPay” or “We”) and the person, persons, or entity (“You” or “Your”) using the service, Software, or application (“Software”).
-+
RIGHTS AND OBLIGATIONS
-+
BitPay provides the Software solely on the terms and conditions set forth in this Agreement and on the condition that You accept and comply with them. By using the Software You (a) accept this Agreement and agree that You are legally bound by its terms; and (b) represent and warrant that: (i) You are of legal age to enter into a binding agreement; and (ii) if You are a corporation, governmental organization or other legal entity, You have the right, power and authority to enter into this Agreement on behalf of the corporation, governmental organization or other legal entity and bind them to these terms.
-+
This Software functions as a free, open source, and multi-signature digital wallet. The Software does not constitute an account where We or other third parties serve as financial intermediaries or custodians of Your bitcoin(s).
-+
While the Software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, We cannot guarantee there will not be bugs in the Software. You acknowledge that Your use of this Software is at Your own discretion and in compliance with all applicable laws. You are responsible for safekeeping Your passwords, private key pairs, PINs, and any other codes You use to access the Software.
-+
IF YOU LOSE ACCESS TO YOUR BITCOIN WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the Software, employees and affiliates of BitPay, copyright holders, and BitPay, Inc. cannot retrieve Your private keys or passwords if You lose or forget them and cannot guarantee transaction confirmation as they do not have control over the bitcoin network.
-+
DISCLAIMER
-+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OF THE SOFTWARE, EMPLOYEES AND AFFILIATES OF BITPAY, COPYRIGHT HOLDERS, OR BITPAY, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
IN NO EVENT WILL BITPAY OR ITS AFFILIATES, OR ANY OF ITS OR THEIR RESPECTIVE SERVICE PROVIDERS, BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY USE, INTERRUPTION, DELAY OR INABILITY TO USE THE SOFTWARE, LOST REVENUES OR PROFITS, DELAYS, INTERRUPTION OR LOSS OF SERVICES, BUSINESS OR GOODWILL, LOSS OR CORRUPTION OF DATA, LOSS RESULTING FROM SYSTEM OR SYSTEM SERVICE FAILURE, MALFUNCTION OR SHUTDOWN, FAILURE TO ACCURATELY TRANSFER, READ OR TRANSMIT INFORMATION, FAILURE TO UPDATE OR PROVIDE CORRECT INFORMATION, SYSTEM INCOMPATIBILITY OR PROVISION OF INCORRECT COMPATIBILITY INFORMATION OR BREACHES IN SYSTEM SECURITY, OR FOR ANY CONSEQUENTIAL, INCIDENTAL, INDIRECT, EXEMPLARY, SPECIAL OR PUNITIVE DAMAGES, WHETHER ARISING OUT OF OR IN CONNECTION WITH THIS AGREEMENT, BREACH OF CONTRACT, TORT (INCLUDING NEGLIGENCE) OR OTHERWISE, REGARDLESS OF WHETHER SUCH DAMAGES WERE FORESEEABLE AND WHETHER OR NOT WE WERE ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-+
INTELLECTUAL PROPERTY
-+
We retain all right, title, and interest in and to the Content and all of BitPay’s brands, logos, and trademarks, including, but not limited to, BitPay, Inc., BitPay, BitPay – Secure Bitcoin Wallet, BitPay Wallet, BitPay App, Copay, BitPay Prepaid Card, and variations of the wording of the aforementioned brands, logos, and trademarks.
-+
CHOICE OF LAW
-+
This Agreement, and its application and interpretation, shall be governed exclusively by the laws of the State of Georgia, without regard to its conflict of law rules. You consent to the exclusive jurisdiction of the federal and state courts located in or near Atlanta, Georgia for any dispute arising under this Agreement.
-+
SEVERABILITY
-+
In the event any court shall declare any section or sections of this Agreement invalid or void, such declaration shall not invalidate the entire Agreement and all other paragraphs of the Agreement shall remain in full force and effect.
-+
BINDING AGREEMENT
-+
The terms and provisions of this Agreement are binding upon Your heirs, successors, assigns, and other representatives. This Agreement may be executed in counterparts, each of which shall be considered to be an original, but both of which constitute the same Agreement.
-+
You assume any and all risks associated with the use of the Software. We reserve the right to modify this Agreement from time to time.
-- - {{tx.wallet.name}} - -
+ + + – + + (possible double spend) + + + – {{tx.amountStr}} + + +
- Request a specific amount
-QR Code
--
-
-
-
- - --
-
Details
--
-
- - Address: - - {{addr}} - - -
- - Amount: - - {{customizedAmountUnit}} - {{customizedAlternativeUnit}} - - -
- 
- 
+ 
+
+ 
@@ -72,7 +72,7 @@
- {{filteredTxHistory.length - txHistorySearchResults.length}} more
+ {{filteredTxHistory.length - txHistorySearchResults.length}} more
diff --git a/www/views/modals/terms.html b/www/views/modals/terms.html
index f823870b0..e1b216308 100644
--- a/www/views/modals/terms.html
+++ b/www/views/modals/terms.html
@@ -12,7 +12,7 @@
diff --git a/www/views/modals/txp-details.html b/www/views/modals/txp-details.html
index 769985946..1496acc64 100644
--- a/www/views/modals/txp-details.html
+++ b/www/views/modals/txp-details.html
@@ -11,11 +11,11 @@
-
+
-
+
Sending
@@ -27,7 +27,7 @@
The payment was removed by creator
-
+
Payment accepted, but not yet broadcasted
@@ -86,7 +86,7 @@
- {{'Memo'|translate}}
+ Memo
{{tx.message}}
@@ -150,12 +150,6 @@
-
- Click to accept
-
* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created.
@@ -167,16 +161,24 @@
+
+ {{'Accept'| translate}}
+
- Slide to accept
+ slide-send-status="sendStatus"
+ has-wallet-chosen="true">
+ {{'Accept'| translate}}
- Payment Sent
+ {{'Payment Sent' | translate}}
diff --git a/www/views/modals/wallet-balance.html b/www/views/modals/wallet-balance.html
new file mode 100644
index 000000000..d68109fa3
--- /dev/null
+++ b/www/views/modals/wallet-balance.html
@@ -0,0 +1,96 @@
+
+
+
+
+ {{wallet.name}}
+
+
+
+
+ All of your bitcoin wallet balance may not be available for immediate spending.
+
+
+ 
+
+ Total
+
+
+ {{status.totalBalanceStr}}
+
+
+
+ {{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}
+
+
+
+
+
+ The total amount of bitcoin stored in this wallet.
+
+
+
+
+
+ Available
+
+
+ {{status.spendableBalanceStr}}
+
+
+
+ {{status.spendableBalanceAlternative}} {{status.alternativeIsoCode}}
+
+
+
+
+
+ The amount of bitcoin immediately spendable from this wallet.
+
+
+
+ 
+
+ Confirming
+
+
+ {{status.pendingBalanceStr}}
+
+
+
+ {{status.pendingBalanceAlternative}} {{status.alternativeIsoCode}}
+
+
+
+
+
+ The amount of bitcoin stored in this wallet with less than 1 blockchain confirmation.
+
+
+
+ 
+
+ Locked
+
+
+ {{status.lockedBalanceStr}}
+
+
+
+ {{status.lockedBalanceAlternative}} {{status.alternativeIsoCode}}
+
+
+
+
+
+ The amount of bitcoin stored in this wallet that is allocated as inputs to your pending transaction proposals. The amount is determined using unspent transaction outputs associated with this wallet and may be more than the actual amounts associated with your pending transaction proposals.
+
+
+
diff --git a/www/views/onboarding/disclaimer.html b/www/views/onboarding/disclaimer.html
index 96a75f909..f728ccd9e 100644
--- a/www/views/onboarding/disclaimer.html
+++ b/www/views/onboarding/disclaimer.html
@@ -1,32 +1,48 @@
-
-
-
-
-
-
-
-
- Quick review!
- Almost done! Let's review.
- Bitcoin is different – it cannot be safely held with a bank or web service.
-
-
- I understand that my funds are held securely on this device, not by a company.
-
-
- I understand that if this app is moved to another device or deleted, my bitcoin can only be recovered with the backup phrase.
-
-
-
-
-
- I have read, understood, and agree to the Terms of Use.
-
+
+
+
+
+
+
+
+
+
+ Quick review!
+ Almost done! Let's review.
+ Bitcoin is different – it cannot be safely held with a bank or web service.
+
+
+ I understand that my funds are held securely on this device, not by a company.
+
+
+ I understand that if this app is moved to another device or deleted, my bitcoin can only be recovered with the backup phrase.
+
+
+
+
+
+
+ {{'Terms of Use' | translate}}
+
+
+
+
+
+
-
-
+
+
+
+
+ I have read, understood, and agree to the Terms of Use.
+
+
+
+
diff --git a/www/views/onboarding/tour.html b/www/views/onboarding/tour.html
index de836e0c9..371842f81 100644
--- a/www/views/onboarding/tour.html
+++ b/www/views/onboarding/tour.html
@@ -15,7 +15,7 @@
@@ -30,7 +30,7 @@
@@ -38,12 +38,12 @@
- You control your bitcoin.
- This app stores your bitcoin with cutting-edge security.
+ You control your bitcoin.
+ This app stores your bitcoin with cutting-edge security.
diff --git a/www/views/paperWallet.html b/www/views/paperWallet.html
index 548bc5308..139645165 100644
--- a/www/views/paperWallet.html
+++ b/www/views/paperWallet.html
@@ -1,91 +1,37 @@
-
+
{{'Sweep paper wallet' | translate}}
+
+
+
-
-
-
-
- Backup Needed
-
- Before receiving funds, you must backup your wallet. If this device is lost, it is impossible to access your funds without a backup.
-
- Backup Now
-
-
-
-
-
-
- {{error|translate}}
-
-
-
-
+
+
-
- Funds found
- {{balance}}
-
-
-
-
-
+ Funds found:
+ {{balance}}
+ ...
-
+
+ Founds transferred
+
diff --git a/www/views/preferences.html b/www/views/preferences.html
index 35b787557..b16b93b4d 100644
--- a/www/views/preferences.html
+++ b/www/views/preferences.html
@@ -29,6 +29,11 @@
+
+
+ Hide Balance
+
+
Security
diff --git a/www/views/preferencesAbout.html b/www/views/preferencesAbout.html
index 3f26d93b6..42c47284c 100644
--- a/www/views/preferencesAbout.html
+++ b/www/views/preferencesAbout.html
@@ -16,7 +16,7 @@
v{{version}}
-
+
Sending
+
+
+ I have read, understood, and agree to the Terms of Use.
- +I have read, understood, and agree to the Terms of Use.
+ +