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

Merge pull request #358 from Bitcoin-com/wallet/sprint/21

Browse source 
android fix
This commit is contained in:
Jean-Baptiste Dominguez 2018-09-24 12:32:56 +02:00 • committed by GitHub
commit 9f904bb098
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/android/build-extras.gradle
View file

@ -1,5 +1,6 @@
ext {
ANDROID_SUPPORT_V4_VERSION = '26.1.0'
ANDROID_SUPPORT_ANNOTATIONS_VERSION = '26.1.0'
}
configurations.all {

2
src/js/services/send-flow.service.js
View file

@ -52,7 +52,7 @@ angular
// Detect some merchant that we know
if (payProData.memo.indexOf('eGifter') > -1) {
name = 'eGifter'
} else if (paymentUrl.indexOf('https://bitpay.com') > -1) {
} else if (payProData.url.indexOf('https://bitpay.com') > -1) {
name = 'BitPay';
}

2
src/js/services/shapeShiftApiService.js
View file

@ -24,7 +24,7 @@ var ShapeShift = (function() {
var parsedResponse = JP(xmlhttp.responseText);
cb.apply(null, [parsedResponse]);
} else {
cb.apply(null, [new Error('Request Failed')])
cb.apply(null, [new Error('Request Failed')]);
}
}
};