anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/wallet/task/537' into wallet/sprint/20

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-08-10 12:12:37 +02:00
commit 0339d6e85e
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/js/controllers/walletSelectorController.js
View file

@ -17,7 +17,7 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
sendFlowService.popState();
}
var stateParams = sendFlowService.getState();
$scope.params = sendFlowService.getState();
var config = configService.getSync().wallet.settings;
priceDisplayAsFiat = config.priceDisplay === 'fiat';
@ -29,18 +29,17 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
$scope.sendFlowTitle = gettextCatalog.getString('Wallet to Wallet Transfer');
break;
case 'tabs.send.destination':
if (stateParams.fromWalletId) {
if ($scope.params.fromWalletId) {
$scope.sendFlowTitle = gettextCatalog.getString('Wallet to Wallet Transfer');
}
break;
default:
if (!stateParams.thirdParty) {
if (!$scope.params.thirdParty) {
$scope.sendFlowTitle = gettextCatalog.getString('Send');
}
// nop
}
$scope.params = sendFlowService;
$scope.coin = false; // Wallets to show (for destination screen or contacts)
$scope.type = $scope.params['fromWalletId'] ? 'destination' : 'origin'; // origin || destination
fromWalletId = $scope.params['fromWalletId'];

4
src/js/services/incomingData.js
View file

@ -447,7 +447,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
amount: thirdPartyData.amount,
toAddress: thirdPartyData.toAddress,
coin: coin,
thirdParty: JSON.stringify(thirdPartyData)
thirdParty: thirdPartyData
};
// fee
@ -455,6 +455,8 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
stateParams.requiredFeeRate = thirdPartyData.requiredFeeRate * 1024;
}
sendFlowService.pushState(thirdPartyData);
scannerService.pausePreview();
$state.go('tabs.send', {}, {
'reload': true,