From abd96421f67b1cde068c20e10bd8fde331d68757 Mon Sep 17 00:00:00 2001
From: zx870076178 <870076178@qq.com>
Date: Tue, 26 Feb 2019 21:26:32 +0800
Subject: [PATCH] fix_qr
---
android/build.gradle | 1 -
ios/Polkawallet/Info.plist | 2 +-
package-lock.json | 6 ++----
package.json | 2 +-
src/code/Assets/secondary/Transfer/transfer.js | 2 +-
src/code/Profile/secondary/About.js | 2 +-
6 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/android/build.gradle b/android/build.gradle
index 8875246e..5d14fce6 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -41,7 +41,6 @@ task wrapper(type: Wrapper) {
gradleVersion = '4.4'
distributionUrl = distributionUrl.replace("bin", "all")
}
-
subprojects {
afterEvaluate {project ->
if (project.hasProperty("android")) {
diff --git a/ios/Polkawallet/Info.plist b/ios/Polkawallet/Info.plist
index d6abc2ee..3d63a9c3 100644
--- a/ios/Polkawallet/Info.plist
+++ b/ios/Polkawallet/Info.plist
@@ -21,7 +21,7 @@
CFBundleSignature
????
CFBundleVersion
- 1.10
+ 1.9
LSRequiresIPhoneOS
NSAppTransportSecurity
diff --git a/package-lock.json b/package-lock.json
index 998bac02..a4645bec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "Polkawallet",
- "version": "0.0.8",
+ "version": "0.0.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -7357,7 +7357,6 @@
"version": "2.3.5",
"resolved": "http://registry.npm.taobao.org/minipass/download/minipass-2.3.5.tgz",
"integrity": "sha1-ys6+SSAiSX9law8PUeJoKp7S2Eg=",
- "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -7366,8 +7365,7 @@
"yallist": {
"version": "3.0.3",
"resolved": "http://registry.npm.taobao.org/yallist/download/yallist-3.0.3.tgz",
- "integrity": "sha1-tLBJ4xS+VF486AIjbWzSLNkcPek=",
- "optional": true
+ "integrity": "sha1-tLBJ4xS+VF486AIjbWzSLNkcPek="
}
}
},
diff --git a/package.json b/package.json
index a226cce4..adcd3235 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "Polkawallet",
- "version": "0.0.10",
+ "version": "0.0.11",
"private": true,
"scripts": {
"start": "node node_modules/react-native/local-cli/cli.js start",
diff --git a/src/code/Assets/secondary/Transfer/transfer.js b/src/code/Assets/secondary/Transfer/transfer.js
index b4201fef..63941e49 100644
--- a/src/code/Assets/secondary/Transfer/transfer.js
+++ b/src/code/Assets/secondary/Transfer/transfer.js
@@ -92,7 +92,7 @@ import {
if(this.state.address==''&&this.props.rootStore.stateStore.transfer_address==0&&this.props.rootStore.stateStore.iscamera==0){alert('Please enter address')}
else{
this.props.rootStore.stateStore.value=this.state.value*this.state.multiple
- this.props.rootStore.stateStore.inaddress=(this.props.rootStore.stateStore.isaddresses==0)?this.state.address:this.props.rootStore.stateStore.t_address
+ this.props.rootStore.stateStore.inaddress=(this.props.rootStore.stateStore.isaddresses==0&&this.props.rootStore.stateStore.iscamera==0)?this.state.address:this.props.rootStore.stateStore.t_address
this.props.rootStore.stateStore.isaddresses=0
this.props.rootStore.stateStore.transfer_address=0
this.props.rootStore.stateStore.iscamera=0
diff --git a/src/code/Profile/secondary/About.js b/src/code/Profile/secondary/About.js
index b086adcb..f58fc033 100644
--- a/src/code/Profile/secondary/About.js
+++ b/src/code/Profile/secondary/About.js
@@ -72,7 +72,7 @@ export default class New extends Component {
{/* 版本 */}
- Version: 0.0.10
+ Version: 0.0.9
);