Merge pull request #114 from xmtp-labs/saulmc/add-members

Clean up add member screen
ephemeraHQ · May 31, 2024 · f33ac48 · f33ac48
2 parents 84b8e13 + 9c74f98
commit f33ac48
Show file tree

Hide file tree

Showing 9 changed files with 144 additions and 111 deletions.
diff --git a/ios/EphemeraMobileChat.xcodeproj/project.pbxproj b/ios/EphemeraMobileChat.xcodeproj/project.pbxproj
@@ -672,11 +672,7 @@
 					"-DFOLLY_USE_LIBCPP=1",
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 5.0;
@@ -745,11 +741,7 @@
 					"-DFOLLY_USE_LIBCPP=1",
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 5.0;

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1666,8 +1666,8 @@ SPEC CHECKSUMS:
   web3.swift: 2263d1e12e121b2c42ffb63a5a7beb1acaf33959
   XMTP: 1deb40ac712ba315dcfdecd590a9b924d8c2241a
   XMTPReactNative: ffc7fb00c38f3d3f8af038ae5d1f9712cac0bb5f
-  Yoga: 2a16e58450c48e110211dae1159fb114bbcdcfc0
+  Yoga: e5b887426cee15d2a326bdd34afc0282fc0486ad
 
 PODFILE CHECKSUM: 47641fd2f7a6fc6169785131e7615d136e56edd8
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.14.3
diff --git a/src/components/ConversationListHeader.tsx b/src/components/ConversationListHeader.tsx
@@ -23,7 +23,7 @@ export const ConversationListHeader: FC<ConversationListHeaderProps> = () => {
   const {avatarUrl} = useContactInfo(address);
 
   const handleNewMessagePress = useCallback(() => {
-    navigate(ScreenNames.Search);
+    navigate(ScreenNames.CreateGroup);
   }, [navigate]);
 
   const handleAccountPress = useCallback(() => {

diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
@@ -18,7 +18,8 @@
   "no": "No",
   "yes": "Yes",
   "start": "Start",
-  "recents": "Recents",
+
+  "recents": "Recent",
   "contacts": "Contacts",
   "your_interoperable_web3_inbox": "Your interoperable web3 inbox",
   "youre_just_a_few_steps_away_from_secure_wallet_to_wallet_messaging": "You're just a few steps away from secure, wallet-to-wallet messaging",
@@ -43,6 +44,7 @@
   "guest_wallet": "Guest Wallet",
   "group_changed": "Group Changed",
   "add_to_group": "Add",
+  "add_members_to_group": "Add members",
   "group": "Group",
   "dev_screen": "Dev Screen",
   "client": "Client",
@@ -68,5 +70,8 @@
   "reply": "Reply",
   "conversation_replying_to": "Replying to %{name}",
   "replied_to": "Replied to an earlier message",
-  "group_chats": "Group Chats"
-}
+  "group_chats": "Group Chats",
+
+  "cancel": "Cancel",
+  "create_group": "Create"
+}
diff --git a/src/navigation/AppNavigation.tsx b/src/navigation/AppNavigation.tsx
@@ -5,14 +5,14 @@ import {Platform} from 'react-native';
 import {useClientContext} from '../context/ClientContext';
 import {AccountSettingsScreen} from '../screens/AccountSettingsScreen';
 import {ConversationListScreen} from '../screens/ConversationListScreen';
+import {CreateGroupScreen} from '../screens/CreateGroupScreen';
 import {DevScreen} from '../screens/DevScreen';
 import {GroupScreen} from '../screens/GroupScreen';
 import {LoadingScreen} from '../screens/LoadingScreen';
 import {NewConversationScreen} from '../screens/NewConversationScreen';
 import {OnboardingConnectWalletScreen} from '../screens/OnboardingConnectWalletScreen';
 import {OnboardingEnableIdentityScreen} from '../screens/OnboardingEnableIdentityScreen';
 import {QrCodeScreen} from '../screens/QrCodeScreen';
-import {SearchScreen} from '../screens/SearchScreen';
 import {UserProfilesScreen} from '../screens/UserProfilesScreen';
 import {ScreenNames} from './ScreenNames';
 import {
@@ -87,8 +87,8 @@ export const AppNavigation = () => {
             component={NewConversationScreen}
           />
           <AuthenticatedStack.Screen
-            name={ScreenNames.Search}
-            component={SearchScreen}
+            name={ScreenNames.CreateGroup}
+            component={CreateGroupScreen}
             options={{
               presentation: 'modal',
             }}

diff --git a/src/navigation/ScreenNames.ts b/src/navigation/ScreenNames.ts
@@ -10,7 +10,7 @@ export enum ScreenNames {
   ConversationList = 'conversation_list',
   Group = 'group',
   NewConversation = 'new_conversation',
-  Search = 'search',
+  CreateGroup = 'create_group',
   QRCode = 'qr_code',
   UserProfiles = 'user_profiles',
   Dev = 'dev',

diff --git a/src/navigation/StackParams.ts b/src/navigation/StackParams.ts
@@ -14,7 +14,7 @@ export type AuthenticatedStackParams = {
   [ScreenNames.ConversationList]: undefined;
   [ScreenNames.Group]: {topic: string};
   [ScreenNames.NewConversation]: {addresses: string[]};
-  [ScreenNames.Search]: undefined;
+  [ScreenNames.CreateGroup]: undefined;
   [ScreenNames.QRCode]: undefined;
   [ScreenNames.UserProfiles]: {address: string};
   [ScreenNames.Dev]: undefined;

diff --git a/src/navigation/linkingDefinition.ts b/src/navigation/linkingDefinition.ts
@@ -20,7 +20,7 @@ export const linkingDefinition: LinkingOptions<RootStackParams> = {
           addresses: addresses => addresses.split(','),
         },
       },
-      [ScreenNames.Search]: 'search',
+      [ScreenNames.CreateGroup]: 'create_group',
       [ScreenNames.QRCode]: 'qr_code',
       [ScreenNames.UserProfiles]: 'user_profiles',
     },