Merge branch 'main' into asset

README.md

@@ -24,7 +24,7 @@ Databag is a self-hosted messaging service. Notable features include:
 - Federated (accounts on different nodes can communicate)
 - Public-Private key based identity (not bound to any blockchain or hosting domain)
 - End-to-End encryption (the hosting admin cannot view sealed topics, deafult unsealed)
-- Audio and Video Calls (nat tranversal requires separate relay server)
+- Audio and Video Calls (nat traversal requires separate relay server)
 - Topic based threads (messages organized by topic not contacts)
 - Lightweight (server can run on a raspberry pi zero v1.3)
 - Low latency (use of websockets for push events to avoid polling)

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

@@ -48,7 +48,7 @@ export function useAppContext() {
         }
         catch (err) {
           console.log(err);
-          Alert.alert('FCM', err.toString());
+          //Alert.alert('FCM', err.toString());
         }
       }
       catch (err) {

app/mobile/src/session/Session.jsx

@@ -216,7 +216,7 @@ function HomeScreen({ navParams }) {
           </TouchableOpacity>
         </View>
         <View style={styles.channels}>
-          <Channels dmChannel={navParams.dmChannel} shareChannel={shareChannel} cardId={cardId} channelId={channelId} openConversation={setConversation} />
+          <Channels dmChannel={navParams.dmChannel} shareChannel={navParams.shareChannel} cardId={cardId} channelId={channelId} openConversation={setConversation} />
         </View>
       </SafeAreaView>
       <View style={styles.conversation}>

app/mobile/src/session/conversation/addTopic/useAddTopic.hook.js

@@ -38,7 +38,7 @@ export function useAddTopic(contentKey) {
 
   useEffect(() => {
     let conflict = false;
-    if (state.locked) {
+    if (state.locked && state.assets.length > 0) {
       conflict = true;
     }
     state.assets.forEach(asset => {