From 2c33f186af2f439c04dfb4cc431433a848aa3966 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Sun, 27 Aug 2017 23:50:27 -0300 Subject: [PATCH] Ref chain to coin. Adds create wallet --- src/js/controllers/addresses.js | 7 +------ src/js/controllers/amount.js | 16 ++++++++-------- src/js/controllers/buyAmazon.js | 2 +- src/js/controllers/buyCoinbase.js | 4 ++-- src/js/controllers/buyGlidera.js | 4 ++-- src/js/controllers/buyMercadoLibre.js | 2 +- src/js/controllers/confirm.js | 8 ++++---- src/js/controllers/customAmount.js | 6 +++--- src/js/controllers/sellCoinbase.js | 4 ++-- src/js/controllers/sellGlidera.js | 4 ++-- src/js/controllers/tab-receive.js | 2 +- src/js/controllers/topup.js | 2 +- src/js/routes.js | 23 ++++++++++++++--------- src/js/services/feeService.js | 4 ++-- src/js/services/incomingData.js | 12 ++++++------ src/js/services/profileService.js | 11 ++++++----- src/js/services/txFormatService.js | 6 +++--- src/js/services/walletService.js | 16 ++++++++-------- www/views/amount.html | 6 +++--- www/views/buyAmazon.html | 2 +- www/views/buyCoinbase.html | 2 +- www/views/buyGlidera.html | 2 +- www/views/buyMercadoLibre.html | 2 +- www/views/confirm.html | 2 +- www/views/customAmount.html | 4 ++-- www/views/includes/walletItem.html | 2 +- www/views/includes/walletSelector.html | 2 +- www/views/modals/txp-details.html | 2 +- www/views/paperWallet.html | 2 +- www/views/sellCoinbase.html | 2 +- www/views/sellGlidera.html | 2 +- www/views/tab-home.html | 2 +- www/views/tab-receive.html | 2 +- www/views/tab-send.html | 2 +- www/views/tab-settings.html | 2 +- www/views/topup.html | 4 ++-- www/views/tx-details.html | 2 +- 37 files changed, 90 insertions(+), 89 deletions(-) diff --git a/src/js/controllers/addresses.js b/src/js/controllers/addresses.js index 3bc0b4fea..97cca45e1 100644 --- a/src/js/controllers/addresses.js +++ b/src/js/controllers/addresses.js @@ -1,13 +1,8 @@ 'use strict'; -angular.module('copayApp.controllers').controller('addressesController', function($scope, $log, $stateParams, $state, $timeout, $ionicHistory, $ionicScrollDelegate, configService, popupService, gettextCatalog, ongoingProcess, lodash, profileService, walletService, bwcError, platformInfo, appConfigService, txFormatService, feeService) { +angular.module('copayApp.controllers').controller('addressesController', function($scope, $log, $stateParams, $state, $timeout, $ionicHistory, $ionicScrollDelegate, popupService, gettextCatalog, ongoingProcess, lodash, profileService, walletService, bwcError, platformInfo, appConfigService, txFormatService, feeService) { var UNUSED_ADDRESS_LIMIT = 5; var BALANCE_ADDRESS_LIMIT = 5; - var config = configService.getSync().wallet.settings; - var unitName = config.unitName; - var unitToSatoshi = config.unitToSatoshi; - var satToUnit = 1 / unitToSatoshi; - var unitDecimals = config.unitDecimals; var withBalance, cachedWallet; $scope.isCordova = platformInfo.isCordova; diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index 55c101024..03e9743af 100644 --- a/src/js/controllers/amount.js +++ b/src/js/controllers/amount.js @@ -21,8 +21,8 @@ angular.module('copayApp.controllers').controller('amountController', function($ $scope.nextStep = data.stateParams.nextStep; $scope.currency = data.stateParams.currency; $scope.forceCurrency = data.stateParams.forceCurrency; - $scope.forceChain = data.stateParams.forceChain || null; - $scope.chain = $scope.forceChain || data.stateParams.chain || 'BTC'; + $scope.forceCoin = data.stateParams.forceCoin; + $scope.coin = data.stateParams.coin || 'btc'; $scope.showMenu = $ionicHistory.backView() && ($ionicHistory.backView().stateName == 'tabs.send' || $ionicHistory.backView().stateName == 'tabs.bitpayCard'); @@ -125,10 +125,10 @@ angular.module('copayApp.controllers').controller('amountController', function($ } }; - $scope.toggleChain = function() { - if ($scope.forceCurrency || $scope.forceChain) return; + $scope.toggleCoin = function() { + if ($scope.forceCurrency || $scope.forceCoin) return; - $scope.chain = $scope.chain == 'BTC' ? 'BCH' : 'BTC'; + $scope.coin = $scope.coin == 'btc' ? 'bch' : 'btc'; }; function checkFontSize() { @@ -234,8 +234,8 @@ angular.module('copayApp.controllers').controller('amountController', function($ $state.transitionTo($scope.nextStep, { id: _id, amount: $scope.useSendMax ? null : _amount, - currency: $scope.showAlternativeAmount ? $scope.alternativeIsoCode : $scope.chain, - chain: $scope.chain, + currency: $scope.showAlternativeAmount ? $scope.alternativeIsoCode : $scope.coin, + coin: $scope.coin, useSendMax: $scope.useSendMax }); } else { @@ -247,7 +247,7 @@ angular.module('copayApp.controllers').controller('amountController', function($ toName: $scope.toName, toEmail: $scope.toEmail, toColor: $scope.toColor, - chain: $scope.chain, + coin: $scope.coin, useSendMax: $scope.useSendMax }); } diff --git a/src/js/controllers/buyAmazon.js b/src/js/controllers/buyAmazon.js index e2418e80e..ee3732e95 100644 --- a/src/js/controllers/buyAmazon.js +++ b/src/js/controllers/buyAmazon.js @@ -293,7 +293,7 @@ angular.module('copayApp.controllers').controller('buyAmazonController', functio onlyComplete: true, network: $scope.network, hasFunds: true, - chain: 'BTC' + coin: 'btc' }); if (lodash.isEmpty($scope.wallets)) { showErrorAndBack(null, gettextCatalog.getString('No wallets available')); diff --git a/src/js/controllers/buyCoinbase.js b/src/js/controllers/buyCoinbase.js index 57d9db779..d9690f058 100644 --- a/src/js/controllers/buyCoinbase.js +++ b/src/js/controllers/buyCoinbase.js @@ -88,7 +88,7 @@ angular.module('copayApp.controllers').controller('buyCoinbaseController', funct }); $scope.$on("$ionicView.beforeEnter", function(event, data) { - $scope.isFiat = data.stateParams.currency != 'BCH' && data.stateParams.currency != 'BTC' ? true : false; + $scope.isFiat = data.stateParams.currency != 'BTC' ? true : false; amount = data.stateParams.amount; currency = data.stateParams.currency; @@ -96,7 +96,7 @@ angular.module('copayApp.controllers').controller('buyCoinbaseController', funct $scope.wallets = profileService.getWallets({ onlyComplete: true, network: $scope.network, - chain: 'BTC' + coin: 'btc' }); if (lodash.isEmpty($scope.wallets)) { diff --git a/src/js/controllers/buyGlidera.js b/src/js/controllers/buyGlidera.js index 3b0ef1265..536dbc1e8 100644 --- a/src/js/controllers/buyGlidera.js +++ b/src/js/controllers/buyGlidera.js @@ -70,7 +70,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController', functi }); $scope.$on("$ionicView.beforeEnter", function(event, data) { - $scope.isFiat = data.stateParams.currency != 'BCH' && data.stateParams.currency != 'BTC' ? true : false; + $scope.isFiat = data.stateParams.currency != 'BTC' ? true : false; amount = data.stateParams.amount; currency = data.stateParams.currency; @@ -78,7 +78,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController', functi $scope.wallets = profileService.getWallets({ onlyComplete: true, network: $scope.network, - chain: 'BTC' + coin: 'btc' }); if (lodash.isEmpty($scope.wallets)) { diff --git a/src/js/controllers/buyMercadoLibre.js b/src/js/controllers/buyMercadoLibre.js index a89a38d83..153a715d5 100644 --- a/src/js/controllers/buyMercadoLibre.js +++ b/src/js/controllers/buyMercadoLibre.js @@ -285,7 +285,7 @@ angular.module('copayApp.controllers').controller('buyMercadoLibreController', f $scope.wallets = profileService.getWallets({ onlyComplete: true, network: $scope.network, - chain: 'BTC' + coin: 'btc' }); if (lodash.isEmpty($scope.wallets)) { showErrorAndBack(null, gettextCatalog.getString('No wallets available')); diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 9b7a87df9..e2065ebb2 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -69,7 +69,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.$on("$ionicView.beforeEnter", function(event, data) { - function setWalletSelector(chain, network, minAmount, cb) { + function setWalletSelector(coin, network, minAmount, cb) { // no min amount? (sendMax) => look for no empty wallets minAmount = minAmount || 1; @@ -77,7 +77,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.wallets = profileService.getWallets({ onlyComplete: true, network: network, - chain: chain + coin: coin }); if (!$scope.wallets || !$scope.wallets.length) { @@ -138,7 +138,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( toEmail: data.stateParams.toEmail, toColor: data.stateParams.toColor, network: (new bitcore.Address(data.stateParams.toAddress)).network.name, - chain: data.stateParams.chain, + coin: data.stateParams.coin, txp: {}, }; @@ -151,7 +151,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.walletSelectorTitle = gettextCatalog.getString('Send from'); - setWalletSelector(tx.chain, tx.network, tx.toAmount, function(err) { + setWalletSelector(tx.coin, tx.network, tx.toAmount, function(err) { if (err) { return exitWithError('Could not update wallets'); } diff --git a/src/js/controllers/customAmount.js b/src/js/controllers/customAmount.js index 093edd568..4fa97ed18 100644 --- a/src/js/controllers/customAmount.js +++ b/src/js/controllers/customAmount.js @@ -28,7 +28,7 @@ angular.module('copayApp.controllers').controller('customAmountController', func $scope.address = addr; - $scope.chain = (data.stateParams.chain).toLowerCase(); + $scope.coin = (data.stateParams.coin).toLowerCase(); var parsedAmount = txFormatService.parseAmount( $scope.wallet, data.stateParams.amount, @@ -43,7 +43,7 @@ angular.module('copayApp.controllers').controller('customAmountController', func // Convert to BTC or BCH var config = configService.getSync().wallet.settings; var amountUnit = txFormatService.satToUnit(parsedAmount.amountSat); - var btcParsedAmount = txFormatService.parseAmount($scope.wallet, amountUnit, $scope.wallet.chain); + var btcParsedAmount = txFormatService.parseAmount($scope.wallet, amountUnit, $scope.wallet.coin); $scope.amountBtc = btcParsedAmount.amount; $scope.altAmountStr = btcParsedAmount.amountUnitStr; @@ -68,7 +68,7 @@ angular.module('copayApp.controllers').controller('customAmountController', func } $scope.copyToClipboard = function() { - return 'bitcoin:' + $scope.address + '?amount=' + $scope.amountBtc + '&chain=' + $scope.chain; + return 'bitcoin:' + $scope.address + '?amount=' + $scope.amountBtc + '&coin=' + $scope.coin; }; }); diff --git a/src/js/controllers/sellCoinbase.js b/src/js/controllers/sellCoinbase.js index 3bee99602..624748f7c 100644 --- a/src/js/controllers/sellCoinbase.js +++ b/src/js/controllers/sellCoinbase.js @@ -170,7 +170,7 @@ angular.module('copayApp.controllers').controller('sellCoinbaseController', func }); $scope.$on("$ionicView.beforeEnter", function(event, data) { - $scope.isFiat = data.stateParams.currency != 'BCH' && data.stateParams.currency != 'BTC' ? true : false; + $scope.isFiat = data.stateParams.currency != 'BTC' ? true : false; amount = data.stateParams.amount; currency = data.stateParams.currency; @@ -183,7 +183,7 @@ angular.module('copayApp.controllers').controller('sellCoinbaseController', func onlyComplete: true, network: $scope.network, hasFunds: true, - chain: 'BTC' + coin: 'btc' }); if (lodash.isEmpty($scope.wallets)) { diff --git a/src/js/controllers/sellGlidera.js b/src/js/controllers/sellGlidera.js index 0978590c7..bf5db0f7a 100644 --- a/src/js/controllers/sellGlidera.js +++ b/src/js/controllers/sellGlidera.js @@ -70,7 +70,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController', funct }); $scope.$on("$ionicView.beforeEnter", function(event, data) { - $scope.isFiat = data.stateParams.currency != 'BCH' && data.stateParams.currency != 'BTC' ? true : false; + $scope.isFiat = data.stateParams.currency != 'BTC' ? true : false; amount = data.stateParams.amount; currency = data.stateParams.currency; @@ -80,7 +80,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController', funct onlyComplete: true, network: $scope.network, hasFunds: true, - chain: 'BTC' + coin: 'btc' }); if (lodash.isEmpty($scope.wallets)) { diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index 5bd61c70b..43785ab8b 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -9,7 +9,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi $scope.requestSpecificAmount = function() { $state.go('tabs.paymentRequest.amount', { id: $scope.wallet.credentials.walletId, - forceChain: $scope.wallet.chain + coin: $scope.wallet.coin }); }; diff --git a/src/js/controllers/topup.js b/src/js/controllers/topup.js index d5959e545..d72ad8e2a 100644 --- a/src/js/controllers/topup.js +++ b/src/js/controllers/topup.js @@ -257,7 +257,7 @@ angular.module('copayApp.controllers').controller('topUpController', function($s onlyComplete: true, network: bitpayService.getEnvironment().network, hasFunds: true, - chain: 'BTC' + coin: 'btc' }); if (lodash.isEmpty($scope.wallets)) { diff --git a/src/js/routes.js b/src/js/routes.js index 2726a697d..e8beece45 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -287,7 +287,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr */ .state('tabs.send.amount', { - url: '/amount/:recipientType/:toAddress/:toName/:toEmail/:toColor/:chain', + url: '/amount/:recipientType/:toAddress/:toName/:toEmail/:toColor/:coin', views: { 'tab-send@tabs': { controller: 'amountController', @@ -296,7 +296,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('tabs.send.confirm', { - url: '/confirm/:recipientType/:toAddress/:toName/:toAmount/:toEmail/:toColor/:description/:chain/:useSendMax', + url: '/confirm/:recipientType/:toAddress/:toName/:toAmount/:toEmail/:toColor/:description/:coin/:useSendMax', views: { 'tab-send@tabs': { controller: 'confirmController', @@ -672,7 +672,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) .state('tabs.paymentRequest.amount', { - url: '/amount/:forceChain', + url: '/amount/:coin', views: { 'tab-receive@tabs': { controller: 'amountController', @@ -681,7 +681,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('tabs.paymentRequest.confirm', { - url: '/confirm/:amount/:currency/:chain', + url: '/confirm/:amount/:currency/:coin', views: { 'tab-receive@tabs': { controller: 'customAmountController', @@ -916,7 +916,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }, params: { - forceChain: 'BTC' + coin: 'btc', + forceCoin: true } }) .state('tabs.buyandsell.glidera.amount', { @@ -972,7 +973,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }, params: { - forceChain: 'BTC' + coin: 'btc', + forceCoin: true } }) .state('tabs.preferences.coinbase', { @@ -1062,7 +1064,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr nextStep: 'tabs.giftcards.mercadoLibre.buy', currency: 'BRL', forceCurrency: true, - forceChain: 'BTC' + coin: 'btc', + forceCoin: true } }) .state('tabs.giftcards.mercadoLibre.buy', { @@ -1114,7 +1117,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr nextStep: 'tabs.giftcards.amazon.buy', currency: 'USD', forceCurrency: true, - forceChain: 'BTC' + coin: 'btc', + forceCoin: true } }) .state('tabs.giftcards.amazon.buy', { @@ -1154,7 +1158,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr params: { id: null, currency: 'USD', - forceChain: 'BTC', + coin: 'btc', + forceCoin: true, useSendMax: null } }) diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js index 852c0cf31..e827cac1b 100644 --- a/src/js/services/feeService.js +++ b/src/js/services/feeService.js @@ -65,8 +65,8 @@ angular.module('copayApp.services').factory('feeService', function($log, $timeou var walletClient = bwcService.getClient(); - walletClient.getFeeLevels('livenet', function(errLivenet, levelsLivenet) { - walletClient.getFeeLevels('testnet', function(errTestnet, levelsTestnet) { + walletClient.getFeeLevels('btc', 'livenet', function(errLivenet, levelsLivenet) { + walletClient.getFeeLevels('btc', 'testnet', function(errTestnet, levelsTestnet) { if (errLivenet || errTestnet) { return cb(gettextCatalog.getString('Could not get dynamic fee')); } diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js index ac1274577..48f037c7a 100644 --- a/src/js/services/incomingData.js +++ b/src/js/services/incomingData.js @@ -46,7 +46,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat return true; } - function goSend(addr, amount, message, chain) { + function goSend(addr, amount, message, coin) { $state.go('tabs.send', {}, { 'reload': true, 'notify': $state.current.name == 'tabs.send' ? false : true @@ -58,12 +58,12 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat toAmount: amount, toAddress: addr, description: message, - chain: chain + coin: coin }); } else { $state.transitionTo('tabs.send.amount', { toAddress: addr, - chain: chain + coin: coin }); } }, 100); @@ -92,17 +92,17 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat var message = parsed.message; var amount = parsed.amount ? parsed.amount : ''; - var chain = parsed.extras && parsed.extras.chain ? (parsed.extras.chain).toUpperCase() : ''; + var coin = parsed.extras && parsed.extras.coin ? (parsed.extras.coin).toUpperCase() : ''; if (parsed.r) { payproService.getPayProDetails(parsed.r, function(err, details) { if (err) { - if (addr && amount) goSend(addr, amount, message, chain); + if (addr && amount) goSend(addr, amount, message, coin); else popupService.showAlert(gettextCatalog.getString('Error'), err); } else handlePayPro(details); }); } else { - goSend(addr, amount, message, chain); + goSend(addr, amount, message, coin); } return true; diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index cb7aa4eb7..bbba03cf6 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -89,10 +89,11 @@ angular.module('copayApp.services') wallet.copayerId = wallet.credentials.copayerId; wallet.m = wallet.credentials.m; wallet.n = wallet.credentials.n; - wallet.chain = wallet.credentials.chain ? (wallet.credentials.chain).toUpperCase() : 'BTC'; + wallet.coin = wallet.credentials.coin ? wallet.credentials.coin : 'btc'; +console.log('[profileService.js:92]',wallet); //TODO/ - // TODO: Should return "chain" = "BTC" or "BCH" - client.credentials.chain = 'BTC'; + // TODO: Should return "coin" = "btc" or "bch" + //client.credentials.coin = 'btc'; root.updateWalletSettings(wallet); root.wallet[walletId] = wallet; @@ -756,9 +757,9 @@ angular.module('copayApp.services') var ret = lodash.values(root.wallet); - if (opts.chain) { + if (opts.coin) { ret = lodash.filter(ret, function(x) { - return (x.credentials.chain == opts.chain); + return (x.credentials.coin == opts.coin); }); } diff --git a/src/js/services/txFormatService.js b/src/js/services/txFormatService.js index d0be0de6f..428286d1a 100644 --- a/src/js/services/txFormatService.js +++ b/src/js/services/txFormatService.js @@ -19,7 +19,7 @@ angular.module('copayApp.services').factory('txFormatService', function($filter, root.formatAmountStr = function(wallet, satoshis) { if (isNaN(satoshis)) return; - return root.formatAmount(satoshis) + ' ' + wallet.chain; + return root.formatAmount(satoshis) + ' ' + wallet.coin; }; root.toFiat = function(satoshis, code, cb) { @@ -196,13 +196,13 @@ angular.module('copayApp.services').factory('txFormatService', function($filter, amountUnitStr = root.formatAmountStr(wallet, amountSat); // convert sat to BTC or BCH amount = (amountSat * satToBtc).toFixed(8); - currency = wallet.chain; + currency = (wallet.coin).toUpperCase(); } else { amountSat = parseInt((amount * unitToSatoshi).toFixed(0)); amountUnitStr = root.formatAmountStr(wallet, amountSat); // convert unit to BTC or BCH amount = (amountSat * satToBtc).toFixed(8); - currency = wallet.chain; + currency = (wallet.coin).toUpperCase(); } return { diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index e90aa1a1d..496765ea9 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -215,11 +215,11 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim cache.satToUnit = 1 / cache.unitToSatoshi; //STR - cache.totalBalanceStr = txFormatService.formatAmount(cache.totalBalanceSat) + ' ' + wallet.chain; - cache.lockedBalanceStr = txFormatService.formatAmount(cache.lockedBalanceSat) + ' ' + wallet.chain; - cache.availableBalanceStr = txFormatService.formatAmount(cache.availableBalanceSat) + ' ' + wallet.chain; - cache.spendableBalanceStr = txFormatService.formatAmount(cache.spendableAmount) + ' ' + wallet.chain; - cache.pendingBalanceStr = txFormatService.formatAmount(cache.pendingAmount) + ' ' + wallet.chain; + cache.totalBalanceStr = txFormatService.formatAmount(cache.totalBalanceSat) + ' ' + wallet.coin; + cache.lockedBalanceStr = txFormatService.formatAmount(cache.lockedBalanceSat) + ' ' + wallet.coin; + cache.availableBalanceStr = txFormatService.formatAmount(cache.availableBalanceSat) + ' ' + wallet.coin; + cache.spendableBalanceStr = txFormatService.formatAmount(cache.spendableAmount) + ' ' + wallet.coin; + cache.pendingBalanceStr = txFormatService.formatAmount(cache.pendingAmount) + ' ' + wallet.coin; cache.alternativeName = config.settings.alternativeName; cache.alternativeIsoCode = config.settings.alternativeIsoCode; @@ -412,12 +412,12 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim var fixTxsUnit = function(txs) { if (!txs || !txs[0] || !txs[0].amountStr) return; - var cacheChain = txs[0].amountStr.split(' ')[1]; + var cacheCoin = txs[0].amountStr.split(' ')[1]; - if (cacheChain == wallet.chain) + if (cacheCoin == wallet.coin) return; - $log.debug('Fixing Tx Cache Unit to: ' + wallet.chain) + $log.debug('Fixing Tx Cache Unit to: ' + wallet.coin) lodash.each(txs, function(tx) { tx.amountStr = txFormatService.formatAmountStr(wallet, tx.amount); tx.feeStr = txFormatService.formatAmountStr(wallet, tx.fees); diff --git a/www/views/amount.html b/www/views/amount.html index b3b4b0cfd..4f37414ca 100644 --- a/www/views/amount.html +++ b/www/views/amount.html @@ -49,18 +49,18 @@
{{amount || "0.00" }} {{alternativeIsoCode}} - {{chain}} + {{coin}}
-
{{globalResult}} {{chain}}
+
{{globalResult}} {{coin}}
≈ {{amountResult || '0.00'}} {{alternativeIsoCode}}
{{globalResult}} {{alternativeIsoCode}}
-
{{alternativeResult || '0.00'}} {{chain}}
+
{{alternativeResult || '0.00'}} {{coin}}
diff --git a/www/views/buyAmazon.html b/www/views/buyAmazon.html index 704f29167..3ea4d78c6 100644 --- a/www/views/buyAmazon.html +++ b/www/views/buyAmazon.html @@ -29,7 +29,7 @@
From
- + {{wallet ? wallet.name : '...'}}
diff --git a/www/views/buyCoinbase.html b/www/views/buyCoinbase.html index 013d9b053..fe1371ce9 100644 --- a/www/views/buyCoinbase.html +++ b/www/views/buyCoinbase.html @@ -38,7 +38,7 @@
Receive in
- + {{wallet ? wallet.name : '...'}}
diff --git a/www/views/buyGlidera.html b/www/views/buyGlidera.html index 1acbbedea..5f1168996 100644 --- a/www/views/buyGlidera.html +++ b/www/views/buyGlidera.html @@ -30,7 +30,7 @@
Receive in
- + {{wallet ? wallet.name : '...'}}
diff --git a/www/views/buyMercadoLibre.html b/www/views/buyMercadoLibre.html index a4ff67c90..322259a01 100644 --- a/www/views/buyMercadoLibre.html +++ b/www/views/buyMercadoLibre.html @@ -28,7 +28,7 @@
From
- + {{wallet ? wallet.name : '...'}}
diff --git a/www/views/confirm.html b/www/views/confirm.html index 831d3182c..3622398a1 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -65,7 +65,7 @@ From
- +
{{wallet.name}}
diff --git a/www/views/customAmount.html b/www/views/customAmount.html index 95c4bd0fb..c05c8d704 100644 --- a/www/views/customAmount.html +++ b/www/views/customAmount.html @@ -21,7 +21,7 @@
- +
@@ -39,7 +39,7 @@
- + {{wallet.name}}
diff --git a/www/views/includes/walletItem.html b/www/views/includes/walletItem.html index c44abef1c..1d5ba209e 100644 --- a/www/views/includes/walletItem.html +++ b/www/views/includes/walletItem.html @@ -1,6 +1,6 @@
- +
{{wallet.name || wallet.id}} diff --git a/www/views/includes/walletSelector.html b/www/views/includes/walletSelector.html index add64d0cd..3fa8860f1 100644 --- a/www/views/includes/walletSelector.html +++ b/www/views/includes/walletSelector.html @@ -7,7 +7,7 @@ ng-click="selectWallet(w)" > - +
diff --git a/www/views/modals/txp-details.html b/www/views/modals/txp-details.html index beb122b9d..c5e2aea91 100644 --- a/www/views/modals/txp-details.html +++ b/www/views/modals/txp-details.html @@ -74,7 +74,7 @@ From
- +
{{wallet.name}}
diff --git a/www/views/paperWallet.html b/www/views/paperWallet.html index 904cb5b6c..d92aba85e 100644 --- a/www/views/paperWallet.html +++ b/www/views/paperWallet.html @@ -24,7 +24,7 @@
- + {{wallet.name || wallet.id}} diff --git a/www/views/sellCoinbase.html b/www/views/sellCoinbase.html index 6972c5f98..ae715ebe4 100644 --- a/www/views/sellCoinbase.html +++ b/www/views/sellCoinbase.html @@ -29,7 +29,7 @@
From
- + {{wallet ? wallet.name : '...'}}
diff --git a/www/views/sellGlidera.html b/www/views/sellGlidera.html index ee6e262c9..e3ac25c31 100644 --- a/www/views/sellGlidera.html +++ b/www/views/sellGlidera.html @@ -30,7 +30,7 @@
From
- + {{wallet ? wallet.name : '...'}}
diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 7ffcb5629..1a30620da 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -81,7 +81,7 @@ class="item item-sub item-icon-left item-big-icon-left item-icon-right wallet" ng-click="openWallet(wallet)"> - + {{wallet.name || wallet.id}} diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index c78317451..95c35b8de 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -63,7 +63,7 @@
- + {{wallet.name || wallet.id}} diff --git a/www/views/tab-send.html b/www/views/tab-send.html index 8b1e0c3eb..23ef00e62 100644 --- a/www/views/tab-send.html +++ b/www/views/tab-send.html @@ -69,7 +69,7 @@
- + {{item.name}} diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index e6b3f0ad8..f5768dfd2 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -95,7 +95,7 @@ ui-sref="tabs.preferences({'walletId': item.id})" ng-repeat="item in wallets track by $index"> - + {{item.name || item.id}} diff --git a/www/views/topup.html b/www/views/topup.html index a9329ba94..2290359f6 100644 --- a/www/views/topup.html +++ b/www/views/topup.html @@ -31,10 +31,10 @@
-
From {{wallet.chain}}
+
From {{wallet.coin}}
- + {{wallet ? wallet.name : '...'}}
diff --git a/www/views/tx-details.html b/www/views/tx-details.html index 3e281b8bf..be97b37eb 100644 --- a/www/views/tx-details.html +++ b/www/views/tx-details.html @@ -53,7 +53,7 @@ To
- +
{{wallet.name}}