mirror of https://github.com/BTCPrivate/copay.git
change copay app name and remove slider to accept for wp
This commit is contained in:
parent
03f8b473d3
commit
52bf9c139d
|
@ -17,8 +17,8 @@
|
||||||
"url": "https://copay.io",
|
"url": "https://copay.io",
|
||||||
"appDescription": "Copay Bitcoin Wallet",
|
"appDescription": "Copay Bitcoin Wallet",
|
||||||
"winAppName": "CopayWallet",
|
"winAppName": "CopayWallet",
|
||||||
"WindowsStoreIdentityName": "18C7659D.CopayWallet",
|
"WindowsStoreIdentityName": "18C7659D.Copay-SecureBitcoinWallet",
|
||||||
"WindowsStoreDisplayName": "Copay Bitcoin Wallet",
|
"WindowsStoreDisplayName": "Copay - Secure Bitcoin Wallet",
|
||||||
"windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
|
"windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
|
||||||
"pushSenderId": "1036948132229",
|
"pushSenderId": "1036948132229",
|
||||||
"description": "A Secure Bitcoin Wallet",
|
"description": "A Secure Bitcoin Wallet",
|
||||||
|
|
|
@ -50,7 +50,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
||||||
$scope.isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova;
|
$scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP;
|
||||||
updateConfig();
|
updateConfig();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
// Platform info
|
// Platform info
|
||||||
var isChromeApp = platformInfo.isChromeApp;
|
var isChromeApp = platformInfo.isChromeApp;
|
||||||
var isCordova = platformInfo.isCordova;
|
var isCordova = platformInfo.isCordova;
|
||||||
|
var isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP;
|
||||||
|
|
||||||
function refresh() {
|
function refresh() {
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
|
@ -139,6 +139,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
|
|
||||||
// Other Scope vars
|
// Other Scope vars
|
||||||
$scope.isCordova = isCordova;
|
$scope.isCordova = isCordova;
|
||||||
|
$scope.isWindowsPhoneApp = isWindowsPhoneApp;
|
||||||
$scope.showAddress = false;
|
$scope.showAddress = false;
|
||||||
|
|
||||||
updateTx(tx, null, {}, function() {
|
updateTx(tx, null, {}, function() {
|
||||||
|
@ -308,7 +309,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
}
|
}
|
||||||
|
|
||||||
function setButtonText(isMultisig, isPayPro) {
|
function setButtonText(isMultisig, isPayPro) {
|
||||||
$scope.buttonText = gettextCatalog.getString(isCordova ? 'Slide' : 'Click') + ' ';
|
$scope.buttonText = gettextCatalog.getString(isCordova && !isWindowsPhoneApp ? 'Slide' : 'Click') + ' ';
|
||||||
|
|
||||||
if (isPayPro) {
|
if (isPayPro) {
|
||||||
$scope.buttonText += gettextCatalog.getString('to pay');
|
$scope.buttonText += gettextCatalog.getString('to pay');
|
||||||
|
|
|
@ -9,6 +9,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
|
||||||
$scope.init = function() {
|
$scope.init = function() {
|
||||||
$scope.loading = null;
|
$scope.loading = null;
|
||||||
$scope.isCordova = platformInfo.isCordova;
|
$scope.isCordova = platformInfo.isCordova;
|
||||||
|
$scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP;
|
||||||
$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();
|
||||||
|
@ -31,7 +32,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
|
||||||
};
|
};
|
||||||
|
|
||||||
function applyButtonText() {
|
function applyButtonText() {
|
||||||
$scope.buttonText = $scope.isCordova ? gettextCatalog.getString('Slide') + ' ' : gettextCatalog.getString('Click') + ' ';
|
$scope.buttonText = $scope.isCordova && !$scope.isWindowsPhoneApp ? gettextCatalog.getString('Slide') + ' ' : gettextCatalog.getString('Click') + ' ';
|
||||||
|
|
||||||
var lastSigner = lodash.filter($scope.tx.actions, {
|
var lastSigner = lodash.filter($scope.tx.actions, {
|
||||||
type: 'accept'
|
type: 'accept'
|
||||||
|
|
|
@ -76,7 +76,7 @@ angular.module('copayApp.controllers').controller('preferencesController',
|
||||||
wallet = profileService.getWallet(data.stateParams.walletId);
|
wallet = profileService.getWallet(data.stateParams.walletId);
|
||||||
walletId = wallet.credentials.walletId;
|
walletId = wallet.credentials.walletId;
|
||||||
$scope.wallet = wallet;
|
$scope.wallet = wallet;
|
||||||
$scope.isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova;
|
$scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP;
|
||||||
$scope.externalSource = null;
|
$scope.externalSource = null;
|
||||||
|
|
||||||
if (!wallet)
|
if (!wallet)
|
||||||
|
|
|
@ -100,13 +100,13 @@
|
||||||
</ion-content>
|
</ion-content>
|
||||||
<click-to-accept
|
<click-to-accept
|
||||||
ng-click="approve(tx, wallet, statusChangeHandler)"
|
ng-click="approve(tx, wallet, statusChangeHandler)"
|
||||||
ng-if="!isCordova"
|
ng-if="!isCordova || isWindowsPhoneApp"
|
||||||
click-send-status="sendStatus"
|
click-send-status="sendStatus"
|
||||||
is-disabled="!wallet">
|
is-disabled="!wallet">
|
||||||
{{buttonText}}
|
{{buttonText}}
|
||||||
</click-to-accept>
|
</click-to-accept>
|
||||||
<slide-to-accept
|
<slide-to-accept
|
||||||
ng-if="isCordova && wallet"
|
ng-if="isCordova && !isWindowsPhoneApp && wallet"
|
||||||
slide-on-confirm="approve(tx, wallet, statusChangeHandler)"
|
slide-on-confirm="approve(tx, wallet, statusChangeHandler)"
|
||||||
slide-send-status="sendStatus"
|
slide-send-status="sendStatus"
|
||||||
is-disabled="!wallet">
|
is-disabled="!wallet">
|
||||||
|
|
|
@ -170,13 +170,13 @@
|
||||||
|
|
||||||
<click-to-accept
|
<click-to-accept
|
||||||
ng-click="onConfirm(statusChangeHandler)"
|
ng-click="onConfirm(statusChangeHandler)"
|
||||||
ng-if="tx.pendingForUs && canSign && !paymentExpired && !isCordova"
|
ng-if="tx.pendingForUs && canSign && !paymentExpired && (!isCordova || isWindowsPhoneApp)"
|
||||||
click-send-status="sendStatus"
|
click-send-status="sendStatus"
|
||||||
has-wallet-chosen="true">
|
has-wallet-chosen="true">
|
||||||
{{buttonText}}
|
{{buttonText}}
|
||||||
</click-to-accept>
|
</click-to-accept>
|
||||||
<slide-to-accept
|
<slide-to-accept
|
||||||
ng-if="tx.pendingForUs && canSign && !paymentExpired && isCordova"
|
ng-if="tx.pendingForUs && canSign && !paymentExpired && isCordova && !isWindowsPhoneApp"
|
||||||
slide-on-confirm="onConfirm()"
|
slide-on-confirm="onConfirm()"
|
||||||
slide-send-status="sendStatus"
|
slide-send-status="sendStatus"
|
||||||
has-wallet-chosen="true">
|
has-wallet-chosen="true">
|
||||||
|
|
Loading…
Reference in New Issue