ordering-ui-react-native 0.17.25-release → 0.17.26-release

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.17.25-release",
+  "version": "0.17.26-release",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/themes/original/src/components/GiftCard/RedeemGiftCard/index.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react'
+import React, { useEffect, useState } from 'react'
 import {
   useLanguage, useUtils, RedeemGiftCard as RedeemGiftCardController
 } from 'ordering-components/native'
@@ -26,6 +26,8 @@ const RedeemGiftCardUI = (props: any) => {
   const { handleSubmit, control, errors } = useForm()
   const [{ parsePrice }] = useUtils()
 
+  const [codeValue, setCodeValue] = useState('')
+
   const style = StyleSheet.create({
     btnStyle: {
       borderRadius: 7.6,
@@ -43,6 +45,14 @@ const RedeemGiftCardUI = (props: any) => {
     handleApply(values)
   }
 
+  const handleChangeCode = (string: any) => {
+    string = string.replace(/-/g, '')
+    if (!string) return
+    const codeSlices = string.match(/.{1,4}/g)
+    string = codeSlices.join('-')
+    setCodeValue(string)
+  }
+
   useEffect(() => {
     if (Object.keys(errors).length > 0) {
       const list = Object.values(errors)
@@ -90,9 +100,12 @@ const RedeemGiftCardUI = (props: any) => {
               control={control}
               render={({ onChange, value }: any) => (
               <OInput
-                placeholder='0000 0000'
-                value={value}
-                onChange={(val: any) => onChange(val)}
+                placeholder='XXXX-XXXX-XXXX-XXXX'
+                value={codeValue}
+                onChange={(val: any) => {
+                  onChange(val)
+                  handleChangeCode(val)
+                }}
                 autoCapitalize='none'
                 autoCorrect={false}
                 blurOnSubmit={false}

package/themes/original/src/components/Wallets/index.tsx

@@ -121,17 +121,17 @@ const WalletsUI = (props: any) => {
     <>
       <Container>
         <Header>
-        <View style={{
-          ...{
-            width: '100%',
-            display: 'flex',
-            flexDirection: 'row',
-            alignItems: 'center',
-            marginTop: 30,
-            justifyContent: 'space-between',
-            alignContent: 'center'
-          },
-        }}>
+          <View style={{
+            ...{
+              width: '100%',
+              display: 'flex',
+              flexDirection: 'row',
+              alignItems: 'center',
+              marginTop: 30,
+              justifyContent: 'space-between',
+              alignContent: 'center'
+            },
+          }}>
             {(!props.hideBackBtn || !hideWalletsTheme) && !isChewLayout && (
               <OButton
                 imgLeftStyle={{ width: 18 }}
@@ -145,7 +145,6 @@ const WalletsUI = (props: any) => {
                   shadowColor: '#FFF',
                   paddingLeft: 0,
                   paddingRight: 0,
-                  marginTop: 30,
                 }}
                 onClick={goToBack}
                 icon={AntDesignIcon}
@@ -260,9 +259,13 @@ const WalletsUI = (props: any) => {
                   </OText>
                 </BalanceElement>
 
-                <View style={styles.dividerStyle} />
-                <GiftCardUI navigation={navigation} />
-                <View style={styles.dividerStyle} />
+                {currentWalletSelected?.type === 'cash' && (
+                  <>
+                    <View style={styles.dividerStyle} />
+                    <GiftCardUI navigation={navigation} />
+                    <View style={styles.dividerStyle} />
+                  </>
+                )}
 
                 {!isChewLayout && (
                   <WalletTransactions