vbea 2 лет назад
Родитель
Сommit
0156ef09ab

+ 2 - 2
Strides-APP/android/app/version.properties

@@ -1,2 +1,2 @@
-#Thu Sep 21 12:22:29 CST 2023
-VERSION_CODE=332
+#Tue Sep 26 10:56:03 CST 2023
+VERSION_CODE=335

+ 1 - 1
Strides-APP/app.json

@@ -1,7 +1,7 @@
 {
   "name": "Strides",
   "displayName": "ChargEco",
-  "versionCode": 330,
+  "versionCode": 335,
   "versionName": "V3.0.2",
   "product": false,
   "debug": true,

+ 13 - 16
Strides-APP/app/pages/wallet/TopupNew.js

@@ -29,7 +29,7 @@ export default class TopupNew extends Component {
       agree: false,
       isCallback: true
     };
-    this.stateListener;
+    //this.stateListener;
   }
 
   componentDidMount() {
@@ -41,20 +41,20 @@ export default class TopupNew extends Component {
       }, true);
     });
     this.getTopupList();
-    this.stateListener = AppState.addEventListener("change", state => {
+    /*this.stateListener = AppState.addEventListener("change", state => {
       if (state == 'active' && this.state.isCallback) {
         this.setState({
           agree: true,
           isCallback: false
         })
       }
-    });
+    });*/
   }
 
   componentWillUnmount() {
-    if (this.stateListener) {
+    /*if (this.stateListener) {
       this.stateListener?.remove();
-    }
+    }*/
   }
 
   getTopupList() {
@@ -137,16 +137,13 @@ export default class TopupNew extends Component {
   }
 
   changeAgree(ag) {
-    if (ag) {
-      this.setState({
-        isCallback: true
-      })
-      Linking.openURL(app.storeUrl.refundUrl);
-    } else {
-      this.setState({
-        agree: ag
-      });
-    }
+    this.setState({
+      agree: ag
+    });
+  }
+
+  toPolicy() {
+    Linking.openURL(app.storeUrl.refundUrl);
   }
 
   render() {
@@ -230,7 +227,7 @@ export default class TopupNew extends Component {
               <TextView style={styles.agreeText} onPress={() => this.changeAgree(!this.state.agree)}>
                 {$t('sign.iHaveReadAndAgree')}
               </TextView>
-              <TextView style={styles.agreeLink} onPress={() => this.changeAgree(true)}>Refund Policy</TextView>
+              <TextView style={styles.agreeLink} onPress={() => this.toPolicy()}>Refund Policy</TextView>
             </View>
           </View>
         }