ready of release

Strides-APP/android/app/version.properties

@@ -1,2 +1,2 @@
-#Mon Jan 16 10:10:12 CST 2023
-VERSION_CODE=78
+#Mon Jan 16 10:53:35 CST 2023
+VERSION_CODE=80

Strides-APP/app/pages/my/Feedback.js

@@ -258,7 +258,7 @@ const styles = StyleSheet.create({
     borderRadius: 6
   },
   button: {
-    marginTop: 32,
+    marginTop: 72,
     marginBottom: 16,
     borderRadius: 4
   }

Strides-APP/app/pages/payment/FormCard.js

@@ -263,15 +263,18 @@ const styles = StyleSheet.create({
   cardNameInput: {
     color: '#333',
     fontSize: 14,
-    paddingBottom: 2,
+    lineHeight: 16,
+    paddingTop: 4,
+    paddingLeft: 0,
+    paddingBottom: 4,
     borderBottomColor: '#EEE',
     borderBottomWidth: 1
   },
   cardInputView: {
-    paddingTop: 16,
+    paddingTop: 12,
     paddingLeft: 2,
     paddingRight: 2,
-    paddingBottom: 2,
+    paddingBottom: 0,
     alignItems: 'center',
     flexDirection: 'row',
     borderBottomColor: '#EEE',
@@ -279,7 +282,7 @@ const styles = StyleSheet.create({
   },
   cardInput: {
     flex: 1,
-    padding: 0,
+    ...$padding(4, 0),
     color: '#333',
     fontSize: 14,
   },

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

@@ -18,7 +18,12 @@ export default class PaymentMethod extends Component {
     this.state = {
       cIndex: 0,
       selectIndex: 0,
-      paymentOptions: [],
+      paymentOptions: [{
+        title: "Credit Wallet",
+        desc: '',
+        value: PAYTYPE.CREDIT_WALLET,
+        icon: require('../../images/icon/draw-wallet.png')
+      }],
       paymentOptionsWallet: [{
         title: "Credit Wallet",
         desc: '',
@@ -59,9 +64,9 @@ export default class PaymentMethod extends Component {
   }
 
   componentDidMount() {
-    this.setState({
+    /*this.setState({
       paymentOptions: this.FirstPayPerUse ? this.state.paymentOptionsUse : this.state.paymentOptionsWallet
-    });
+    });*/
     const params = this.props.route.params;
     const info = params.info ?? {};
     console.log('----params----', params);

Strides-APP/app/pages/wallet/Payment.js

@@ -15,13 +15,13 @@ import { PageList } from '../Router';
  */
 export const PaymentDefault = {
   is2c2p: false,
-  DEFAULT1: {
+  DEFAULT: {
     payType: "CreditWallet",
     payName: "Credit Wallet",
     isWallet: true,
     isPayPerUse: false
   },
-  DEFAULT: {
+  DEFAULT2: {
     payType: "PayPerUse",
     payName: "Pay Per Use (SGQR)",
     isWallet: false,

Strides-APP/app/pages/wallet/Wallet.js

@@ -66,6 +66,9 @@ export default class Wallet extends Component {
         <View style={styles.balanceView}>
           <Payment 
             balance={this.state.balance}
+            isPayPerUse={false}
+            isWallet={true}
+            payType={"Credit Wallet"}
             topup={() => toTopupPage()}/>
         </View>
         <View style={styles.tabView}>