diff --git a/app-template/copay/appConfig.json b/app-template/copay/appConfig.json index 72cb5c54d..557b9a472 100644 --- a/app-template/copay/appConfig.json +++ b/app-template/copay/appConfig.json @@ -17,8 +17,8 @@ "url": "https://copay.io", "appDescription": "Copay Bitcoin Wallet", "winAppName": "CopayWallet", - "WindowsStoreIdentityName": "18C7659D.CopayWallet", - "WindowsStoreDisplayName": "Copay Bitcoin Wallet", + "WindowsStoreIdentityName": "18C7659D.Copay-SecureBitcoinWallet", + "WindowsStoreDisplayName": "Copay - Secure Bitcoin Wallet", "windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c", "pushSenderId": "1036948132229", "description": "A Secure Bitcoin Wallet", diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js index 89500af52..cd065200c 100644 --- a/src/js/controllers/advancedSettings.js +++ b/src/js/controllers/advancedSettings.js @@ -50,7 +50,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController', }; $scope.$on("$ionicView.beforeEnter", function(event, data) { - $scope.isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova; + $scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; updateConfig(); }); diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index c9ce5943a..da728f7a0 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -19,7 +19,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( // Platform info var isChromeApp = platformInfo.isChromeApp; var isCordova = platformInfo.isCordova; - + var isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; function refresh() { $timeout(function() { @@ -139,6 +139,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( // Other Scope vars $scope.isCordova = isCordova; + $scope.isWindowsPhoneApp = isWindowsPhoneApp; $scope.showAddress = false; updateTx(tx, null, {}, function() { @@ -308,7 +309,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( } function setButtonText(isMultisig, isPayPro) { - $scope.buttonText = gettextCatalog.getString(isCordova ? 'Slide' : 'Click') + ' '; + $scope.buttonText = gettextCatalog.getString(isCordova && !isWindowsPhoneApp ? 'Slide' : 'Click') + ' '; if (isPayPro) { $scope.buttonText += gettextCatalog.getString('to pay'); diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js index bfab29089..0c4afc247 100644 --- a/src/js/controllers/modals/txpDetails.js +++ b/src/js/controllers/modals/txpDetails.js @@ -9,6 +9,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi $scope.init = function() { $scope.loading = null; $scope.isCordova = platformInfo.isCordova; + $scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; $scope.copayerId = $scope.wallet.credentials.copayerId; $scope.isShared = $scope.wallet.credentials.n > 1; $scope.canSign = $scope.wallet.canSign() || $scope.wallet.isPrivKeyExternal(); @@ -31,7 +32,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi }; 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, { type: 'accept' diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js index d30413695..ef95c00db 100644 --- a/src/js/controllers/preferences.js +++ b/src/js/controllers/preferences.js @@ -76,7 +76,7 @@ angular.module('copayApp.controllers').controller('preferencesController', wallet = profileService.getWallet(data.stateParams.walletId); walletId = wallet.credentials.walletId; $scope.wallet = wallet; - $scope.isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova; + $scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; $scope.externalSource = null; if (!wallet) diff --git a/www/views/confirm.html b/www/views/confirm.html index cff04ebf3..afd2ef0eb 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -100,13 +100,13 @@ {{buttonText}} diff --git a/www/views/modals/txp-details.html b/www/views/modals/txp-details.html index a093ba441..8cc13f9b2 100644 --- a/www/views/modals/txp-details.html +++ b/www/views/modals/txp-details.html @@ -170,13 +170,13 @@ {{buttonText}}