diff --git a/app-template/index.html b/app-template/index.html index af88781c4..6a32429c8 100644 --- a/app-template/index.html +++ b/app-template/index.html @@ -12,6 +12,14 @@ + +
+ +
+ diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index 41e56543a..8b79bd815 100644 --- a/src/js/controllers/amount.js +++ b/src/js/controllers/amount.js @@ -7,7 +7,7 @@ angular.module('copayApp.controllers').controller('amountController', function($ var unitDecimals; var satToBtc; var self = $scope.self; - var SMALL_FONT_SIZE_LIMIT = 13; + var SMALL_FONT_SIZE_LIMIT = 10; var LENGTH_EXPRESSION_LIMIT = 19; $scope.$on('$ionicView.leave', function() { @@ -197,18 +197,18 @@ angular.module('copayApp.controllers').controller('amountController', function($ amount: amountUSD, currency: 'USD' }; - ongoingProcess.set('Processing Transaction...', true); + ongoingProcess.set('Preparing transaction...', true); $timeout(function() { bitpayCardService.topUp($scope.cardId, dataSrc, function(err, invoiceId) { if (err) { - ongoingProcess.set('Processing Transaction...', false); + ongoingProcess.set('Preparing transaction...', false); popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err)); return; } bitpayCardService.getInvoice(invoiceId, function(err, data) { - ongoingProcess.set('Processing Transaction...', false); + ongoingProcess.set('Preparing transaction...', false); if (err) { popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err)); return; diff --git a/src/js/controllers/bitpayCardIntro.js b/src/js/controllers/bitpayCardIntro.js index 5d1c6429c..73ef571ac 100644 --- a/src/js/controllers/bitpayCardIntro.js +++ b/src/js/controllers/bitpayCardIntro.js @@ -27,9 +27,9 @@ angular.module('copayApp.controllers').controller('bitpayCardIntroController', f popupService.showAlert(null, err); return; } - var title = gettextCatalog.getString('Add BitPay Card?'); + var title = gettextCatalog.getString('Add BitPay Card Account?'); var msg = gettextCatalog.getString('Would you like to add this account ({{email}}) to your wallet?', {email: obj.email}); - var ok = gettextCatalog.getString('Add cards'); + var ok = gettextCatalog.getString('Add Account'); var cancel = gettextCatalog.getString('Go back'); popupService.showConfirm(title, msg, ok, cancel, function(res) { if (res) { @@ -59,14 +59,18 @@ angular.module('copayApp.controllers').controller('bitpayCardIntroController', f } }); + $scope.bitPayCardInfo = function() { + var url = 'https://bitpay.com/visa/faq'; + externalLinkService.open(url); + }; + $scope.orderBitPayCard = function() { - var url = 'https://bitpay.com/visa/'; + var url = 'https://bitpay.com/visa/get-started'; externalLinkService.open(url); }; $scope.connectBitPayCard = function() { - var url = 'https://bitpay.com/visa/login'; + var url = 'https://bitpay.com/visa/dashboard/add-to-bitpay-wallet-confirm'; externalLinkService.open(url); }; }); - diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 9f4c312ec..712937c8b 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -1,9 +1,9 @@ 'use strict'; -angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, gettext, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig) { +angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $interval, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, gettext, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig) { var cachedTxp = {}; var isChromeApp = platformInfo.isChromeApp; - + var countDown = null; $ionicConfig.views.swipeBackEnabled(false); $scope.$on("$ionicView.beforeEnter", function(event, data) { @@ -15,6 +15,12 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.toEmail = data.stateParams.toEmail; $scope.description = data.stateParams.description; $scope.paypro = data.stateParams.paypro; + $scope.paymentExpired = { + value: false + }; + $scope.remainingTimeStr = { + value: null + }; initConfirm(); }); @@ -87,6 +93,10 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.alternativeAmountStr = v; }); + if($scope.paypro) { + _paymentTimeControl($scope.paypro.expires); + } + $timeout(function() { $scope.$apply(); }, 100); @@ -136,6 +146,91 @@ angular.module('copayApp.controllers').controller('confirmController', function( return amountStr.split(' ')[1]; } +// <<<<<<< HEAD +// ======= + // var setFromPayPro = function(uri, cb) { + // if (!cb) cb = function() {}; + // + // var wallet = profileService.getWallets({ + // onlyComplete: true + // })[0]; + // + // if (!wallet) return cb(); + // + // if (isChromeApp) { + // popupService.showAlert(gettextCatalog.getString('Payment Protocol not supported on Chrome App')); + // return cb(true); + // } + // + // $log.debug('Fetch PayPro Request...', uri); + // + // ongoingProcess.set('fetchingPayPro', true); + // wallet.fetchPayPro({ + // payProUrl: uri, + // }, function(err, paypro) { + // + // ongoingProcess.set('fetchingPayPro', false); + // + // if (err) { + // $log.warn('Could not fetch payment request:', err); + // var msg = err.toString(); + // if (msg.match('HTTP')) { + // msg = gettextCatalog.getString('Could not fetch payment information'); + // } + // popupService.showAlert(msg); + // return cb(true); + // } + // + // if (!paypro.verified) { + // $log.warn('Failed to verify payment protocol signatures'); + // popupService.showAlert(gettextCatalog.getString('Payment Protocol Invalid')); + // return cb(true); + // } + // + // $scope.toAmount = paypro.amount; + // $scope.toAddress = paypro.toAddress; + // $scope.description = paypro.memo; + // $scope.paypro = null; + // + // $scope._paypro = paypro; + // _paymentTimeControl(paypro.expires); + // return initConfirm(); + // }); + // }; + + function _paymentTimeControl(expirationTime) { + $scope.paymentExpired.value = false; + setExpirationTime(); + + countDown = $interval(function() { + setExpirationTime(); + }, 1000); + + function setExpirationTime() { + var now = Math.floor(Date.now() / 1000); + + if (now > expirationTime) { + setExpiredValues(); + return; + } + + var totalSecs = expirationTime - now; + var m = Math.floor(totalSecs / 60); + var s = totalSecs % 60; + $scope.remainingTimeStr.value = ('0' + m).slice(-2) + ":" + ('0' + s).slice(-2); + } + + function setExpiredValues() { + $scope.paymentExpired.value = true; + $scope.remainingTimeStr.value = gettextCatalog.getString('Expired'); + if (countDown) $interval.cancel(countDown); + $timeout(function() { + $scope.$apply(); + }); + } + } + +// >>>>>>> de248d56393535b819d879d38692af68c9e6e4da function setWallet(wallet, delayed) { var stop; $scope.wallet = wallet; @@ -242,12 +337,20 @@ angular.module('copayApp.controllers').controller('confirmController', function( }; $scope.approve = function(onSendStatusChange) { + if ($scope._paypro && $scope.paymentExpired.value) { + popupService.showAlert(null, gettextCatalog.getString('The payment request has expired')); + $scope.sendStatus = ''; + $timeout(function() { + $scope.$apply(); + }); + return; + } + var wallet = $scope.wallet; if (!wallet) { return setSendError(gettextCatalog.getString('No wallet selected')); }; - if (!wallet.canSign() && !wallet.isPrivKeyExternal()) { $log.info('No signing proposal: No private key'); @@ -286,10 +389,8 @@ angular.module('copayApp.controllers').controller('confirmController', function( } publishAndSign(wallet, txp, onSendStatusChange); }); - } - else publishAndSign(wallet, txp, onSendStatusChange); - } - else { + } else publishAndSign(wallet, txp, onSendStatusChange); + } else { popupService.showConfirm(null, message, okText, cancelText, function(ok) { if (!ok) { $scope.sendStatus = ''; @@ -298,8 +399,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( publishAndSign(wallet, txp, onSendStatusChange); }); } - } - else publishAndSign(wallet, txp, onSendStatusChange); + } else publishAndSign(wallet, txp, onSendStatusChange); }); }; diff --git a/src/js/controllers/preferencesAlias.js b/src/js/controllers/preferencesAlias.js index e5967199c..5060335c1 100644 --- a/src/js/controllers/preferencesAlias.js +++ b/src/js/controllers/preferencesAlias.js @@ -7,8 +7,9 @@ angular.module('copayApp.controllers').controller('preferencesAliasController', var config = configService.getSync(); $scope.walletName = wallet.credentials.walletName; + $scope.walletAlias = config.aliasFor && config.aliasFor[walletId] ? config.aliasFor[walletId] : wallet.credentials.walletName; $scope.alias = { - value: (config.aliasFor && config.aliasFor[walletId]) || wallet.credentials.walletName + value: $scope.walletAlias }; $scope.save = function() { @@ -23,11 +24,4 @@ angular.module('copayApp.controllers').controller('preferencesAliasController', $ionicHistory.goBack(); }); }; - $scope.valueCheck = function() { - if ($scope.alias.value == wallet.credentials.walletName || $scope.alias.value == '') $scope.disableSave = true; - else $scope.disableSave = false; - }; - $scope.$watch('alias.value', function(newvalue, oldvalue) { - $scope.valueCheck(); - }); }); diff --git a/src/sass/ionic.scss b/src/sass/ionic.scss index 6f962fec1..1c2fc0a87 100644 --- a/src/sass/ionic.scss +++ b/src/sass/ionic.scss @@ -35,3 +35,8 @@ $placeholder-icon-padding: 10px; .item p { color: $mid-gray; } + +// we'd like to diverge from the standard ionic formula for left-right card margins +.card { + margin: ($content-padding * 2) 14px; +} diff --git a/src/sass/shame.scss b/src/sass/shame.scss index d1ebde783..b2fa628e2 100644 --- a/src/sass/shame.scss +++ b/src/sass/shame.scss @@ -18,6 +18,10 @@ border-color: #e6b500; background-color: #ffc900; color: #fff; + &.warning-red{ + border-color: #EB475A; + background-color: $warning-red; + } } &.error { background-color: #ef473a; @@ -128,8 +132,8 @@ input[type=number] { .postfix { position: absolute; right: 10px; - background-color: #f8f8f8; - color: #444; + background-color: $subtle-gray; + color: $dark-gray; border-radius: 4px; padding: 2px 10px; cursor: pointer; diff --git a/src/sass/variables.scss b/src/sass/variables.scss index e5e5ccb5d..fecc7bed2 100644 --- a/src/sass/variables.scss +++ b/src/sass/variables.scss @@ -8,6 +8,7 @@ $roboto-light: "Roboto-Light", sans-serif-light; $light-green: rgb(19, 229, 182); $success-green: #17ae8c; $warning-orange: #ffa500; +$warning-red: #E15061; $dark-gray: #445; $mid-gray: #667; $light-gray: #9b9bab; diff --git a/src/sass/views/amount.scss b/src/sass/views/amount.scss index bc1573d4b..eec888643 100644 --- a/src/sass/views/amount.scss +++ b/src/sass/views/amount.scss @@ -1,4 +1,9 @@ #view-amount { + .recipient-label { + font-size: 14px; + padding-bottom: 0; + color: $mid-gray; + } .item-no-bottom-border + .item { border-top: 0; } @@ -19,7 +24,7 @@ box-shadow: none; } } - font-size: 11px; + font-size: 13px; padding-left: 48px; } } @@ -30,7 +35,7 @@ } .amount-pane { position: absolute; - top: 125px; + top: 95px; bottom: 0; width: 100%; background-color: #fff; @@ -42,6 +47,8 @@ .title { float: left; padding-top: 10px; + color: $dark-gray; + font-weight: bold; } } .amount { @@ -53,11 +60,60 @@ bottom: 254px; top: 66px; .light { - color: #A4A4A4; + color: $light-gray; } } } - + .amount { + &__editable { + margin-bottom: 1rem; + &--minimize { + font-size: 22px; + } + &--standard { + font-size: 42px; + } + &--placeholder { + color: $light-gray; + } + } + &__number { + color: $dark-gray; + } + &__currency-toggle { + border: 1px solid $subtle-gray; + color: $dark-gray; + border-radius: 3px; + padding: 0 10px; + cursor: pointer; + font-size: .6em; + position: relative; + top: -3px; + line-height: 1; + } + &__results { + &--minimize { + font-size: 12px; + } + &--standard { + font-size: 18px; + } + &--placeholder { + color: $light-gray; + } + } + &__result { + color: $light-gray; + font-size: .9em; + margin-bottom: -.9em; + line-height: 1; + } + &__result-equiv { + color: $mid-gray; + font-size: 1.2em; + margin-top: 2rem; + } + } .keypad { text-align: center; font-size: 24px; @@ -65,6 +121,7 @@ position: absolute; bottom: 0; width: 100%; + color: $mid-gray; .row { padding: 0 !important; @@ -72,23 +129,23 @@ } .col { - line-height: 40px; + line-height: 45px; } .operator { - background-color: #eaeaea; + background-color: $subtle-gray; font-weight: normal; cursor: pointer; &:active { - background-color: #f8f8f8; + background-color: $light-gray; } } .operator-send { font-weight: bolder; - color: #f8f8f8; - background-color: #1e3186; + color: #fff; + background-color: $positive; font-size: 36px; cursor: pointer; @@ -99,10 +156,10 @@ .digit{ cursor: pointer; - border-top: 1px solid #eaeaea; - border-left: 1px solid #eaeaea; + border-top: 1px solid $subtle-gray; + border-left: 1px solid $subtle-gray; &:active { - background-color: #eaeaea; + background-color: $subtle-gray; } } diff --git a/src/sass/views/bitpayCardIntro.scss b/src/sass/views/bitpayCardIntro.scss index 3ce232b0f..a70a73105 100644 --- a/src/sass/views/bitpayCardIntro.scss +++ b/src/sass/views/bitpayCardIntro.scss @@ -1,70 +1,55 @@ #bitpayCard-intro { - .slider-pager .slider-pager-page { - color: #fff; - } - .cta-button{ + background: url(../img/onboarding-welcome-bg.png), linear-gradient(to bottom, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); + background-position: top center; + background-size: contain; + background-repeat: no-repeat; + color: #fff; + .cta-button { text-align: center; position: absolute; bottom: 55px; padding: 0 1.5rem; width: 100%; } - background: rgba(30, 49, 134, 1); - background: -moz-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); - background: -webkit-gradient(left top, left bottom, color-stop(0%, rgba(30, 49, 134, 1)), color-stop(100%, rgba(17, 27, 73, 1))); - background: -webkit-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); - background: -o-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); - background: -ms-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); - background: linear-gradient(to bottom, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); color: #fff; height: 100%; .bar.bar-header { - background: rgb(30, 49, 134); - color: #fff; - button { - color: #fff; - } - .secondary-buttons { - button { - color: rgba(255, 255, 255, .5); - } - } + background: transparent none; + border: 0 none transparent; } .bar.bar-stable{ border-color: transparent; border:none; } - .button-transparent{ - background: none !important; - } - .button-translucent{ - background: rgba(215, 215, 215, 0.1) - } - .button-primary{ - background: rgb(100, 124, 232) !important; - color:#fff; - } - .light-blue{ - color:rgb(100, 124, 232); - } - .text-white{ - color: #ffffff; + .bitpayCard { + &__illustration { + padding: 2rem; + &__img { + width: 100%; + max-width: 400px; + } + } + &__info:before { + font-size: 22px; + line-height: 22px; + margin-top: 6px; + } } ion-content { - background: url(../img/onboarding-welcome-bg.png); - background-position: top center; - background-size: contain; - background-repeat: repeat-x; height: 100%; .scroll{ height: 100%; } - color: #fff; - p { - text-align: center; - margin: 40px 20px; - font-size: 1.2rem; - color: rgba(255, 255, 255, .5); - } + } + .slider__text { + text-align: center; + margin: 40px 20px; + font-size: 1rem; + color: rgba(255, 255, 255, .7); + } + .slider-pager .slider-pager-page { + color: $soft-blue; + font-size: 8px; + margin: 0; } } diff --git a/src/sass/views/includes/wallets.scss b/src/sass/views/includes/wallets.scss index eb855a9ca..677486c6b 100644 --- a/src/sass/views/includes/wallets.scss +++ b/src/sass/views/includes/wallets.scss @@ -28,6 +28,12 @@ margin-bottom:5px; font-size:13px; } + &.wallet-number{ + visibility: hidden; + } + &.visible{ + visibility: visible !important; + } } .big-icon-svg{ & > .bg{padding:.3rem;width: 40px;height:40px;} diff --git a/src/sass/views/integrations/glidera.scss b/src/sass/views/integrations/glidera.scss index 73ffef029..a9869cc87 100644 --- a/src/sass/views/integrations/glidera.scss +++ b/src/sass/views/integrations/glidera.scss @@ -1,12 +1,20 @@ #glidera { .glidera-lead { - margin: 1rem; + margin: 2rem 1rem; + color: $dark-gray; + font-size: 20px; + line-height: 1.4; + text-align: center; + } + .glidera-text { + margin: 2rem 1rem; color: $mid-gray; - font-size: 18px; + font-size: 16px; + line-height: 1.4; text-align: center; } .disclosure { - color: $mid-gray; + color: $light-gray; font-size: 12px; text-align: left; margin: 1rem; diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss index 8f087a9fc..3053f6eb6 100644 --- a/src/sass/views/tab-home.scss +++ b/src/sass/views/tab-home.scss @@ -16,16 +16,20 @@ background-image: url("../img/icon-amazon.svg"); } .bg { - &.wallet{ + &.wallet { padding: .25rem } } - .card{ + .card { .item { color: #444; border-top:none; - padding-bottom: 1.5rem; - padding-top:1.5rem; + padding-bottom: 1rem; + padding-top:1rem; + &.item-extra-padding { + padding-top: 1.5rem; + padding-bottom: 1.5rem; + } } .item-sub { &:first-child:before { @@ -85,4 +89,18 @@ color: #666; font-size: 38px; } + .tab-home { + &__logo { + height: 18px; + position: relative; + top: 3px; + } + &__wallet { + &__multisig-number { + font-size: .8rem; + font-weight: 300; + color: $light-gray; + } + } + } } diff --git a/src/sass/views/tab-send.scss b/src/sass/views/tab-send.scss index 75b7d770e..ccff2790f 100644 --- a/src/sass/views/tab-send.scss +++ b/src/sass/views/tab-send.scss @@ -12,7 +12,7 @@ padding-bottom: .5rem; @media(max-width: 480px) { input { - font-size: 12px; + font-size: 14px; } } .icon { diff --git a/src/sass/views/tab-settings.scss b/src/sass/views/tab-settings.scss index f28f773bf..f78b87286 100644 --- a/src/sass/views/tab-settings.scss +++ b/src/sass/views/tab-settings.scss @@ -47,11 +47,21 @@ color: $dark-gray; padding-top: 1.3rem; padding-bottom: 1.3rem; + &.has-setting-value { + padding-top: .65rem; + padding-bottom: .65rem; + } &.item-divider { color: $mid-gray; padding-bottom: .5rem; font-size: .9rem; } + .icon { + color: $light-gray; + } + } + .item-note { + color: $light-gray; } } } diff --git a/www/img/avatar.jpg b/www/img/avatar.jpg deleted file mode 100644 index a6ef1372e..000000000 Binary files a/www/img/avatar.jpg and /dev/null differ diff --git a/www/img/clipo-pin-enter.png b/www/img/clipo-pin-enter.png deleted file mode 100644 index 10af5f576..000000000 Binary files a/www/img/clipo-pin-enter.png and /dev/null differ diff --git a/www/img/clipo-pin.png b/www/img/clipo-pin.png deleted file mode 100644 index 77eb596c3..000000000 Binary files a/www/img/clipo-pin.png and /dev/null differ diff --git a/www/img/clipo-signin.png b/www/img/clipo-signin.png deleted file mode 100644 index 169e04022..000000000 Binary files a/www/img/clipo-signin.png and /dev/null differ diff --git a/www/img/clipo-signup1.png b/www/img/clipo-signup1.png deleted file mode 100644 index 546abf47e..000000000 Binary files a/www/img/clipo-signup1.png and /dev/null differ diff --git a/www/img/clipo-signup2-1.png b/www/img/clipo-signup2-1.png deleted file mode 100644 index 8cc3759d1..000000000 Binary files a/www/img/clipo-signup2-1.png and /dev/null differ diff --git a/www/img/clipo-signup2.png b/www/img/clipo-signup2.png deleted file mode 100644 index c536f02ba..000000000 Binary files a/www/img/clipo-signup2.png and /dev/null differ diff --git a/www/img/clipo-signup3.png b/www/img/clipo-signup3.png deleted file mode 100644 index 0a16191cd..000000000 Binary files a/www/img/clipo-signup3.png and /dev/null differ diff --git a/www/img/copay_crowdin.png b/www/img/copay_crowdin.png deleted file mode 100644 index 31695e998..000000000 Binary files a/www/img/copay_crowdin.png and /dev/null differ diff --git a/www/img/icon-about.svg b/www/img/icon-about.svg index a646153ca..609b76257 100644 --- a/www/img/icon-about.svg +++ b/www/img/icon-about.svg @@ -5,7 +5,7 @@ Created with sketchtool. - + @@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/www/img/icon-address-book.svg b/www/img/icon-address-book.svg index b9a5ff0d6..28c5e78f3 100644 --- a/www/img/icon-address-book.svg +++ b/www/img/icon-address-book.svg @@ -5,7 +5,7 @@ Created with sketchtool. - + @@ -17,4 +17,4 @@ - \ No newline at end of file + diff --git a/www/img/icon-advanced.svg b/www/img/icon-advanced.svg index 61e9403cb..215e4a5f8 100644 --- a/www/img/icon-advanced.svg +++ b/www/img/icon-advanced.svg @@ -5,7 +5,7 @@ Created with sketchtool. - + @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/www/img/icon-alternative-currency.svg b/www/img/icon-alternative-currency.svg index e882f2780..8d92a81b2 100644 --- a/www/img/icon-alternative-currency.svg +++ b/www/img/icon-alternative-currency.svg @@ -5,7 +5,7 @@ Created with sketchtool. - + @@ -19,4 +19,4 @@ - \ No newline at end of file + diff --git a/www/img/icon-chrome-128.png b/www/img/icon-chrome-128.png deleted file mode 100644 index 0044af9ca..000000000 Binary files a/www/img/icon-chrome-128.png and /dev/null differ diff --git a/www/img/icon-help-support.svg b/www/img/icon-help-support.svg index 6bcd372eb..49773850c 100644 --- a/www/img/icon-help-support.svg +++ b/www/img/icon-help-support.svg @@ -5,7 +5,7 @@ Created with sketchtool. - + @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/www/img/icon-network.svg b/www/img/icon-network.svg index fca2a763b..28de33dc3 100644 --- a/www/img/icon-network.svg +++ b/www/img/icon-network.svg @@ -5,7 +5,7 @@ Created with sketchtool. - + @@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/www/img/icon-splash.png b/www/img/icon-splash.png deleted file mode 100644 index f917a1d87..000000000 Binary files a/www/img/icon-splash.png and /dev/null differ diff --git a/www/img/icon-tour1.png b/www/img/icon-tour1.png deleted file mode 100644 index c715239b7..000000000 Binary files a/www/img/icon-tour1.png and /dev/null differ diff --git a/www/img/icon-unit.svg b/www/img/icon-unit.svg index 1990672ac..906e7deaf 100644 --- a/www/img/icon-unit.svg +++ b/www/img/icon-unit.svg @@ -1,14 +1,10 @@ - - 82D53068-08F3-45B0-B4C5-01E08714A956 - Created with sketchtool. - - + - \ No newline at end of file + diff --git a/www/img/img-tour1.png b/www/img/img-tour1.png deleted file mode 100644 index 298c6b7e9..000000000 Binary files a/www/img/img-tour1.png and /dev/null differ diff --git a/www/img/logo-negative.png b/www/img/logo-negative.png deleted file mode 100644 index 522d1420f..000000000 Binary files a/www/img/logo-negative.png and /dev/null differ diff --git a/www/img/logo.png b/www/img/logo.png deleted file mode 100644 index 01fe6c0bd..000000000 Binary files a/www/img/logo.png and /dev/null differ diff --git a/www/img/notification.png b/www/img/notification.png deleted file mode 100644 index 70b0843c0..000000000 Binary files a/www/img/notification.png and /dev/null differ diff --git a/www/img/qr.png b/www/img/qr.png deleted file mode 100644 index a5e5212b7..000000000 Binary files a/www/img/qr.png and /dev/null differ diff --git a/www/img/satoshi.gif b/www/img/satoshi.gif deleted file mode 100644 index 0e5292df5..000000000 Binary files a/www/img/satoshi.gif and /dev/null differ diff --git a/www/img/step-1.png b/www/img/step-1.png deleted file mode 100644 index 43b2109d4..000000000 Binary files a/www/img/step-1.png and /dev/null differ diff --git a/www/img/step-1.svg b/www/img/step-1.svg deleted file mode 100644 index 50fc10493..000000000 --- a/www/img/step-1.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - Group@1x - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/www/img/step-2.png b/www/img/step-2.png deleted file mode 100644 index 3a2844f63..000000000 Binary files a/www/img/step-2.png and /dev/null differ diff --git a/www/img/step-2.svg b/www/img/step-2.svg deleted file mode 100644 index 9a3cec072..000000000 --- a/www/img/step-2.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - Group - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/www/img/step-3.png b/www/img/step-3.png deleted file mode 100644 index 9a8c9493d..000000000 Binary files a/www/img/step-3.png and /dev/null differ diff --git a/www/img/step-3.svg b/www/img/step-3.svg deleted file mode 100644 index e6b50d55b..000000000 --- a/www/img/step-3.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - Group - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/www/img/tour1.png b/www/img/tour1.png deleted file mode 100644 index 35fcdeace..000000000 Binary files a/www/img/tour1.png and /dev/null differ diff --git a/www/img/tour2.png b/www/img/tour2.png deleted file mode 100644 index c4f6d9c71..000000000 Binary files a/www/img/tour2.png and /dev/null differ diff --git a/www/img/tour3.png b/www/img/tour3.png deleted file mode 100644 index 49ccce917..000000000 Binary files a/www/img/tour3.png and /dev/null differ diff --git a/www/img/tour4.png b/www/img/tour4.png deleted file mode 100644 index abf73c671..000000000 Binary files a/www/img/tour4.png and /dev/null differ diff --git a/www/img/tour5.png b/www/img/tour5.png deleted file mode 100644 index 70cf157ed..000000000 Binary files a/www/img/tour5.png and /dev/null differ diff --git a/www/views/add.html b/www/views/add.html index 9c64d3594..999adf042 100644 --- a/www/views/add.html +++ b/www/views/add.html @@ -11,7 +11,7 @@ - New Personal Wallet + New personal wallet @@ -19,7 +19,7 @@ - Create Shared Wallet + Create shared wallet diff --git a/www/views/amount.html b/www/views/amount.html index 11614da7a..f7ac13a7e 100644 --- a/www/views/amount.html +++ b/www/views/amount.html @@ -10,7 +10,7 @@
-
Recipient
+
Recipient
@@ -30,17 +30,21 @@
Amount
- {{alternativeIsoCode}} - {{unitName}}
-
{{amount || "0.00" }}
-
- {{globalResult}} {{amountResult || '0.00'}} {{alternativeIsoCode}} +
+ {{amount || "0.00" }} + {{alternativeIsoCode}} + {{unitName}}
-
- {{globalResult}} {{alternativeResult || '0.00'}} {{unitName}} +
+
{{globalResult}} {{unitName}}
+
≈ {{amountResult || '0.00'}} {{alternativeIsoCode}}
+
+
+
{{globalResult}} {{alternativeIsoCode}}
+
{{alternativeResult || '0.00'}} {{unitName}}
@@ -56,28 +60,28 @@
7
8
9
-
/
+
÷
4
5
6
-
x
+
×
1
2
3
-
+
+
+
.
0
-
-
+
−
diff --git a/www/views/bitpayCard.html b/www/views/bitpayCard.html index 1a19424cc..b187f2412 100644 --- a/www/views/bitpayCard.html +++ b/www/views/bitpayCard.html @@ -2,7 +2,7 @@ - BitPay Visa® Card + BitPay Visa® Card -
- +
+
-

- Turn bitcoin into dollars, swipe anywhere Visa® is accepted. +

+ Turn bitcoin into dollars, swipe anywhere Visa® is accepted.

-

- Get local cash anywhere you go, from any Visa®-compatible ATM. -

- *ATM bank fees may apply -
+

+ Get local cash anywhere you go, from any Visa® compatible ATM. ATM bank fees may apply.

-

+

Pay 0% fees to turn bitcoin into dollars.

- -
diff --git a/www/views/buyAmazon.html b/www/views/buyAmazon.html index 88cb917b0..69ac4b790 100644 --- a/www/views/buyAmazon.html +++ b/www/views/buyAmazon.html @@ -104,7 +104,7 @@ Claim code: {{buy.giftCard.claimCode}}
- diff --git a/www/views/confirm.html b/www/views/confirm.html index dd04bdf87..322f1ec5c 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -20,6 +20,11 @@
+
+ Payment Expires: + {{remainingTimeStr.value}} + Expired +
To @@ -85,8 +90,7 @@ + slide-success-hide-on-confirm="true"> Payment Sent Proposal Created @@ -95,8 +99,7 @@ wallet-selector-wallets="wallets" wallet-selector-selected-wallet="wallet" wallet-selector-show="showWallets" - wallet-selector-on-select="onWalletSelect" - > + wallet-selector-on-select="onWalletSelect"> diff --git a/www/views/glidera.html b/www/views/glidera.html index 1769f907e..83f6ad717 100644 --- a/www/views/glidera.html +++ b/www/views/glidera.html @@ -28,31 +28,26 @@

You can buy and sell Bitcoin with a US bank account directly in this app.

+ +

Connect your Glidera account to get started.

-

- DISCLOSURE.
- 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 bitcoins. Service available in U.S. and Canada only. In U.S. (buy & sell) CA, GA, IL, KS, - MA, MD, MO, MT, MN, SC, TX, AZ, CO, DE, ME, NJ, PA, TN, UT, NV, WI. In Canada (buy & sell) AB, BC, MB, NB, NL, NS, NT, NU, - ON, PE, SK, YT. -

- -

Connect your Glidera account to get started

- - Do you already have the Oauth Code? + + Have the OAuth Code?
+
+

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.

+
-
-
+ +
-
-
- -
-
- -
-
+
diff --git a/www/views/includes/wallets.html b/www/views/includes/wallets.html index 0b0deb799..7f6fc73e8 100644 --- a/www/views/includes/wallets.html +++ b/www/views/includes/wallets.html @@ -10,7 +10,7 @@ {{wallet.status.availableBalanceStr}} - + {{wallet.m}}-of-{{wallet.n}}
diff --git a/www/views/modals/terms.html b/www/views/modals/terms.html index bef4b3ddf..f823870b0 100644 --- a/www/views/modals/terms.html +++ b/www/views/modals/terms.html @@ -23,7 +23,7 @@
- +
diff --git a/www/views/preferences.html b/www/views/preferences.html index 54e38ccd2..81fb6a19a 100644 --- a/www/views/preferences.html +++ b/www/views/preferences.html @@ -29,7 +29,7 @@ - + Email Notifications Disabled diff --git a/www/views/preferencesAlias.html b/www/views/preferencesAlias.html index 292842c33..c34f241c6 100644 --- a/www/views/preferencesAlias.html +++ b/www/views/preferencesAlias.html @@ -20,7 +20,7 @@ diff --git a/www/views/tab-export-file.html b/www/views/tab-export-file.html index 555588a56..931257b83 100644 --- a/www/views/tab-export-file.html +++ b/www/views/tab-export-file.html @@ -37,7 +37,7 @@ -
+
diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 9eb0f995f..c0e008a50 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -1,9 +1,9 @@ - {{'Home' | translate}} + - + {{wallet.name || wallet.id}} - - {{wallet.m}}-of-{{wallet.n}} -

@@ -85,6 +82,9 @@ {{wallet.status.availableBalanceStr}} [Balance Hidden] + + {{wallet.m}}-of-{{wallet.n}} +  

@@ -94,21 +94,21 @@ + class="item item-sub item-icon-left item-big-icon-left item-icon-right">
-

BitPay Visa® Card

+ BitPay Visa® Card

{{cardsHistory[card.id].balance ? '$' + cardsHistory[card.id].balance : 'Add funds to get started'|translate}}

 + class="item item-sub item-icon-left item-big-icon-left item-icon-right">
-

BitPay Visa® Card

+ BitPay Visa® Card

Add your card

 @@ -120,14 +120,16 @@ Buy & Sell Bitcoin
- - - - - - +
+ + + + + + +
@@ -148,7 +150,7 @@