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

Merge pull request #6195 from gabrielbazan7/fix/wpScanner

Browse source 
add old scanner for windows platform
This commit is contained in:
Gustavo Maximiliano Cortez 2017-06-23 12:00:38 -03:00 • committed by GitHub
commit 44efc77481
34 changed files with 233 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/js/controllers/confirm.js
View file

@ -20,7 +20,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() {
@ -140,6 +140,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
// Other Scope vars
$scope.isCordova = isCordova;
$scope.isWindowsPhoneApp = isWindowsPhoneApp;
$scope.showAddress = false;
updateTx(tx, null, {}, function() {
@ -316,7 +317,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');