mirror of https://github.com/BTCPrivate/copay.git
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:
commit
92773c3c74
|
@ -10,6 +10,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
|
||||||
$scope.loading = null;
|
$scope.loading = null;
|
||||||
$scope.isCordova = platformInfo.isCordova;
|
$scope.isCordova = platformInfo.isCordova;
|
||||||
$scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP;
|
$scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP;
|
||||||
|
$scope.copayers = $scope.wallet.status.wallet.copayers;
|
||||||
$scope.copayerId = $scope.wallet.credentials.copayerId;
|
$scope.copayerId = $scope.wallet.credentials.copayerId;
|
||||||
$scope.isShared = $scope.wallet.credentials.n > 1;
|
$scope.isShared = $scope.wallet.credentials.n > 1;
|
||||||
$scope.canSign = $scope.wallet.canSign() || $scope.wallet.isPrivKeyExternal();
|
$scope.canSign = $scope.wallet.canSign() || $scope.wallet.isPrivKeyExternal();
|
||||||
|
@ -36,10 +37,13 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
|
||||||
type: 'accept'
|
type: 'accept'
|
||||||
}).length == $scope.tx.requiredSignatures - 1;
|
}).length == $scope.tx.requiredSignatures - 1;
|
||||||
|
|
||||||
if (lastSigner)
|
if (lastSigner) {
|
||||||
$scope.buttonText += gettextCatalog.getString('to send');
|
$scope.buttonText += gettextCatalog.getString('to send');
|
||||||
else
|
$scope.successText = gettextCatalog.getString('Payment Sent');
|
||||||
|
} else {
|
||||||
$scope.buttonText += gettextCatalog.getString('to accept');
|
$scope.buttonText += gettextCatalog.getString('to accept');
|
||||||
|
$scope.successText = gettextCatalog.getString('Payment Accepted');
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
function initActionList() {
|
function initActionList() {
|
||||||
|
|
|
@ -185,6 +185,6 @@
|
||||||
<slide-to-accept-success
|
<slide-to-accept-success
|
||||||
slide-success-show="sendStatus === 'success'"
|
slide-success-show="sendStatus === 'success'"
|
||||||
slide-success-on-confirm="onSuccessConfirm()">
|
slide-success-on-confirm="onSuccessConfirm()">
|
||||||
{{'Payment Sent' | translate}}
|
{{successText}}
|
||||||
</slide-to-accept-success>
|
</slide-to-accept-success>
|
||||||
</ion-modal-view>
|
</ion-modal-view>
|
||||||
|
|
Loading…
Reference in New Issue