From 41d27609279d990a3b4cd50a6cf6585180b140a5 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Mon, 10 Jul 2023 17:49:57 +1000
Subject: [PATCH] fix: removed duplicate imports and ordered localised keys

---
 ts/components/dialog/EditProfileDialog.tsx |   5 -
 ts/types/LocalizerKeys.ts                  | 324 ++++++---------------
 2 files changed, 91 insertions(+), 238 deletions(-)

diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx
index d1c1b28fb..96f62af5a 100644
--- a/ts/components/dialog/EditProfileDialog.tsx
+++ b/ts/components/dialog/EditProfileDialog.tsx
@@ -15,16 +15,11 @@ import { SessionButton, SessionButtonType } from '../basic/SessionButton';
 import { SessionSpinner } from '../basic/SessionSpinner';
 import { SessionIconButton } from '../icon';
 import { sanitizeSessionUsername } from '../../session/utils/String';
-import { setLastProfileUpdateTimestamp } from '../../util/storage';
 import { ConversationTypeEnum } from '../../models/conversationAttributes';
 import { MAX_USERNAME_BYTES } from '../../session/constants';
 import styled from 'styled-components';
-import { saveQRCode } from '../../util/saveQRCode';
 import { useOurAvatarPath, useOurConversationUsername } from '../../hooks/useParamSelector';
 import { useDispatch } from 'react-redux';
-import styled from 'styled-components';
-import { ConversationTypeEnum } from '../../models/conversationAttributes';
-import { MAX_USERNAME_BYTES } from '../../session/constants';
 
 const handleSaveQRCode = (event: MouseEvent) => {
   event.preventDefault();
diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts
index 100809db0..9f6118474 100644
--- a/ts/types/LocalizerKeys.ts
+++ b/ts/types/LocalizerKeys.ts
@@ -15,85 +15,46 @@ export type LocalizerKeys =
   | 'appMenuHideOthers'
   | 'appMenuQuit'
   | 'appMenuUnhide'
-  | 'appMenuQuit'
-  | 'editMenuUndo'
-  | 'editMenuRedo'
-  | 'editMenuCut'
-  | 'editMenuCopy'
-  | 'editMenuPaste'
-  | 'editMenuDeleteContact'
-  | 'editMenuDeleteGroup'
-  | 'editMenuSelectAll'
-  | 'windowMenuClose'
-  | 'windowMenuMinimize'
-  | 'windowMenuZoom'
-  | 'viewMenuResetZoom'
-  | 'viewMenuZoomIn'
-  | 'viewMenuZoomOut'
-  | 'viewMenuToggleFullScreen'
-  | 'viewMenuToggleDevTools'
-  | 'contextMenuNoSuggestions'
-  | 'openGroupInvitation'
-  | 'joinOpenGroupAfterInvitationConfirmationTitle'
-  | 'joinOpenGroupAfterInvitationConfirmationDesc'
-  | 'couldntFindServerMatching'
-  | 'enterSessionIDOrONSName'
-  | 'startNewConversationBy...'
-  | 'loading'
-  | 'done'
-  | 'youLeftTheGroup'
-  | 'youGotKickedFromGroup'
-  | 'unreadMessages'
-  | 'debugLogExplanation'
-  | 'reportIssue'
-  | 'markAllAsRead'
-  | 'incomingError'
-  | 'media'
-  | 'mediaEmptyState'
-  | 'document'
-  | 'documents'
-  | 'documentsEmptyState'
-  | 'today'
-  | 'yesterday'
-  | 'thisWeek'
-  | 'thisMonth'
-  | 'voiceMessage'
-  | 'stagedPreviewThumbnail'
-  | 'previewThumbnail'
-  | 'stagedImageAttachment'
-  | 'oneNonImageAtATimeToast'
-  | 'cannotMixImageAndNonImageAttachments'
-  | 'maximumAttachments'
-  | 'fileSizeWarning'
-  | 'unableToLoadAttachment'
-  | 'offline'
-  | 'debugLog'
-  | 'showDebugLog'
-  | 'shareBugDetails'
-  | 'goToReleaseNotes'
-  | 'goToSupportPage'
-  | 'about'
-  | 'show'
-  | 'sessionMessenger'
-  | 'noSearchResults'
-  | 'conversationsHeader'
-  | 'contactsHeader'
-  | 'messagesHeader'
-  | 'searchMessagesHeader'
-  | 'settingsHeader'
-  | 'typingAlt'
-  | 'contactAvatarAlt'
-  | 'downloadAttachment'
-  | 'replyToMessage'
-  | 'replyingToMessage'
-  | 'originalMessageNotFound'
-  | 'you'
-  | 'audioPermissionNeededTitle'
-  | 'audioPermissionNeeded'
-  | 'image'
+  | 'appearanceSettingsTitle'
+  | 'areYouSureClearDevice'
+  | 'areYouSureDeleteDeviceOnly'
+  | 'areYouSureDeleteEntireAccount'
   | 'audio'
-  | 'video'
-  | 'photo'
+  | 'audioMessageAutoplayDescription'
+  | 'audioMessageAutoplayTitle'
+  | 'audioNotificationsSettingsTitle'
+  | 'audioPermissionNeeded'
+  | 'audioPermissionNeededTitle'
+  | 'autoUpdateDownloadButtonLabel'
+  | 'autoUpdateDownloadInstructions'
+  | 'autoUpdateDownloadedMessage'
+  | 'autoUpdateLaterButtonLabel'
+  | 'autoUpdateNewVersionInstructions'
+  | 'autoUpdateNewVersionMessage'
+  | 'autoUpdateNewVersionTitle'
+  | 'autoUpdateRestartButtonLabel'
+  | 'autoUpdateSettingDescription'
+  | 'autoUpdateSettingTitle'
+  | 'banUser'
+  | 'banUserAndDeleteAll'
+  | 'beginYourSession'
+  | 'block'
+  | 'blocked'
+  | 'blockedSettingsTitle'
+  | 'callMediaPermissionsDescription'
+  | 'callMediaPermissionsDialogContent'
+  | 'callMediaPermissionsDialogTitle'
+  | 'callMediaPermissionsTitle'
+  | 'callMissed'
+  | 'callMissedCausePermission'
+  | 'callMissedNotApproved'
+  | 'callMissedTitle'
+  | 'cameraPermissionNeeded'
+  | 'cameraPermissionNeededTitle'
+  | 'cancel'
+  | 'cannotMixImageAndNonImageAttachments'
+  | 'cannotRemoveCreatorFromGroup'
+  | 'cannotRemoveCreatorFromGroupDesc'
   | 'cannotUpdate'
   | 'cannotUpdateDetail'
   | 'changeAccountPasswordDescription'
@@ -163,12 +124,13 @@ export type LocalizerKeys =
   | 'deleteAccountFromLogin'
   | 'deleteAccountWarning'
   | 'deleteContactConfirmation'
+  | 'deleteConversation'
   | 'deleteConversationConfirmation'
   | 'deleteForEveryone'
   | 'deleteJustForMe'
   | 'deleteMessageQuestion'
   | 'deleteMessages'
-  | 'deleteConversation'
+  | 'deleteMessagesQuestion'
   | 'deleted'
   | 'destination'
   | 'device'
@@ -184,6 +146,7 @@ export type LocalizerKeys =
   | 'displayName'
   | 'displayNameEmpty'
   | 'displayNameTooLong'
+  | 'document'
   | 'documents'
   | 'documentsEmptyState'
   | 'done'
@@ -233,6 +196,7 @@ export type LocalizerKeys =
   | 'hideRequestBanner'
   | 'hideRequestBannerDescription'
   | 'iAmSure'
+  | 'image'
   | 'imageAttachmentAlt'
   | 'imageCaptionIconAlt'
   | 'incomingCallFrom'
@@ -274,6 +238,7 @@ export type LocalizerKeys =
   | 'mainMenuView'
   | 'mainMenuWindow'
   | 'markAllAsRead'
+  | 'markUnread'
   | 'maxPasswordAttempts'
   | 'maximumAttachments'
   | 'media'
@@ -314,6 +279,9 @@ export type LocalizerKeys =
   | 'noMediaUntilApproved'
   | 'noMembersInThisGroup'
   | 'noMessageRequestsPending'
+  | 'noMessagesInEverythingElse'
+  | 'noMessagesInNoteToSelf'
+  | 'noMessagesInReadOnly'
   | 'noModeratorsToRemove'
   | 'noNameOrMessage'
   | 'noSearchResults'
@@ -417,6 +385,7 @@ export type LocalizerKeys =
   | 'savedTheFile'
   | 'searchFor...'
   | 'searchForContactsOnly'
+  | 'searchMessagesHeader'
   | 'selectMessage'
   | 'sendFailed'
   | 'sendMessage'
@@ -439,6 +408,7 @@ export type LocalizerKeys =
   | 'showRecoveryPhrase'
   | 'showRecoveryPhrasePasswordRequest'
   | 'showUserDetails'
+  | 'someOfYourDeviceUseOutdatedVersion'
   | 'spellCheckDescription'
   | 'spellCheckDirty'
   | 'spellCheckTitle'
@@ -484,12 +454,26 @@ export type LocalizerKeys =
   | 'timerSetOnSync'
   | 'timerSetTo'
   | 'titleIsNow'
-  | 'joinedTheGroup'
-  | 'multipleJoinedTheGroup'
-  | 'kickedFromTheGroup'
-  | 'multipleKickedFromTheGroup'
-  | 'block'
+  | 'to'
+  | 'today'
+  | 'tookAScreenshot'
+  | 'trimDatabase'
+  | 'trimDatabaseConfirmationBody'
+  | 'trimDatabaseDescription'
+  | 'trustThisContactDialogDescription'
+  | 'trustThisContactDialogTitle'
+  | 'tryAgain'
+  | 'typeInOldPassword'
+  | 'typingAlt'
+  | 'typingIndicatorsSettingDescription'
+  | 'typingIndicatorsSettingTitle'
+  | 'unableToCall'
+  | 'unableToCallTitle'
+  | 'unableToLoadAttachment'
+  | 'unbanUser'
   | 'unblock'
+  | 'unblockGroupToSend'
+  | 'unblockToSend'
   | 'unblocked'
   | 'unknown'
   | 'unknownCountry'
@@ -501,153 +485,27 @@ export type LocalizerKeys =
   | 'userBanFailed'
   | 'userBanned'
   | 'userRemovedFromModerators'
-  | 'orJoinOneOfThese'
-  | 'helpUsTranslateSession'
-  | 'closedGroupInviteFailTitle'
-  | 'closedGroupInviteFailTitlePlural'
-  | 'closedGroupInviteFailMessage'
-  | 'closedGroupInviteFailMessagePlural'
-  | 'closedGroupInviteOkText'
-  | 'closedGroupInviteSuccessTitlePlural'
-  | 'closedGroupInviteSuccessTitle'
-  | 'closedGroupInviteSuccessMessage'
-  | 'notificationForConvo'
-  | 'notificationForConvo_all'
-  | 'notificationForConvo_disabled'
-  | 'notificationForConvo_mentions_only'
-  | 'onionPathIndicatorTitle'
-  | 'onionPathIndicatorDescription'
-  | 'unknownCountry'
-  | 'device'
-  | 'destination'
-  | 'learnMore'
-  | 'linkVisitWarningTitle'
-  | 'linkVisitWarningMessage'
-  | 'open'
-  | 'audioMessageAutoplayTitle'
-  | 'audioMessageAutoplayDescription'
-  | 'clickToTrustContact'
-  | 'trustThisContactDialogTitle'
-  | 'trustThisContactDialogDescription'
-  | 'pinConversation'
-  | 'unpinConversation'
-  | 'markUnread'
-  | 'showUserDetails'
-  | 'sendRecoveryPhraseTitle'
-  | 'sendRecoveryPhraseMessage'
-  | 'dialogClearAllDataDeletionFailedTitle'
-  | 'dialogClearAllDataDeletionFailedDesc'
-  | 'dialogClearAllDataDeletionFailedTitleQuestion'
-  | 'dialogClearAllDataDeletionFailedMultiple'
-  | 'dialogClearAllDataDeletionQuestion'
-  | 'clearDevice'
-  | 'tryAgain'
-  | 'areYouSureClearDevice'
-  | 'deviceOnly'
-  | 'entireAccount'
-  | 'areYouSureDeleteDeviceOnly'
-  | 'areYouSureDeleteEntireAccount'
-  | 'iAmSure'
-  | 'recoveryPhraseSecureTitle'
-  | 'recoveryPhraseRevealMessage'
-  | 'recoveryPhraseRevealButtonText'
-  | 'notificationSubtitle'
-  | 'surveyTitle'
-  | 'faq'
-  | 'support'
-  | 'clearAll'
-  | 'clearDataSettingsTitle'
-  | 'messageRequests'
-  | 'requestsSubtitle'
-  | 'requestsPlaceholder'
-  | 'hideRequestBannerDescription'
-  | 'incomingCallFrom'
-  | 'ringing'
-  | 'establishingConnection'
-  | 'accept'
-  | 'decline'
-  | 'endCall'
-  | 'permissionsSettingsTitle'
-  | 'helpSettingsTitle'
-  | 'cameraPermissionNeededTitle'
-  | 'cameraPermissionNeeded'
-  | 'unableToCall'
-  | 'unableToCallTitle'
-  | 'callMissed'
-  | 'callMissedTitle'
-  | 'noCameraFound'
-  | 'noAudioInputFound'
-  | 'noAudioOutputFound'
-  | 'callMediaPermissionsTitle'
-  | 'callMissedCausePermission'
-  | 'callMissedNotApproved'
-  | 'callMediaPermissionsDescription'
-  | 'callMediaPermissionsDialogContent'
-  | 'callMediaPermissionsDialogTitle'
-  | 'startedACall'
-  | 'answeredACall'
-  | 'trimDatabase'
-  | 'trimDatabaseDescription'
-  | 'trimDatabaseConfirmationBody'
-  | 'pleaseWaitOpenAndOptimizeDb'
-  | 'messageRequestPending'
-  | 'messageRequestAccepted'
-  | 'messageRequestAcceptedOurs'
-  | 'messageRequestAcceptedOursNoName'
-  | 'declineRequestMessage'
-  | 'respondingToRequestWarning'
-  | 'hideRequestBanner'
-  | 'openMessageRequestInbox'
-  | 'noMessageRequestsPending'
-  | 'noMediaUntilApproved'
-  | 'mustBeApproved'
-  | 'youHaveANewFriendRequest'
-  | 'clearAllConfirmationTitle'
-  | 'clearAllConfirmationBody'
-  | 'noMessagesInReadOnly'
-  | 'noMessagesInNoteToSelf'
-  | 'noMessagesInEverythingElse'
-  | 'hideBanner'
-  | 'someOfYourDeviceUseOutdatedVersion'
-  | 'openMessageRequestInboxDescription'
-  | 'clearAllReactions'
-  | 'expandedReactionsText'
-  | 'reactionNotification'
-  | 'rateLimitReactMessage'
-  | 'otherSingular'
-  | 'otherPlural'
-  | 'reactionPopup'
-  | 'reactionPopupOne'
-  | 'reactionPopupTwo'
-  | 'reactionPopupThree'
-  | 'reactionPopupMany'
-  | 'timerSetTo'
-  | 'iAmSure'
-  | 'primaryColorRed'
-  | 'selectMessage'
-  | 'enterAnOpenGroupURL'
-  | 'delete'
-  | 'changePasswordInvalid'
-  | 'themesSettingTitle'
-  | 'timerOption_6_hours'
-  | 'confirmPassword'
-  | 'downloadAttachment'
-  | 'trimDatabaseDescription'
-  | 'showUserDetails'
-  | 'titleIsNow'
-  | 'removePasswordToastDescription'
-  | 'recoveryPhrase'
-  | 'deleteAccountFromLogin'
-  | 'newMessages'
+  | 'userUnbanFailed'
+  | 'userUnbanned'
+  | 'video'
+  | 'videoAttachmentAlt'
+  | 'viewMenuResetZoom'
+  | 'viewMenuToggleDevTools'
+  | 'viewMenuToggleFullScreen'
+  | 'viewMenuZoomIn'
+  | 'viewMenuZoomOut'
+  | 'voiceMessage'
+  | 'welcomeToYourSession'
+  | 'windowMenuClose'
+  | 'windowMenuMinimize'
+  | 'windowMenuZoom'
+  | 'yesterday'
   | 'you'
-  | 'pruneSettingTitle'
-  | 'unbanUser'
-  | 'notificationForConvo_mentions_only'
-  | 'trustThisContactDialogDescription'
-  | 'unknownCountry'
-  | 'searchFor...'
-  | 'displayNameTooLong'
-  | 'joinedTheGroup'
-  | 'editGroupName'
-  | 'reportIssue'
-  | 'setDisplayPicture';
+  | 'youChangedTheTimer'
+  | 'youDisabledDisappearingMessages'
+  | 'youGotKickedFromGroup'
+  | 'youHaveANewFriendRequest'
+  | 'youLeftTheGroup'
+  | 'yourSessionID'
+  | 'yourUniqueSessionID'
+  | 'zoomFactorSettingTitle';