Merge branch 'main' of https://github.com/balzack/databag into main

README.md

@@ -85,9 +85,9 @@ From Your Browser:
 
 ### Other installation options
 
-Instruction for installing without a container on a Raspberry Pi Zero are [here](/doc/pizero.md).
+Instructions for installing without a container on a Raspberry Pi Zero are [here](/doc/pizero.md).
 
-Instruction for installing without a container in AWS are [here](/doc/aws.md).
+Instructions for installing without a container in AWS are [here](/doc/aws.md).
 
 ## Audio and Video Calls
 

app/mobile/ios/Databag.xcodeproj/project.pbxproj

@@ -622,7 +622,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.13;
+				MARKETING_VERSION = 1.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -656,7 +656,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.13;
+				MARKETING_VERSION = 1.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

app/mobile/src/context/useCardContext.hook.js

@@ -186,7 +186,7 @@ export function useCardContext() {
               }
               catch (err) {
                 console.log(err);
-                entry.offsync = true;
+                entry.card.offsync = true;
                 await store.actions.setCardItemOffsync(guid, card.id);
               }
             }

app/mobile/src/context/useConversationContext.hook.js

@@ -354,7 +354,7 @@ export function useConversationContext() {
       else if (channelId) {
         channel.actions.setTopicFlag(channelId, topicId);
       }
-      setTopicField(topicId, 'blocked', 1);
+      setTopicField(topicId, 'blocked', true);
       updateState({ topics: topics.current });
     },
     clearTopicFlag: async (topicId) => {
@@ -365,7 +365,7 @@ export function useConversationContext() {
       else if (channelId) {
         channel.actions.clearTopicFlag(channelId, topicId);
       }
-      setTopicField(topicId, 'blocked', 0);
+      setTopicField(topicId, 'blocked', false);
       updateState({ topics: topics.current });
     },
     getTopicAssetUrl: (topicId, assetId) => {

app/mobile/src/context/useStoreContext.hook.js

@@ -180,8 +180,8 @@ export function useStoreContext() {
         notifiedProfile: card.notified_profile,
         notifiedArticle: card.notified_article,
         notifiedChannel: card.notified_channel,
-        offsync: card.offsync,
-        blocked: card.blocked,
+        offsync: card.offsync === 1,
+        blocked: card.blocked === 1,
       }));
     },
 

app/mobile/src/session/cards/cardItem/CardItem.jsx

@@ -35,10 +35,10 @@ export function CardItem({ item, openContact, enableIce, call, message }) {
               )}
             </View>
           )}
-          { item.status === 'connected' && item.offsync === 1 && (
+          { item.status === 'connected' && item.offsync && (
             <View style={styles.offsync} />
           )}
-          { item.status === 'connected' && item.offsync !== 1 && (
+          { item.status === 'connected' && !item.offsync && (
             <View style={styles.connected} />
           )}
           { item.status === 'requested' && (

app/mobile/src/session/cardsIcon/useCardIcon.hook.js

@@ -22,7 +22,7 @@ export function useCardIcon() {
       if (status === 'pending' || status === 'requested') {
         requested = true;
       }
-      if (item.card?.offsync) {
+      if (item.card?.offsync && status === 'connected') {
         offsync = true;
       }
     });

app/mobile/src/session/contact/Contact.jsx

@@ -12,6 +12,7 @@ export function ContactHeader({ contact }) {
 }
 
 export function ContactBody({ contact }) {
+
   const { state, actions } = useContact(contact);
 
   const getStatusText = (status) => {
@@ -198,6 +199,11 @@ export function ContactBody({ contact }) {
             <TouchableOpacity style={styles.button} onPress={reportContact}>
               <Text style={styles.buttonText}>Report Contact</Text>
             </TouchableOpacity>
+            { state.offsync && (
+              <TouchableOpacity style={styles.alert} onPress={actions.resync}>
+                <Text>Resync Contact</Text>
+              </TouchableOpacity>
+            )}
           </>
         )}
         { state.status === 'connecting' && (
@@ -286,11 +292,6 @@ export function ContactBody({ contact }) {
             </TouchableOpacity>
           </>
         )}
-        { state.offsync && (
-          <TouchableOpacity style={styles.alert} onPress={actions.resync}>
-            <Text style={styles.alertText}>Resync Contact</Text>
-          </TouchableOpacity>
-        )}
       </View>
     </View>
   );

app/mobile/src/session/conversation/useConversation.hook.js

@@ -91,7 +91,7 @@ export function useConversation() {
       }
       return -1;
     });
-    const filtered = sorted.filter(item => !(item.blocked === 1));
+    const filtered = sorted.filter(item => !(item.blocked));
 
     updateState({ hosted, loaded, logo, subject, topics: filtered, delayed: false });