Merge pull request #79 from polkawallet-io/20190226002

fix_qr_transfer
polkawallet-io · Feb 26, 2019 · 29918b4 · 29918b4
2 parents dcf7cd8 + abd9642
commit 29918b4
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git 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
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.10</string>
+	<string>1.9</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -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
@@ -72,7 +72,7 @@ export default class New extends Component {
         {/* 版本 */}
         <View style={{flex:1}}/>
         <View style={[styles.msgView,{marginBottom:ScreenHeight/30}]}>
-            <Text style={{fontSize:ScreenWidth/25,color:'#808080'}}>Version: 0.0.10</Text>
+            <Text style={{fontSize:ScreenWidth/25,color:'#808080'}}>Version: 0.0.9</Text>
         </View>
       </View>
     );