mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-02-23 15:20:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into settingsui

Browse source
This commit is contained in:
Marcos Rodriguez 2019-11-03 01:39:57 -05:00
commit 8c1f9631e0
8 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/app/build.gradle
View file

@ -119,7 +119,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "4.7.1"
versionName "4.7.3"
multiDexEnabled true
missingDimensionStrategy 'react-native-camera', 'general'
}

2
appcenter-post-build.sh
View file

@ -16,5 +16,5 @@ if [ -f $FILENAME ]; then
echo App url: $APPURL
PR=`node appcenter-post-build-get-pr-number.js`
echo PR: $PR
curl -X POST --data "{\"body\":\"Test this build in browser:\n\n(ﾉ◕ヮ◕)ﾉ*:・ﾟ✧ $APPURL\n\n(posted automatically)\"}" -u "Overtorment:$GITHUB" "https://api.github.com/repos/BlueWallet/BlueWallet/issues/$PR/comments"
curl -X POST --data "{\"body\":\"This was a triumph. I'm making a note here: HUGE SUCCESS.\n\n [android] $APPURL\"}" -u "$GITHUB_USERNAME:$GITHUB" "https://api.github.com/repos/BlueWallet/BlueWallet/issues/$PR/comments"
fi

2
ios/BlueWallet/Info.plist
View file

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>4.7.1</string>
<string>4.7.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>

2
ios/BlueWalletWatch Extension/Info.plist
View file

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>4.7.1</string>
<string>4.7.3</string>
<key>CFBundleVersion</key>
<string>239</string>
<key>CLKComplicationPrincipalClass</key>

2
ios/BlueWalletWatch/Info.plist
View file

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>4.7.1</string>
<string>4.7.3</string>
<key>CFBundleVersion</key>
<string>239</string>
<key>UISupportedInterfaceOrientations</key>

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "BlueWallet",
"version": "4.7.1",
"version": "4.7.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "BlueWallet",
"version": "4.7.1",
"version": "4.7.3",
"devDependencies": {
"@babel/core": "^7.5.0",
"@babel/runtime": "^7.5.1",

4
screen/send/psbtWithHardwareWallet.js
View file

@ -61,7 +61,7 @@ export default class PsbtWithHardwareWallet extends Component {
console.log('send/psbtWithHardwareWallet - componentDidMount');
}
broadcast() {
broadcast = () => {
this.setState({ isLoading: true }, async () => {
try {
await BlueElectrum.ping();
@ -87,7 +87,7 @@ export default class PsbtWithHardwareWallet extends Component {
alert(error.message);
}
});
}
};
_renderScanner() {
return (