Skip to content

Commit 613222f

Browse files
BilbBilb
committed
chore: remove unneeded .toString() calls on localize calls
1 parent fc4fa53 commit 613222f

File tree

10 files changed

+34
-48
lines changed

10 files changed

+34
-48
lines changed

‎ts/components/conversation/header/ConversationHeader.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ function RecreateGroupButton() {
161161
showRecreateGroupModal(name || localize('groupUnknown').toString(), members);
162162
}}
163163
>
164-
{localize('recreateGroup').toString()}
164+
{localize('recreateGroup')}
165165
</SessionButton>
166166
</RecreateGroupContainer>
167167
);

‎ts/components/conversation/message/message-content/MessageContextMenu.tsx‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,17 +172,15 @@ const CommunityAdminActionItems = ({ messageId }: WithMessageId) => {
172172

173173
return (
174174
<>
175-
<ItemWithDataTestId onClick={banUserCb}>{localize('banUser').toString()}</ItemWithDataTestId>
176-
<ItemWithDataTestId onClick={unbanUserCb}>
177-
{localize('banUnbanUser').toString()}
178-
</ItemWithDataTestId>
175+
<ItemWithDataTestId onClick={banUserCb}>{localize('banUser')}</ItemWithDataTestId>
176+
<ItemWithDataTestId onClick={unbanUserCb}>{localize('banUnbanUser')}</ItemWithDataTestId>
179177
{isSenderAdmin ? (
180178
<ItemWithDataTestId onClick={removeModerator}>
181-
{localize('adminRemoveAsAdmin').toString()}
179+
{localize('adminRemoveAsAdmin')}
182180
</ItemWithDataTestId>
183181
) : (
184182
<ItemWithDataTestId onClick={addModerator}>
185-
{localize('adminPromoteToAdmin').toString()}
183+
{localize('adminPromoteToAdmin')}
186184
</ItemWithDataTestId>
187185
)}
188186
</>

‎ts/components/conversation/right-panel/overlay/message-info/OverlayMessageInfo.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ export const OverlayMessageInfo = () => {
331331
closeButtonOnClick={closePanel}
332332
paddingTop="var(--margins-2xl)"
333333
>
334-
<HeaderTitle>{localize('messageInfo').toString()}</HeaderTitle>
334+
<HeaderTitle>{localize('messageInfo')}</HeaderTitle>
335335
</Header>
336336
<StyledMessageInfoContainer>
337337
<MessageBody

‎ts/components/dialog/conversationSettings/conversationSettingsDialog.tsx‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { AnimatePresence } from 'framer-motion';
2-
import styled from 'styled-components';
32
import { useDispatch } from 'react-redux';
43
import { noop } from 'lodash';
54

@@ -17,12 +16,6 @@ import { assertUnreachable } from '../../../types/sqlSharedTypes';
1716
import { NotificationsPage } from './pages/notifications/NotificationPage';
1817
import { useShowConversationSettingsFor } from '../../menuAndSettingsHooks/useShowConversationSettingsFor';
1918

20-
const StyledContent = styled(Flex)`
21-
/* position: absolute; */
22-
/* top: 10vh;
23-
max-height: 80vh; */
24-
`;
25-
2619
function useTitleFromPage(page: ConversationSettingsModalPage | undefined) {
2720
switch (page) {
2821
case 'disappearing_message':
@@ -116,15 +109,15 @@ export function ConversationSettingsDialog(props: ConversationSettingsModalState
116109
$contentMinWidth="400px"
117110
bigHeader={true}
118111
>
119-
<StyledContent
112+
<Flex
120113
$container={true}
121114
$flexDirection="column"
122115
$alignItems="flex-start"
123116
padding="var(--margins-sm) 0"
124117
width="100%"
125118
>
126119
<PageToRender conversationId={props.conversationId} />
127-
</StyledContent>
120+
</Flex>
128121
</SessionWrapperModal2>
129122
</AnimatePresence>
130123
);

‎ts/components/dialog/conversationSettings/conversationSettingsHeader.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ function Description({ conversationId }: WithConvoId) {
148148
</StyledDescription>
149149
{isClamped && (
150150
<StyledViewMoreButton onClick={() => setExpanded(!expanded)}>
151-
{expanded ? localize('viewLess').toString() : localize('viewMore').toString()}
151+
{expanded ? localize('viewLess') : localize('viewMore')}
152152
</StyledViewMoreButton>
153153
)}
154154
</>

‎ts/components/dialog/conversationSettings/pages/disappearing-messages/DisappearingMessagesPage.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,10 @@ export const DisappearingMessagesPage = () => {
167167
<Flex $container={true} $flexDirection={'column'} $alignItems={'center'}>
168168
<HeaderSubtitle>
169169
{singleMode === 'deleteAfterRead'
170-
? localize('disappearingMessagesDisappearAfterReadDescription').toString()
170+
? localize('disappearingMessagesDisappearAfterReadDescription')
171171
: singleMode === 'deleteAfterSend'
172-
? localize('disappearingMessagesDisappearAfterSendDescription').toString()
173-
: localize('disappearingMessagesDescription1').toString()}
172+
? localize('disappearingMessagesDisappearAfterSendDescription')
173+
: localize('disappearingMessagesDescription1')}
174174
</HeaderSubtitle>
175175
<DisappearingModes
176176
options={disappearingModeOptions}
@@ -201,9 +201,9 @@ export const DisappearingMessagesPage = () => {
201201
<SpacerLG />
202202
{/* We want those to be shown no matter our admin rights in a group. */}
203203
<StyledNonAdminDescription>
204-
{localize('disappearingMessagesDescription').toString()}
204+
{localize('disappearingMessagesDescription')}
205205
<br />
206-
{localize('disappearingMessagesOnlyAdmins').toString()}
206+
{localize('disappearingMessagesOnlyAdmins')}
207207
</StyledNonAdminDescription>
208208
</>
209209
)}
@@ -225,7 +225,7 @@ export const DisappearingMessagesPage = () => {
225225
}
226226
dataTestId={'disappear-set-button'}
227227
>
228-
{localize('set').toString()}
228+
{localize('set')}
229229
</SessionButton>
230230
)}
231231
</StyledButtonContainer>

‎ts/components/dialog/conversationSettings/pages/notifications/NotificationPage.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export const NotificationsPage = () => {
132132
<ButtonSpacer />
133133
<StyledButtonContainer>
134134
<SessionButton onClick={handleSetNotifications} dataTestId={'notifications-set-button'}>
135-
{localize('set').toString()}
135+
{localize('set')}
136136
</SessionButton>
137137
</StyledButtonContainer>
138138
</Flex>

‎ts/components/menu/Menu.tsx‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export const InviteContactMenuItem = (): JSX.Element | null => {
5858
if (showInviteContactCb) {
5959
return (
6060
<ItemWithDataTestId onClick={showInviteContactCb}>
61-
{localize('membersInvite').toString()}
61+
{localize('membersInvite')}
6262
</ItemWithDataTestId>
6363
);
6464
}
@@ -108,7 +108,7 @@ export const DeletePrivateContactMenuItem = () => {
108108

109109
return (
110110
<ItemWithDataTestId onClick={showDeletePrivateContactCb}>
111-
{localize('contactDelete').toString()}
111+
{localize('contactDelete')}
112112
</ItemWithDataTestId>
113113
);
114114
};
@@ -134,7 +134,7 @@ export const ShowUserDetailsMenuItem = () => {
134134
);
135135
}}
136136
>
137-
{window.i18n('contactUserDetails')}
137+
{localize('contactUserDetails')}
138138
</ItemWithDataTestId>
139139
);
140140
}
@@ -155,7 +155,7 @@ export const UpdateGroupNameMenuItem = () => {
155155
void showUpdateGroupNameByConvoId(convoId);
156156
}}
157157
>
158-
{localize('groupEdit').toString()}
158+
{localize('groupEdit')}
159159
</ItemWithDataTestId>
160160
);
161161
}
@@ -171,7 +171,7 @@ export const RemoveModeratorsMenuItem = (): JSX.Element | null => {
171171
}
172172
return (
173173
<ItemWithDataTestId onClick={showRemoveModeratorsCb}>
174-
{localize('adminRemove').toString()}
174+
{localize('adminRemove')}
175175
</ItemWithDataTestId>
176176
);
177177
};
@@ -185,7 +185,7 @@ export const AddModeratorsMenuItem = (): JSX.Element | null => {
185185
}
186186
return (
187187
<ItemWithDataTestId onClick={addRemoveModeratorsCb}>
188-
{localize('adminPromote').toString()}
188+
{localize('adminPromote')}
189189
</ItemWithDataTestId>
190190
);
191191
};
@@ -198,9 +198,7 @@ export const UnbanMenuItem = (): JSX.Element | null => {
198198
return null;
199199
}
200200
return (
201-
<ItemWithDataTestId onClick={showUnbanUserCb}>
202-
{localize('banUnbanUser').toString()}
203-
</ItemWithDataTestId>
201+
<ItemWithDataTestId onClick={showUnbanUserCb}>{localize('banUnbanUser')}</ItemWithDataTestId>
204202
);
205203
};
206204

@@ -212,11 +210,7 @@ export const BanMenuItem = (): JSX.Element | null => {
212210
if (!showBanUserCb) {
213211
return null;
214212
}
215-
return (
216-
<ItemWithDataTestId onClick={showBanUserCb}>
217-
{localize('banUser').toString()}
218-
</ItemWithDataTestId>
219-
);
213+
return <ItemWithDataTestId onClick={showBanUserCb}>{localize('banUser')}</ItemWithDataTestId>;
220214
};
221215

222216
export const MarkAllReadMenuItem = (): JSX.Element | null => {
@@ -226,7 +220,7 @@ export const MarkAllReadMenuItem = (): JSX.Element | null => {
226220
return (
227221
// eslint-disable-next-line @typescript-eslint/no-misused-promises
228222
<ItemWithDataTestId onClick={async () => markAllReadByConvoId(convoId)}>
229-
{window.i18n('messageMarkRead')}
223+
{localize('messageMarkRead')}
230224
</ItemWithDataTestId>
231225
);
232226
}
@@ -243,7 +237,7 @@ export const BlockMenuItem = (): JSX.Element | null => {
243237

244238
return (
245239
<ItemWithDataTestId onClick={showBlockUnblock.cb}>
246-
{localize(showBlockUnblock.token).toString()}
240+
{localize(showBlockUnblock.token)}
247241
</ItemWithDataTestId>
248242
);
249243
};
@@ -295,7 +289,7 @@ export const DeleteMessagesMenuItem = () => {
295289
return (
296290
<ItemWithDataTestId onClick={clearAllMessagesCb}>
297291
{/* just more than 1 to have the string Delete Messages */}
298-
{localize('clearMessages').toString()}
292+
{localize('clearMessages')}
299293
</ItemWithDataTestId>
300294
);
301295
};
@@ -444,7 +438,7 @@ export const NotificationForConvoMenuItem = (): JSX.Element | null => {
444438
return (
445439
// Remove the && false to make context menu work with RTL support
446440
<Submenu
447-
label={window.i18n('sessionNotifications') as any}
441+
label={localize('sessionNotifications')}
448442
// rtl={isRtlMode && false}
449443
>
450444
{(notificationForConvoOptions || []).map(item => {

‎ts/hooks/useContactsToInviteToGroup.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import type { SearchType } from '../state/ducks/search';
1515
/**
1616
* Returns the 05 pubkeys of contacts that we can invite to a group.
1717
* The group can be empty so we can use that list on creation
18-
*
1918
*/
2019
export const useContactsToInviteTo = (searchType: SearchType, conversationId?: string) => {
2120
const isSearch = useIsSearchingForType(searchType);

‎ts/state/ducks/search.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,13 @@ async function queryContactsAndGroups(providedQuery: string, options: SearchOpti
8383
// we don't need to use cleanSearchTerm here because the query is wrapped as a wild card and is not referenced in the SQL query directly
8484
const query = providedQuery.replace(/[+-.()]*/g, '');
8585

86-
const searchResults: Array<ReduxConversationType> = (
87-
await Data.searchConversations(query)
88-
).filter(c => (options.excludeBlocked ? !BlockedNumberController.isBlocked(c.id) : true));
86+
const searchResults: Array<ReduxConversationType> = await Data.searchConversations(query);
8987

90-
let contactsAndGroups: Array<string> = searchResults.map(conversation => conversation.id);
88+
const filteredResults = options.excludeBlocked
89+
? searchResults.filter(c => !BlockedNumberController.isBlocked(c.id))
90+
: searchResults;
91+
92+
let contactsAndGroups: Array<string> = filteredResults.map(conversation => conversation.id);
9193

9294
const queryLowered = query.toLowerCase();
9395
if (

0 commit comments

Comments
 (0)