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

Merge branch 'wallet/dev' into wallet/prod

Browse source
This commit is contained in:
Sam Cheng Hung 2018-06-12 10:51:01 +05:30
commit 494b0d9429
6 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app-template/bitcoincom/appConfig.json
View file

@ -24,8 +24,8 @@
"windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
"pushSenderId": "1036948132229",
"description": "A Secure Bitcoin Wallet",
"version": "4.11.0",
"fullVersion": "4.11-rc1",
"version": "4.12.0",
"fullVersion": "4.12-rc1",
"androidVersion": "411000",
"_extraCSS": "",
"_enabledExtensions": {

2
app-template/package-template.json
View file

@ -80,7 +80,7 @@
"load-grunt-tasks": "^3.5.0",
"shelljs": "^0.3.0",
"android-versions": "^1.2.1",
"bitcoincashjs": "^0.1.7"
"bitcoincashjs-fork": "^1.0.3"
},
"scripts": {
"postinstall": "bower install",

2
bitcoin-cash-js/index.js
View file

@ -1,5 +1,5 @@
var bitcoinCashJsModule = angular.module('bitcoinCashJsModule', []);
var bchjs = require('../node_modules/bitcoincashjs');
var bchjs = require('../node_modules/bitcoincashjs-fork');
bitcoinCashJsModule.constant('MODULE_VERSION', '1.0.0');

12
src/js/controllers/modals/search.js
View file

@ -104,12 +104,12 @@ angular.module('copayApp.controllers').controller('searchController', function($
};
$scope.searchOnBlockchain = function(searchTerm) {
const url = 'https://explorer.bitcoin.com/'+$scope.wallet.coin+'/search/' + searchTerm;
const optIn = true;
const title = null;
const message = gettextCatalog.getString('Search on Explorer.Bitcoin.com');
const okText = gettextCatalog.getString('Open Explorer');
const cancelText = gettextCatalog.getString('Go Back');
var url = 'https://explorer.bitcoin.com/'+$scope.wallet.coin+'/search/' + searchTerm;
var optIn = true;
var title = null;
var message = gettextCatalog.getString('Search on Explorer.Bitcoin.com');
var okText = gettextCatalog.getString('Open Explorer');
var cancelText = gettextCatalog.getString('Go Back');
externalLinkService.open(url, optIn, title, message, okText, cancelText);
};

11
src/js/controllers/tab-scan.js
View file

@ -60,11 +60,14 @@ angular.module('copayApp.controllers').controller('tabScanController', function(
});
$scope.$on("$ionicView.afterEnter", function() {
// try initializing and refreshing status any time the view is entered
if(!scannerService.isInitialized()) {
scannerService.gentleInitialize();
var capabilities = scannerService.getCapabilities();
if (capabilities.hasPermission) {
// try initializing and refreshing status any time the view is entered
if(!scannerService.isInitialized()) {
scannerService.gentleInitialize();
}
activate();
}
activate();
});
function activate(){

7
src/js/services/walletService.js
View file

@ -1179,12 +1179,13 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
if (signedTxp.status == 'accepted') {
ongoingProcess.set('broadcastingTx', true, customStatusHandler);
function handleBroadcastTx(err, broadcastedTxp) {
var handleBroadcastTx = function(err, broadcastedTxp) {
ongoingProcess.set('broadcastingTx', false, customStatusHandler);
if (err) return cb(bwcError.msg(err));
if (err) return cb(bwcError.msg(err));
$rootScope.$emit('Local/TxAction', wallet.id);
return cb(null, broadcastedTxp);
}
};
if (signedTxp.payProUrl && signedTxp.coin == 'bch') {
payproService.broadcastBchTx(signedTxp, handleBroadcastTx);