refactor: clean code

axelor · Dec 17, 2024 · b2bcf42 · b2bcf42
1 parent ac38201
commit b2bcf42
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/packages/apps/purchase/src/components/atoms/HorizontalRuleText/HorizontalRuleText.tsx b/packages/apps/purchase/src/components/atoms/HorizontalRuleText/HorizontalRuleText.tsx
@@ -17,11 +17,11 @@
  */
 
 import React from 'react';
-import {View, StyleSheet, Text} from 'react-native';
-import {HorizontalRule, useThemeColor} from '@axelor/aos-mobile-ui';
+import {View, StyleSheet} from 'react-native';
+import {HorizontalRule, useThemeColor, Text} from '@axelor/aos-mobile-ui';
 
 interface HorizontalRuleTextProps {
-  text?: string;
+  text: string;
   style?: any;
   textStyle?: any;
 }
@@ -37,11 +37,9 @@ const HorizontalRuleText = ({
     <View style={[styles.container, style]}>
       <HorizontalRule style={styles.line} />
       <Text
-        style={[
-          styles.text,
-          {color: Colors.secondaryColor.foreground},
-          textStyle,
-        ]}>
+        fontSize={14}
+        textColor={Colors.secondaryColor.foreground}
+        style={textStyle}>
         {text}
       </Text>
       <HorizontalRule style={styles.line} />
@@ -60,10 +58,6 @@ const styles = StyleSheet.create({
     flex: 1,
     marginHorizontal: 10,
   },
-  text: {
-    fontSize: 14,
-    textAlign: 'center',
-  },
 });
 
 export default HorizontalRuleText;
diff --git a/...es/apps/purchase/src/components/templates/RequestCreationButton/RequestCreationButton.tsx b/...es/apps/purchase/src/components/templates/RequestCreationButton/RequestCreationButton.tsx
@@ -18,7 +18,7 @@
 
 import React from 'react';
 import {StyleSheet, View} from 'react-native';
-import {useNavigation, useTranslator} from '@axelor/aos-mobile-core';
+import {useTranslator} from '@axelor/aos-mobile-core';
 import {Button, useThemeColor} from '@axelor/aos-mobile-ui';
 import {RequestCreation} from '../../../types';
 
@@ -43,7 +43,6 @@ const RequestCreationButton = ({
 }: RequestCreationButtonProps) => {
   const Colors = useThemeColor();
   const I18n = useTranslator();
-  const navigation = useNavigation();
 
   const handleFinishPress = () => {
     if (step === RequestCreation.step.validateLine) {
@@ -52,9 +51,7 @@ const RequestCreationButton = ({
     setStep(RequestCreation.step.finish);
   };
 
-  const handleRealizePress = () => {
-    navigation.popToTop();
-  };
+  const handleRealizePress = () => {};
 
   if (
     (step === RequestCreation.step.addLine && lines.length >= 1) ||
@@ -65,7 +62,7 @@ const RequestCreationButton = ({
         {step === RequestCreation.step.validateLine && (
           <Button
             title={I18n.t(isEditionMode ? 'Base_Save' : 'Base_Add')}
-            iconName={isEditionMode ? null : 'plus-lg'}
+            iconName={isEditionMode ? 'floppy-fill' : 'plus-lg'}
             color={Colors.progressColor}
             width="45%"
             disabled={movedQty === 0}

diff --git a/packages/apps/purchase/src/components/templates/index.ts b/packages/apps/purchase/src/components/templates/index.ts
@@ -19,6 +19,6 @@
 export {default as CompanyPicker} from './CompanyPicker/CompanyPicker';
 export {default as ProductSearchBar} from './ProductSearchBar/ProductSearchBar';
 export {default as RequestCreationButton} from './RequestCreationButton/RequestCreationButton';
+export {default as RequestCreationQuantityCard} from './RequestCreationQuantityCard/RequestCreationQuantityCard';
 export {default as SupplierSearchBar} from './SupplierSearchBar/SupplierSearchBar';
 export {default as UnitSearchBar} from './UnitSearchBar/UnitSearchBar';
-export {default as RequestCreationQuantityCard} from './RequestCreationQuantityCard/RequestCreationQuantityCard';
diff --git a/packages/apps/purchase/src/screens/RequestCreationScreen.tsx b/packages/apps/purchase/src/screens/RequestCreationScreen.tsx
@@ -155,7 +155,12 @@ const RequestCreationScreen = () => {
             isScrollViewContainer
           />
         )}
-        <HorizontalRuleText text={I18n.t('Purchase_Or')} style={styles.rule} />
+        {currentStep < RequestCreation.step.validateLine && (
+          <HorizontalRuleText
+            text={I18n.t('Purchase_Or')}
+            style={styles.rule}
+          />
+        )}
         {(currentStep === RequestCreation.step.addLine ||
           (RequestCreation.step.validateLine && isCustomProduct)) && (
           <FormInput
@@ -195,9 +200,11 @@ const RequestCreationScreen = () => {
 const styles = StyleSheet.create({
   container: {
     alignItems: 'center',
+    paddingTop: 10,
   },
   rule: {
     marginVertical: 15,
+    width: '80%',
   },
 });