From 8d7e88d12b3e1b71fdcba02cda2527e5ba90e957 Mon Sep 17 00:00:00 2001
From: Roland Osborne <rolandosborne@gmail.com>
Date: Fri, 6 Oct 2023 16:07:42 -0700
Subject: [PATCH] fixing cards filter

---
 app/mobile/src/session/cards/Cards.jsx        | 47 ++++++++++---------
 app/mobile/src/session/cards/useCards.hook.js |  2 +
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/app/mobile/src/session/cards/Cards.jsx b/app/mobile/src/session/cards/Cards.jsx
index 9344a32c..1234142e 100644
--- a/app/mobile/src/session/cards/Cards.jsx
+++ b/app/mobile/src/session/cards/Cards.jsx
@@ -28,7 +28,7 @@ export function Cards({ navigation, openContact, openRegistry, addChannel }) {
             )}
             <View style={styles.inputwrapper}>
               <AntIcons style={styles.icon} name="search1" size={16} color={Colors.inputPlaceholder} />
-              <TextInput placeholder={ state.strings.contactFilter } placeholderTextColor={Colors.inputPlaceholder} value={state.filter}
+              <TextInput placeholder={ state.strings.contactFilter } placeholderTextColor={Colors.inputPlaceholder} 
                   style={styles.inputfield} autoCapitalize={'none'} spellCheck={false} onChangeText={actions.setFilter} />
               <View style={styles.space} />
             </View>
@@ -40,7 +40,7 @@ export function Cards({ navigation, openContact, openRegistry, addChannel }) {
         ),
       });
     }
-  }, [navigation]);
+  }, [navigation, state.sort]);
 
   const call = async (contact) => {
     try {
@@ -57,29 +57,30 @@ export function Cards({ navigation, openContact, openRegistry, addChannel }) {
 
   return (
     <View style={styles.container}>
-      <View style={styles.title}>
-        { state.sort && (
-          <TouchableOpacity style={styles.sort} onPress={() => actions.setSort(false)}>
-            <MatIcons style={styles.icon} name="sort-ascending" size={24} color={Colors.text} />
+      { !navigation && (
+        <View style={styles.title}>
+          { state.sort && (
+            <TouchableOpacity style={styles.sort} onPress={() => actions.setSort(false)}>
+              <MatIcons style={styles.icon} name="sort-ascending" size={24} color={Colors.text} />
+            </TouchableOpacity>
+          )}
+          { !state.sort && (
+            <TouchableOpacity style={styles.sort} onPress={() => actions.setSort(true)}>
+              <MatIcons style={styles.icon} name="sort-ascending" size={24} color={Colors.unsetText} />
+            </TouchableOpacity>
+          )}
+          <View style={styles.inputwrapper}>
+            <AntIcons style={styles.icon} name="search1" size={16} color={Colors.inputPlaceholder} />
+            <TextInput placeholder={ state.strings.contactFilter } placeholderTextColor={Colors.inputPlaceholder} value={state.filter}
+                style={styles.inputfield} autoCapitalize={'none'} spellCheck={false} onChangeText={actions.setFilter} />
+            <View style={styles.space} />
+          </View>
+          <TouchableOpacity style={styles.add} onPress={() => openRegistry(navigation)}>
+            <AntIcons name={'adduser'} size={16} color={Colors.primaryButtonText} style={[styles.box, { transform: [ { rotateY: "180deg" }, ]} ]}/>
+            <Text style={styles.newtext}>{ state.strings.add }</Text>
           </TouchableOpacity>
-        )}
-        { !state.sort && (
-          <TouchableOpacity style={styles.sort} onPress={() => actions.setSort(true)}>
-            <MatIcons style={styles.icon} name="sort-ascending" size={24} color={Colors.unsetText} />
-          </TouchableOpacity>
-        )}
-        <View style={styles.inputwrapper}>
-          <AntIcons style={styles.icon} name="search1" size={16} color={Colors.inputPlaceholder} />
-          <TextInput placeholder={ state.strings.contactFilter } placeholderTextColor={Colors.inputPlaceholder} value={state.filter}
-              style={styles.inputfield} autoCapitalize={'none'} spellCheck={false} onChangeText={actions.setFilter} />
-          <View style={styles.space} />
         </View>
-        <TouchableOpacity style={styles.add} onPress={() => openRegistry(navigation)}>
-          <AntIcons name={'adduser'} size={16} color={Colors.primaryButtonText} style={[styles.box, { transform: [ { rotateY: "180deg" }, ]} ]}/>
-          <Text style={styles.newtext}>{ state.strings.add }</Text>
-        </TouchableOpacity>
-      </View>
-
+      )}
       { state.cards.length == 0 && (
         <View style={styles.notfound}>
           <Text style={styles.notfoundtext}>{ state.strings.noContacts }</Text>
diff --git a/app/mobile/src/session/cards/useCards.hook.js b/app/mobile/src/session/cards/useCards.hook.js
index 02ec46f3..9c6c51b0 100644
--- a/app/mobile/src/session/cards/useCards.hook.js
+++ b/app/mobile/src/session/cards/useCards.hook.js
@@ -111,6 +111,8 @@ export function useCards() {
       updateState({ filter });
     },
     setSort: (sort) => {
+console.log("SETTTING : ", sort);
+
       updateState({ sort });
     },
   };