add

Strides-APP/android/app/version.properties

@@ -1,2 +1,2 @@
-#Tue Sep 12 10:01:29 CST 2023
-VERSION_CODE=319
+#Fri Sep 15 17:26:03 CST 2023
+VERSION_CODE=323

Strides-APP/app.json

@@ -20,7 +20,9 @@
   "storeUrl": {
     "android": "market://details?id=com.strides.chargeco",
     "ios": "itms-appss://apps.apple.com/app/id1664718768",
-    "refundUrl": "https://uat.chargeco.global/RefundPolicy.html"
+    "refundUrl": "https://chargeco.global/refund-policy",
+    "termsUseUrl": "https://chargeco.global/terms-of-use",
+    "privacyPolicyUrl": "https://chargeco.global/privacy-policy"
   },
   "company": "Strides YTL Pte. Ltd."
 }

Strides-APP/app/i18n/locales/en.js

@@ -466,16 +466,16 @@ export default {
     supportHotline: "Support Hotline",
     labelOpenTime: "Our Support Hours:",
     labelCallCentreHotline: "Call Centre Hotline",
-    labelWhatsappChat: "Whatsapp Chat",
+    labelWhatsappChat: "WhatsApp Chat",
     timeAllDay: "Monday to Sunday",
     timeWeekDay: "Monday to Friday",
     time24Hours: "24 Hours",
     btnCallSupport: "Call Support Hotline",
-    btnWhatsapp: "Whatsapp Us"
+    btnWhatsapp: "WhatsApp Us"
   },
   notification: {
     tabAlerts: "Alerts",
-    tabPromotions: "Promotions",
+    tabPromotions: "News",
     viewMessage: "View Message",
     deleteMessage: "Delete",
     confirmDelete: "Are you sure you want to delete this message?",

Strides-APP/app/i18n/locales/zh-TW.js

@@ -466,12 +466,12 @@ export default {
     supportHotline: "客戶服務",
     labelOpenTime: "服務時間：",
     labelCallCentreHotline: "客服熱線",
-    labelWhatsappChat: "Whatsapp 咨詢",
+    labelWhatsappChat: "WhatsApp 咨詢",
     timeAllDay: "周一至周日",
     timeWeekDay: "工作日",
     time24Hours: "24小時",
     btnCallSupport: "電話咨詢",
-    btnWhatsapp: "Whatsapp"
+    btnWhatsapp: "WhatsApp"
   },
   notification: {
     tabAlerts: "資訊",

Strides-APP/app/i18n/locales/zh.js

@@ -466,12 +466,12 @@ export default {
     supportHotline: "客户服务",
     labelOpenTime: "服务时间：",
     labelCallCentreHotline: "客服热线",
-    labelWhatsappChat: "Whatsapp 客服",
+    labelWhatsappChat: "WhatsApp 客服",
     timeAllDay: "周一至周日",
     timeWeekDay: "工作日",
     time24Hours: "24小时",
     btnCallSupport: "拨打电话",
-    btnWhatsapp: "Whatsapp"
+    btnWhatsapp: "WhatsApp"
   },
   notification: {
     tabAlerts: "通知",

Strides-APP/app/pages/about/AboutV2.js

@@ -12,13 +12,13 @@ const author = 2023;
 
 const policyList = [{
   name: "Terms of Use",
-  url: "https://chargeco.global/terms-of-use"
+  url: app.storeUrl.termsUseUrl
 }, {
   name: "Privacy Policy",
-  url: "https://stridesmobility.sg/chargeco-privacy-policy"
+  url: app.storeUrl.privacyPolicyUrl
 }, {
   name: "Refund Policy",
-  url: "https://chargeco.global/refund-policy"
+  url: app.storeUrl.refundUrl
 }]
 
 export default About = () => {

Strides-APP/app/pages/chargingV2/DiscountView.js

@@ -0,0 +1,42 @@
+import React from 'react';
+import { View, StyleSheet } from 'react-native';
+import Svg, { Path } from 'react-native-svg';
+
+export default DiscountView = ({visible=false}) => {
+  if (visible) {
+    return (<>
+      <Svg
+        width={35}
+        height={35}
+        viewBox="0 0 40 40"
+        style={{top: 0, right: 0, zIndex: 2, position: 'absolute'}}>
+        <Path
+          fill={colorAccent}
+          d="M28 0H0L40 40V12C40 5.37258 34.6274 -30 28 0Z" />
+        <MaterialCommunityIcons
+          name="brightness-percent"
+          size={15}
+          color={"white"}
+          style={{top: 3, right: 3, position: 'absolute'}}
+        />
+      </Svg>
+      <View style={styles.cardDiscount}></View>
+    </>);
+  } else {
+    return <></>;
+  }
+};
+
+const styles = StyleSheet.create({
+  cardDiscount: {
+    top: 0,
+    left: 0,
+    right: 0,
+    bottom: 0,
+    borderWidth: 3,
+    borderRadius: 10,
+    position: 'absolute',
+    borderColor: colorAccent,
+    borderStyle: 'solid'
+  }
+})

Strides-APP/app/pages/chargingV2/StepCharging.js

@@ -9,6 +9,7 @@ import Button, { ElevationObject } from '../../components/Button';
 import TextView from '../../components/TextView';
 import utils from '../../utils/utils';
 import { PaymentList } from '../chargeV2/Payment';
+import DiscountView from './DiscountView';
 
 const StepCharging = ({
   connectorInfo={},
@@ -128,6 +129,7 @@ const StepCharging = ({
         </View>
         <View style={styles.infoRow}>
           <View style={skipAnim ? styles.infoCarded : styles.infoCard}>
+            <DiscountView visible={connectorInfo.hasDiscount}/>
             <TextView style={styles.infoTitle}>{$t('charging.labelRate')}</TextView>
             <TextView
               numberOfLines={2}
@@ -241,6 +243,7 @@ const styles = StyleSheet.create({
     paddingBottom: 12,
     borderRadius: 10,
     marginRight: 16,
+    overflow: 'hidden',
     alignItems: 'center',
     //...ElevationObject(5),
     backgroundColor: colorLight
@@ -251,6 +254,7 @@ const styles = StyleSheet.create({
     paddingBottom: 12,
     borderRadius: 10,
     marginRight: 16,
+    overflow: 'hidden',
     alignItems: 'center',
     ...ElevationObject(5),
     backgroundColor: colorLight

Strides-APP/app/pages/chargingV2/StepStart.js

@@ -9,6 +9,7 @@ import Button, { ElevationObject } from '../../components/Button';
 import TextView from '../../components/TextView';
 import { ChargeStyle } from '../chargeV2/Charging';
 import { PaymentList } from '../chargeV2/Payment';
+import DiscountView from './DiscountView';
 
 export default StepStart = ({
   connectorInfo={},
@@ -49,6 +50,7 @@ export default StepStart = ({
       </View>
       <View style={styles.infoRow}>
         <View style={styles.infoCard}>
+          <DiscountView visible={connectorInfo.hasDiscount}/>
           <TextView style={styles.infoTitle}>{$t('charging.labelRate')}</TextView>
           {/* <Text
             numberOfLines={1}
@@ -119,6 +121,7 @@ const styles = StyleSheet.create({
     paddingBottom: 12,
     borderRadius: 10,
     marginRight: 16,
+    overflow: 'hidden',
     alignItems: 'center',
     ...ElevationObject(5),
     backgroundColor: colorLight,