Browse Source

Merge branch 'master' into settingsui

settingsui
Marcos Rodriguez 5 years ago
parent
commit
8c1f9631e0
  1. 2
      android/app/build.gradle
  2. 2
      appcenter-post-build.sh
  3. 2
      ios/BlueWallet/Info.plist
  4. 2
      ios/BlueWalletWatch Extension/Info.plist
  5. 2
      ios/BlueWalletWatch/Info.plist
  6. 2
      package-lock.json
  7. 2
      package.json
  8. 4
      screen/send/psbtWithHardwareWallet.js

2
android/app/build.gradle

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

2
appcenter-post-build.sh

@ -16,5 +16,5 @@ if [ -f $FILENAME ]; then
echo App url: $APPURL echo App url: $APPURL
PR=`node appcenter-post-build-get-pr-number.js` PR=`node appcenter-post-build-get-pr-number.js`
echo PR: $PR 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 fi

2
ios/BlueWallet/Info.plist

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

2
ios/BlueWalletWatch Extension/Info.plist

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

2
ios/BlueWalletWatch/Info.plist

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

2
package-lock.json

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

2
package.json

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

4
screen/send/psbtWithHardwareWallet.js

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

Loading…
Cancel
Save