From 68300a9b745c839eee53d2b6ebd958937105bdac Mon Sep 17 00:00:00 2001
From: KoalaSat <yv1vtrul@duck.com>
Date: Sun, 26 Feb 2023 20:20:03 +0100
Subject: [PATCH] Other inputs

---
 frontend/Pages/ContactsPage/index.tsx       |  2 +-
 frontend/Pages/ConversationsFeed/index.tsx  | 20 +++++++++++++++++++-
 frontend/Pages/GroupsFeed/index.tsx         | 21 ++++++++++++++++++++-
 frontend/Pages/ProfileConnectPage/index.tsx |  2 +-
 frontend/Pages/QrReaderPage/index.tsx       |  6 +-----
 5 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/frontend/Pages/ContactsPage/index.tsx b/frontend/Pages/ContactsPage/index.tsx
index ad24fc0..703592b 100644
--- a/frontend/Pages/ContactsPage/index.tsx
+++ b/frontend/Pages/ContactsPage/index.tsx
@@ -470,7 +470,7 @@ export const ContactsPage: React.FC = () => {
                 icon='qrcode'
                 onPress={() => {
                   bottomSheetAddContactRef.current?.close()
-                  navigate('QrReader', { callback: 'Contacts' })
+                  navigate('QrReader')
                 }}
                 forceTextInputFocus={false}
               />
diff --git a/frontend/Pages/ConversationsFeed/index.tsx b/frontend/Pages/ConversationsFeed/index.tsx
index 7b6b121..ae1b6c2 100644
--- a/frontend/Pages/ConversationsFeed/index.tsx
+++ b/frontend/Pages/ConversationsFeed/index.tsx
@@ -44,7 +44,7 @@ export const ConversationsFeed: React.FC = () => {
   const initialPageSize = 14
   const theme = useTheme()
   const { t } = useTranslation('common')
-  const { database, refreshBottomBarAt } = useContext(AppContext)
+  const { database, refreshBottomBarAt, qrReader, setQrReader } = useContext(AppContext)
   const [pageSize, setPageSize] = useState<number>(initialPageSize)
   const { publicKey, privateKey } = useContext(UserContext)
   const { relayPool, lastEventId } = useContext(RelayPoolContext)
@@ -72,6 +72,13 @@ export const ConversationsFeed: React.FC = () => {
     loadDirectMessages(false)
   }, [lastEventId, refreshBottomBarAt])
 
+  useEffect(() => {
+    if (qrReader) {
+      setQrReader(undefined)
+      navigate('Conversation', { pubKey: qrReader, title: qrReader })
+    }
+  }, [qrReader])
+
   const loadDirectMessages: (subscribe: boolean) => void = (subscribe) => {
     if (database && publicKey) {
       getGroupedDirectMessages(database, { limit: pageSize }).then((results) => {
@@ -329,6 +336,17 @@ export const ConversationsFeed: React.FC = () => {
                 forceTextInputFocus={false}
               />
             }
+            left={
+              <TextInput.Icon
+                icon='qrcode'
+                onPress={() => {
+                  bottomSheetCreateRef.current?.close()
+                  bottomSheetPubKeyRef.current?.close()
+                  navigate('QrReader')
+                }}
+                forceTextInputFocus={false}
+              />
+            }
           />
           <Button
             mode='contained'
diff --git a/frontend/Pages/GroupsFeed/index.tsx b/frontend/Pages/GroupsFeed/index.tsx
index e8ce65a..1388d83 100644
--- a/frontend/Pages/GroupsFeed/index.tsx
+++ b/frontend/Pages/GroupsFeed/index.tsx
@@ -42,7 +42,7 @@ import { getNip19Key } from '../../lib/nostr/Nip19'
 export const GroupsFeed: React.FC = () => {
   const { t } = useTranslation('common')
   const theme = useTheme()
-  const { database } = useContext(AppContext)
+  const { database, qrReader, setQrReader } = useContext(AppContext)
   const { publicKey } = useContext(UserContext)
   const { relayPool, lastEventId, lastConfirmationtId } = useContext(RelayPoolContext)
   const bottomSheetSearchRef = React.useRef<RBSheet>(null)
@@ -73,6 +73,14 @@ export const GroupsFeed: React.FC = () => {
 
   useEffect(() => {}, [newMessages, newMentions])
 
+  useEffect(() => {
+    if (qrReader) {
+      setSearchGroup(qrReader)
+      setQrReader(undefined)
+      onAddGroup()
+    }
+  }, [qrReader])
+
   const pastePicture: () => void = () => {
     Clipboard.getString().then((value) => {
       setNewGroupPicture(value ?? '')
@@ -364,6 +372,17 @@ export const GroupsFeed: React.FC = () => {
                 forceTextInputFocus={false}
               />
             }
+            left={
+              <TextInput.Icon
+                icon='qrcode'
+                onPress={() => {
+                  bottomSheetFabActionRef.current?.close()
+                  bottomSheetSearchRef.current?.close()
+                  navigate('QrReader')
+                }}
+                forceTextInputFocus={false}
+              />
+            }
           />
           <Button mode='contained' disabled={!searchGroup} onPress={onAddGroup}>
             {t('groupsFeed.add')}
diff --git a/frontend/Pages/ProfileConnectPage/index.tsx b/frontend/Pages/ProfileConnectPage/index.tsx
index bfcf1ee..aad01cc 100644
--- a/frontend/Pages/ProfileConnectPage/index.tsx
+++ b/frontend/Pages/ProfileConnectPage/index.tsx
@@ -177,7 +177,7 @@ export const ProfileConnectPage: React.FC<ProfileConnectPageProps> = ({ route })
               left={
                 <TextInput.Icon
                   icon='qrcode'
-                  onPress={() => navigate('QrReader', { callback: 'ProfileConnect' })}
+                  onPress={() => navigate('QrReader')}
                   forceTextInputFocus={false}
                 />
               }
diff --git a/frontend/Pages/QrReaderPage/index.tsx b/frontend/Pages/QrReaderPage/index.tsx
index 617b17d..4fbf2b0 100644
--- a/frontend/Pages/QrReaderPage/index.tsx
+++ b/frontend/Pages/QrReaderPage/index.tsx
@@ -8,11 +8,7 @@ import { useTranslation } from 'react-i18next'
 import { goBack } from '../../lib/Navigation'
 import { AppContext } from '../../Contexts/AppContext'
 
-interface QrReaderPageProps {
-  route: { params: { callback: string } }
-}
-
-export const QrReaderPage: React.FC<QrReaderPageProps> = ({ route }) => {
+export const QrReaderPage: React.FC = () => {
   const theme = useTheme()
   const { t } = useTranslation('common')
   const { setQrReader } = React.useContext(AppContext)