BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6333 from gabrielbazan7/fix/successMsg 

fix copayers actions list update and message when success view is shown
This commit is contained in:
Matias Alejo Garcia 2017-06-29 20:12:24 +02:00 committed by GitHub
parent 3a49053345 08977b77c0
commit 92773c3c74
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/controllers/modals/txpDetails.js
View File

@ -10,6 +10,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
$scope.loading = null;
$scope.isCordova = platformInfo.isCordova;
$scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP;
$scope.copayers = $scope.wallet.status.wallet.copayers;
$scope.copayerId = $scope.wallet.credentials.copayerId;
$scope.isShared = $scope.wallet.credentials.n > 1;
$scope.canSign = $scope.wallet.canSign() || $scope.wallet.isPrivKeyExternal();
@ -36,10 +37,13 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
type: 'accept'
}).length == $scope.tx.requiredSignatures - 1;
if (lastSigner)
if (lastSigner) {
$scope.buttonText += gettextCatalog.getString('to send');
else
$scope.successText = gettextCatalog.getString('Payment Sent');
} else {
$scope.buttonText += gettextCatalog.getString('to accept');
$scope.successText = gettextCatalog.getString('Payment Accepted');
}
};
function initActionList() {

2
www/views/modals/txp-details.html
View File

@ -185,6 +185,6 @@
<slide-to-accept-success
slide-success-show="sendStatus === 'success'"
slide-success-on-confirm="onSuccessConfirm()">
{{'Payment Sent' | translate}}
{{successText}}
</slide-to-accept-success>
</ion-modal-view>