fix: new experimental chats modal fixed

juanky201271 · Feb 10, 2025 · 3787782 · 3787782
1 parent c6ad4e3
commit 3787782
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 27 deletions.
diff --git a/components/History/components/ValueTransferLine.tsx b/components/History/components/ValueTransferLine.tsx
@@ -108,6 +108,7 @@ const ValueTransferLine: React.FunctionComponent<ValueTransferLineProps> = ({
     setMessagesAddress(Utils.isMessagesAddress(vt));
   }, [vt]);
 
+  /*
   const handleRenderRightActions = (
     progress: Animated.AnimatedInterpolation<number>,
     dragX: Animated.AnimatedInterpolation<number>,
@@ -170,6 +171,7 @@ const ValueTransferLine: React.FunctionComponent<ValueTransferLineProps> = ({
       </>
     );
   };
+  */
 
   const handleRenderLeftActions = (
     progress: Animated.AnimatedInterpolation<number>,
@@ -277,10 +279,8 @@ const ValueTransferLine: React.FunctionComponent<ValueTransferLineProps> = ({
         <Swipeable
           ref={swipeableRef}
           overshootLeft={false}
-          overshootRight={messagesAddress ? true : false}
-          rightThreshold={65}
+          overshootRight={false}
           overshootFriction={1}
-          renderRightActions={handleRenderRightActions}
           renderLeftActions={handleRenderLeftActions}>
           <View
             style={{

diff --git a/components/Messages/MessagesModal.tsx b/components/Messages/MessagesModal.tsx
@@ -52,28 +52,19 @@ const MessagesModal: React.FunctionComponent<MessagesModalProps> = ({
   moment.locale(language);
 
   return (
-    <SafeAreaView
-      style={{
-        display: 'flex',
-        justifyContent: 'flex-start',
-        alignItems: 'stretch',
-        height: '100%',
-        backgroundColor: colors.background,
-      }}>
-      <ContactList
-        syncingStatusMoreInfoOnClick={syncingStatusMoreInfoOnClick}
-        setPrivacyOption={setPrivacyOption}
-        setUfvkViewModalVisible={setUfvkViewModalVisible}
-        setScrollToTop={setScrollToTop}
-        scrollToTop={scrollToTop}
-        setScrollToBottom={setScrollToBottom}
-        scrollToBottom={scrollToBottom}
-        sendTransaction={sendTransaction}
-        setServerOption={setServerOption}
-        closeModal={closeModal}
-        noDrawMenu={true}
-      />
-    </SafeAreaView>
+    <ContactList
+      syncingStatusMoreInfoOnClick={syncingStatusMoreInfoOnClick}
+      setPrivacyOption={setPrivacyOption}
+      setUfvkViewModalVisible={setUfvkViewModalVisible}
+      setScrollToTop={setScrollToTop}
+      scrollToTop={scrollToTop}
+      setScrollToBottom={setScrollToBottom}
+      scrollToBottom={scrollToBottom}
+      sendTransaction={sendTransaction}
+      setServerOption={setServerOption}
+      closeModal={closeModal}
+      noDrawMenu={true}
+    />
   );
 };
 

diff --git a/components/Messages/components/ContactList.tsx b/components/Messages/components/ContactList.tsx
@@ -10,6 +10,7 @@ import {
   TouchableOpacity,
   ActivityIndicator,
   TextInput,
+  SafeAreaView,
 } from 'react-native';
 import moment from 'moment';
 import 'moment/locale/es';
@@ -276,14 +277,15 @@ const ContactList: React.FunctionComponent<ContactListProps> = ({
   //console.log('search text:', searchText, 'field:', searchTextField);
 
   return (
-    <View
+    <SafeAreaView
       accessible={true}
       accessibilityLabel={translate('history.title-acc') as string}
       style={{
         display: 'flex',
         justifyContent: 'flex-start',
         width: '100%',
         height: '100%',
+        backgroundColor: colors.background,
       }}>
       {isMessagesAddressModalShowing && (
         <Modal
@@ -620,7 +622,7 @@ const ContactList: React.FunctionComponent<ContactListProps> = ({
           )}
         </>
       )}
-    </View>
+    </SafeAreaView>
   );
 };