ordering-ui-react-native 0.18.47 → 0.18.49

package/package.json

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

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

@@ -393,7 +393,9 @@ const SignupFormUI = (props: SignupParams) => {
 				vibrateApp()
 				return
 			}
-			formState.result?.result && showToast(ToastType.Error, t(`${formState.result?.result[0]}`, 'Phone number already used'));
+			formState.result?.result && formState.result?.result[0]?.includes("_") ?
+				showToast(ToastType.Error, t(`${formState.result?.result[0]}`, 'Phone number already used')) :
+				showToast(ToastType.Error, formState.result?.result[0])
 			formState.result?.result && vibrateApp()
 			setIsLoadingVerifyModal(false);
 		}

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

@@ -49,7 +49,7 @@ export const WalletTransactionItem = (props: any) => {
             .replace(':order_id', item?.event?.order_id ? item?.event?.order_id + ' ' : '')}
         </OText>
       </MessageBlock>
-      {!!item?.description && (
+      {/* {!!item?.description && (
         <DescriptionBlock>
           <OText>{item?.description}</OText>
         </DescriptionBlock>
@@ -63,7 +63,7 @@ export const WalletTransactionItem = (props: any) => {
             </OText>
           </OText>
         </DescriptionBlock>
-      )}
+      )} */}
     </Container>
   )
 }

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

@@ -127,6 +127,9 @@ const WalletsUI = (props: any) => {
             display: 'flex',
             flexDirection: 'row',
             alignItems: 'center',
+            marginTop: 30,
+            justifyContent: 'space-between',
+            alignContent: 'center'
           },
         }}>
             {(!props.hideBackBtn || !hideWalletsTheme) && !isChewLayout && (
@@ -155,24 +158,25 @@ const WalletsUI = (props: any) => {
             <OText
               size={20}
               style={{
-                marginTop: 30,
                 marginLeft: (!props.hideBackBtn || !hideWalletsTheme) && !isChewLayout ? 40 : 0,
                 color: theme.colors.textNormal,
               }}
               weight={Platform.OS === 'ios' ? '600' : 'bold'}
-            >{t('WALLETS', 'Wallets')}</OText>
-        </View>
-          {isChewLayout && (
-            <OButton
-              text={t('WALLET_HISTORY', 'Wallet history')}
-              bgColor={theme.colors.white}
-              borderColor={theme.colors.lightGray}
-              imgRightSrc={null}
-              textStyle={{ fontSize: 12, color: theme.colors.disabled }}
-              onClick={() => setOpenHistory(true)}
-              style={{ borderRadius: 8, height: 40 }}
-            />
-          )}
+            >
+              {t('WALLETS', 'Wallets')}
+            </OText>
+            {isChewLayout && (
+              <OButton
+                text={t('WALLET_HISTORY', 'Wallet history')}
+                bgColor={theme.colors.white}
+                borderColor={theme.colors.lightGray}
+                imgRightSrc={null}
+                textStyle={{ fontSize: 12, color: theme.colors.disabled }}
+                onClick={() => setOpenHistory(true)}
+                style={{ borderRadius: 8, height: 40 }}
+              />
+            )}
+          </View>
         </Header>
 
         {!walletList.loading &&
@@ -313,15 +317,18 @@ const WalletsUI = (props: any) => {
         <ScrollView>
           <WalletTransactionsWrapper>
             <OButton
+              imgLeftStyle={{ width: 18 }}
               imgRightSrc={null}
               style={{
                 borderWidth: 0,
-                backgroundColor: theme.colors.white,
-                padding: 0,
-                paddingHorizontal: 0,
-                width: 30,
+                width: 26,
+                height: 26,
+                backgroundColor: '#FFF',
+                borderColor: '#FFF',
+                shadowColor: '#FFF',
                 paddingLeft: 0,
-                paddingRight: 0
+                paddingRight: 0,
+                marginBottom: 10
               }}
               onClick={() => setOpenHistory(false)}
               icon={AntDesignIcon}