diff --git a/src/js/controllers/wallet-selector.controller.js b/src/js/controllers/wallet-selector.controller.js
index 06e6179da..036727333 100644
--- a/src/js/controllers/wallet-selector.controller.js
+++ b/src/js/controllers/wallet-selector.controller.js
@@ -1,189 +1,204 @@
'use strict';
-angular.module('copayApp.controllers').controller('walletSelectorController', function($scope, $state, sendFlowService, configService, gettextCatalog, profileService, txFormatService) {
+(function () {
- var fromWalletId = '';
- var priceDisplayAsFiat = false;
- var unitDecimals = 0;
- var unitsFromSatoshis = 0;
+angular
+ .module('copayApp.controllers')
+ .controller('walletSelectorController', walletSelectorController);
- $scope.$on("$ionicView.beforeEnter", onBeforeEnter);
- $scope.$on("$ionicView.enter", onEnter);
-
- function onBeforeEnter(event, data) {
- if (data.direction == "back") {
- sendFlowService.state.pop();
- }
+ function walletSelectorController ($scope, $state, sendFlowService, configService, gettextCatalog, ongoingProcess, profileService, walletService, txFormatService) {
+ var fromWalletId = '';
+ var priceDisplayAsFiat = false;
+ var unitDecimals = 0;
+ var unitsFromSatoshis = 0;
- $scope.params = sendFlowService.state.getClone();
-
- console.log('walletSelector onBeforeEnter after back sendflow', $scope.params);
-
- var config = configService.getSync().wallet.settings;
- priceDisplayAsFiat = config.priceDisplay === 'fiat';
- unitDecimals = config.unitDecimals;
- unitsFromSatoshis = 1 / config.unitToSatoshi;
-
- if ($scope.params.isWalletTransfer) {
- $scope.sendFlowTitle = gettextCatalog.getString('Transfer between wallets');
- } else if (!$scope.params.thirdParty) {
- $scope.sendFlowTitle = gettextCatalog.getString('Send');
- }
-
- $scope.coin = false; // Wallets to show (for destination screen or contacts)
- $scope.type = $scope.params['fromWalletId'] ? 'destination' : 'origin'; // origin || destination
- fromWalletId = $scope.params['fromWalletId'];
-
- if ($scope.type === 'destination' && $scope.params.toAddress) {
- $state.transitionTo(getNextStep($scope.params));
- }
-
- if ($scope.params.coin) {
- $scope.coin = $scope.params.coin; // Contacts have a coin embedded
- }
-
- if ($scope.params.amount) { // There is an amount, so presume that it is a payment request
- $scope.sendFlowTitle = gettextCatalog.getString('Payment Request');
- $scope.specificAmount = $scope.specificAlternativeAmount = '';
- $scope.isPaymentRequest = true;
- }
- if ($scope.params.thirdParty) {
- $scope.thirdParty = $scope.params.thirdParty;
- }
- };
-
- function onEnter (event, data) {
- configService.whenAvailable(function(config) {
- $scope.selectedPriceDisplay = config.wallet.settings.priceDisplay;
- });
-
- if ($scope.thirdParty) {
- // Third party services specific logic
- handleThirdPartyIfShapeshift();
- }
-
- prepareWalletLists();
- formatRequestedAmount();
- };
-
- function formatRequestedAmount() {
- if ($scope.params.amount) {
- var cryptoAmount = (unitsFromSatoshis * $scope.params.amount).toFixed(unitDecimals);
- var cryptoCoin = $scope.coin.toUpperCase();
-
- txFormatService.formatAlternativeStr($scope.coin, $scope.params.amount, function onFormatAlternativeStr(formatted){
- if (formatted) {
- var fiatParts = formatted.split(' ');
- var fiatAmount = fiatParts[0];
- var fiatCurrrency = fiatParts.length > 1 ? fiatParts[1] : '';
-
- if (priceDisplayAsFiat) {
- $scope.requestAmount = fiatAmount;
- $scope.requestCurrency = fiatCurrrency;
-
- $scope.requestAmountSecondary = cryptoAmount;
- $scope.requestCurrencySecondary = cryptoCoin;
- } else {
- $scope.requestAmount = cryptoAmount;
- $scope.requestCurrency = cryptoCoin;
-
- $scope.requestAmountSecondary = fiatAmount;
- $scope.requestCurrencySecondary = fiatCurrrency;
- }
- $scope.$apply();
- }
- });
- }
- }
-
- function handleThirdPartyIfShapeshift() {
- console.log($scope.thirdParty, $scope.coin);
- if ($scope.thirdParty.id === 'shapeshift' && $scope.type === 'destination') { // Shapeshift wants to know the
- $scope.coin = profileService.getWallet(fromWalletId).coin;
- if ($scope.coin === 'bch') {
- $scope.coin = 'btc';
- } else {
- $scope.coin = 'bch';
+ $scope.$on("$ionicView.beforeEnter", onBeforeEnter);
+ $scope.$on("$ionicView.enter", onEnter);
+
+ function onBeforeEnter(event, data) {
+ if (data.direction == "back") {
+ sendFlowService.state.pop();
}
- }
- }
- function prepareWalletLists() {
- var walletsAll = [];
- var walletsSufficientFunds = [];
- $scope.walletsInsufficientFunds = []; // For origin screen
+ $scope.params = sendFlowService.state.getClone();
- if ($scope.type === 'origin') {
- $scope.headerTitle = gettextCatalog.getString('Choose a wallet to send from');
+ console.log('walletSelector onBeforeEnter after back sendflow', $scope.params);
+ var config = configService.getSync().wallet.settings;
+ priceDisplayAsFiat = config.priceDisplay === 'fiat';
+ unitDecimals = config.unitDecimals;
+ unitsFromSatoshis = 1 / config.unitToSatoshi;
+
+ if ($scope.params.isWalletTransfer) {
+ $scope.sendFlowTitle = gettextCatalog.getString('Transfer between wallets');
+ } else if (!$scope.params.thirdParty) {
+ $scope.sendFlowTitle = gettextCatalog.getString('Send');
+ }
+
+ $scope.coin = false; // Wallets to show (for destination screen or contacts)
+ $scope.type = $scope.params['fromWalletId'] ? 'destination' : 'origin'; // origin || destination
+ fromWalletId = $scope.params['fromWalletId'];
+
+ if ($scope.type === 'destination' && $scope.params.toAddress) {
+ $state.transitionTo(getNextStep($scope.params));
+ }
+
+ if ($scope.params.coin) {
+ $scope.coin = $scope.params.coin; // Contacts have a coin embedded
+ }
+
+ if ($scope.params.amount) { // There is an amount, so presume that it is a payment request
+ $scope.sendFlowTitle = gettextCatalog.getString('Payment Request');
+ $scope.specificAmount = $scope.specificAlternativeAmount = '';
+ $scope.isPaymentRequest = true;
+ }
+ if ($scope.params.thirdParty) {
+ $scope.thirdParty = $scope.params.thirdParty;
+ }
+ };
+
+ function onEnter (event, data) {
+ configService.whenAvailable(function(config) {
+ $scope.selectedPriceDisplay = config.wallet.settings.priceDisplay;
+ });
+
+ if ($scope.thirdParty) {
+ // Third party services specific logic
+ handleThirdPartyIfShapeshift();
+ }
+
+ prepareWalletLists();
+ formatRequestedAmount();
+ };
+
+ function formatRequestedAmount() {
if ($scope.params.amount) {
+ var cryptoAmount = (unitsFromSatoshis * $scope.params.amount).toFixed(unitDecimals);
+ var cryptoCoin = $scope.coin.toUpperCase();
- walletsAll = profileService.getWallets({coin: $scope.coin});
+ txFormatService.formatAlternativeStr($scope.coin, $scope.params.amount, function onFormatAlternativeStr(formatted){
+ if (formatted) {
+ var fiatParts = formatted.split(' ');
+ var fiatAmount = fiatParts[0];
+ var fiatCurrrency = fiatParts.length > 1 ? fiatParts[1] : '';
+
+ if (priceDisplayAsFiat) {
+ $scope.requestAmount = fiatAmount;
+ $scope.requestCurrency = fiatCurrrency;
+
+ $scope.requestAmountSecondary = cryptoAmount;
+ $scope.requestCurrencySecondary = cryptoCoin;
+ } else {
+ $scope.requestAmount = cryptoAmount;
+ $scope.requestCurrency = cryptoCoin;
+
+ $scope.requestAmountSecondary = fiatAmount;
+ $scope.requestCurrencySecondary = fiatCurrrency;
+ }
+ $scope.$apply();
+ }
+ });
+ }
+ }
+
+ function handleThirdPartyIfShapeshift() {
+ console.log($scope.thirdParty, $scope.coin);
+ if ($scope.thirdParty.id === 'shapeshift' && $scope.type === 'destination') { // Shapeshift wants to know the
+ $scope.coin = profileService.getWallet(fromWalletId).coin;
+ if ($scope.coin === 'bch') {
+ $scope.coin = 'btc';
+ } else {
+ $scope.coin = 'bch';
+ }
+ }
+ }
+
+ function prepareWalletLists() {
+ var walletsAll = [];
+ var walletsSufficientFunds = [];
+ $scope.walletsInsufficientFunds = []; // For origin screen
+
+ if ($scope.type === 'origin') {
+ $scope.headerTitle = gettextCatalog.getString('Choose a wallet to send from');
+
+ if ($scope.params.amount || $scope.coin) {
+
+ walletsAll = profileService.getWallets({coin: $scope.coin});
+ ongoingProcess.set('scanning', true);
+ walletsAll.forEach(function forWallet(wallet) {
+ if (!wallet.status && !wallet.cachedStatus) {
+ walletService.getStatus(wallet, {}, function(err, status) {
+ wallet.status = status;
+ if (status.availableBalanceSat > ($scope.params.amount ? $scope.params.amount : 0)) {
+ walletsSufficientFunds.push(wallet);
+ } else {
+ $scope.walletsInsufficientFunds.push(wallet);
+ }
+ if ($scope.coin === 'btc') { // As this is a promise
+ $scope.walletsBtc = walletsSufficientFunds;
+ } else {
+ $scope.walletsBch = walletsSufficientFunds;
+ }
+ ongoingProcess.set('scanning', false);
+ });
+ } else {
+ var walletStatus = null;
+ if (wallet.status && wallet.status.isValid) {
+ walletStatus = wallet.status;
+ } else if (wallet.cachedStatus && wallet.status.isValid) {
+ walletStatus = wallet.cachedStatus;
+ }
+
+ if (walletStatus && walletStatus.availableBalanceSat > ($scope.params.amount ? $scope.params.amount : 0)) {
+ walletsSufficientFunds.push(wallet);
+ } else {
+ $scope.walletsInsufficientFunds.push(wallet);
+ }
+ ongoingProcess.set('scanning', false);
+ }
+ });
+
+ if ($scope.coin === 'btc') {
+ $scope.walletsBtc = walletsSufficientFunds;
+ } else {
+ $scope.walletsBch = walletsSufficientFunds;
+ }
+ } else {
+ $scope.walletsBch = profileService.getWallets({coin: 'bch', hasFunds: true});
+ $scope.walletsBtc = profileService.getWallets({coin: 'btc', hasFunds: true});
+ $scope.walletsInsufficientFunds = profileService.getWallets({coin: $scope.coin, hasNoFunds: true});
+ }
- walletsAll.forEach(function forWallet(wallet){
- if (wallet.status.availableBalanceSat > $scope.params.amount) {
- walletsSufficientFunds.push(wallet);
- } else {
- $scope.walletsInsufficientFunds.push(wallet);
- }
- });
-
- if ($scope.coin === 'btc') {
- $scope.walletsBtc = walletsSufficientFunds;
- } else {
- $scope.walletsBch = walletsSufficientFunds;
+ } else if ($scope.type === 'destination') {
+ if (!$scope.coin) { // Allow for the coin to be set by a third party
+ $scope.fromWallet = profileService.getWallet(fromWalletId);
+ $scope.coin = $scope.fromWallet.coin; // Only show wallets with the select origin wallet coin
}
+ $scope.headerTitle = gettextCatalog.getString('Choose a wallet to send to');
- } else if ($scope.coin) {
- walletsAll = profileService.getWallets({coin: $scope.coin});
- walletsAll.forEach(function forWallet(wallet){
- if (wallet.status.availableBalanceSat > 0) {
- walletsSufficientFunds.push(wallet);
- } else {
- $scope.walletsInsufficientFunds.push(wallet);
- }
- });
-
- if ($scope.coin === 'btc') {
- $scope.walletsBtc = walletsSufficientFunds;
+ if ($scope.coin === 'btc') { // if no specific coin is set or coin is set btc
+ $scope.walletsBtc = profileService.getWallets({coin: $scope.coin});
} else {
- $scope.walletsBch = walletsSufficientFunds;
+ $scope.walletsBch = profileService.getWallets({coin: $scope.coin});
}
- } else {
- $scope.walletsBch = profileService.getWallets({coin: 'bch', hasFunds: true});
- $scope.walletsBtc = profileService.getWallets({coin: 'btc', hasFunds: true});
- $scope.walletsInsufficientFunds = profileService.getWallets({coin: $scope.coin, hasNoFunds: true});
- }
-
- } else if ($scope.type === 'destination') {
- if (!$scope.coin) { // Allow for the coin to be set by a third party
- $scope.fromWallet = profileService.getWallet(fromWalletId);
- $scope.coin = $scope.fromWallet.coin; // Only show wallets with the select origin wallet coin
- }
- $scope.headerTitle = gettextCatalog.getString('Choose a wallet to send to');
-
- if ($scope.coin === 'btc') { // if no specific coin is set or coin is set btc
- $scope.walletsBtc = profileService.getWallets({coin: $scope.coin});
- } else {
- $scope.walletsBch = profileService.getWallets({coin: $scope.coin});
}
}
- }
-
+
- $scope.useWallet = function(wallet) {
- var params = sendFlowService.state.getClone();
- if ($scope.type === 'origin') { // we're on the origin screen, set wallet to send from
- params.fromWalletId = wallet.id;
- } else { // we're on the destination screen, set wallet to send to
- params.toWalletId = wallet.id;
+ $scope.useWallet = function(wallet) {
+ var params = sendFlowService.state.getClone();
+ if ($scope.type === 'origin') { // we're on the origin screen, set wallet to send from
+ params.fromWalletId = wallet.id;
+ } else { // we're on the destination screen, set wallet to send to
+ params.toWalletId = wallet.id;
+ }
+ sendFlowService.goNext(params);
+ };
+
+ $scope.goBack = function() {
+ sendFlowService.router.goBack();
}
- sendFlowService.goNext(params);
- };
- $scope.goBack = function() {
- sendFlowService.router.goBack();
}
-
-});
\ No newline at end of file
+})();
\ No newline at end of file
diff --git a/www/views/walletSelector.html b/www/views/walletSelector.html
index 2e4c4bc31..a9712adf9 100644
--- a/www/views/walletSelector.html
+++ b/www/views/walletSelector.html
@@ -13,7 +13,7 @@