Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up add member screen #114

Merged
merged 5 commits into from
May 31, 2024
Merged

Clean up add member screen #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc7a23e
Add member screen styling
saulmc May 30, 2024
b144508
Add member screen styling
saulmc May 31, 2024
a939681
remove extra top padding
saulmc May 31, 2024
8e02eba
fix lint and tsc
May 31, 2024
9c74f98
fixes
May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions ios/EphemeraMobileChat.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/components/ConversationListHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand Down
11 changes: 8 additions & 3 deletions src/i18n/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"create_group": "Create"
"create_group": "Create",

"create_group": "Create"
}
6 changes: 3 additions & 3 deletions src/navigation/AppNavigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -87,8 +87,8 @@ export const AppNavigation = () => {
component={NewConversationScreen}
/>
<AuthenticatedStack.Screen
name={ScreenNames.Search}
component={SearchScreen}
name={ScreenNames.CreateGroup}
component={CreateGroupScreen}
options={{
presentation: 'modal',
}}
Expand Down
2 changes: 1 addition & 1 deletion src/navigation/ScreenNames.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/navigation/StackParams.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/navigation/linkingDefinition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
Expand Down
Loading
Loading