Bladeren bron

enabled 2C2P

vbea 3 jaren geleden
bovenliggende
commit
f6a432d50f

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

@@ -1,2 +1,2 @@
-#Mon Dec 26 16:40:30 CST 2022
-VERSION_CODE=62
+#Tue Dec 27 17:46:25 CST 2022
+VERSION_CODE=63

+ 2 - 1
Strides-APP/app/pages/Router.js

@@ -23,7 +23,8 @@ import Rating from './charge/Rating';
 import Wallet from './wallet/Wallet';
 import EditProfile from './my/EditProfile';
 import Referral from './my/Referral';
-import Topup from './wallet/Topup';
+//import Topup from './wallet/Topup'; //not 2C2P
+import Topup from './wallet/TopupV2'; //2C2P payment
 import AddCard from './wallet/AddCard';
 import FormCard from './payment/FormCard';
 import AddVehicle from './my/AddVehicle';

+ 3 - 3
Strides-APP/app/pages/payment/PaymentMethod.js

@@ -80,7 +80,7 @@ export default class PaymentMethod extends Component {
       title: info.title,
       value: info.value
     };
-    if (this.state.cIndex == 0) {
+    if (this.state.cIndex == 1) {
       goBack();
     } else {
       const amount = this.state.amountList[this.state.selectIndex].amount;
@@ -119,7 +119,7 @@ export default class PaymentMethod extends Component {
       title: info.title,
       value: info.value
     };
-    if (this.state.cIndex == 0) {
+    if (this.state.cIndex == 1) {
       goBack();
     } else {
       const amount = this.state.amountList[this.state.selectIndex].amount;
@@ -201,7 +201,7 @@ export default class PaymentMethod extends Component {
             })
           }
           </View>
-          { this.state.cIndex > 0 &&
+          { this.state.cIndex == 0 &&
             <View style={[styles.optionView, ui.flex1]}>
               <WalletTitle>Pay Per Use</WalletTitle>
               <Text style={styles.subTitle}>Choose Amount:</Text>