fix: removed duplicate imports and ordered localised keys

pull/2765/head
William Grant 2 years ago
parent cb2328bcd0
commit 41d2760927

@ -15,16 +15,11 @@ import { SessionButton, SessionButtonType } from '../basic/SessionButton';
import { SessionSpinner } from '../basic/SessionSpinner'; import { SessionSpinner } from '../basic/SessionSpinner';
import { SessionIconButton } from '../icon'; import { SessionIconButton } from '../icon';
import { sanitizeSessionUsername } from '../../session/utils/String'; import { sanitizeSessionUsername } from '../../session/utils/String';
import { setLastProfileUpdateTimestamp } from '../../util/storage';
import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { ConversationTypeEnum } from '../../models/conversationAttributes';
import { MAX_USERNAME_BYTES } from '../../session/constants'; import { MAX_USERNAME_BYTES } from '../../session/constants';
import styled from 'styled-components'; import styled from 'styled-components';
import { saveQRCode } from '../../util/saveQRCode';
import { useOurAvatarPath, useOurConversationUsername } from '../../hooks/useParamSelector'; import { useOurAvatarPath, useOurConversationUsername } from '../../hooks/useParamSelector';
import { useDispatch } from 'react-redux'; 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) => { const handleSaveQRCode = (event: MouseEvent) => {
event.preventDefault(); event.preventDefault();

@ -15,85 +15,46 @@ export type LocalizerKeys =
| 'appMenuHideOthers' | 'appMenuHideOthers'
| 'appMenuQuit' | 'appMenuQuit'
| 'appMenuUnhide' | 'appMenuUnhide'
| 'appMenuQuit' | 'appearanceSettingsTitle'
| 'editMenuUndo' | 'areYouSureClearDevice'
| 'editMenuRedo' | 'areYouSureDeleteDeviceOnly'
| 'editMenuCut' | 'areYouSureDeleteEntireAccount'
| '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'
| 'audio' | 'audio'
| 'video' | 'audioMessageAutoplayDescription'
| 'photo' | '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' | 'cannotUpdate'
| 'cannotUpdateDetail' | 'cannotUpdateDetail'
| 'changeAccountPasswordDescription' | 'changeAccountPasswordDescription'
@ -163,12 +124,13 @@ export type LocalizerKeys =
| 'deleteAccountFromLogin' | 'deleteAccountFromLogin'
| 'deleteAccountWarning' | 'deleteAccountWarning'
| 'deleteContactConfirmation' | 'deleteContactConfirmation'
| 'deleteConversation'
| 'deleteConversationConfirmation' | 'deleteConversationConfirmation'
| 'deleteForEveryone' | 'deleteForEveryone'
| 'deleteJustForMe' | 'deleteJustForMe'
| 'deleteMessageQuestion' | 'deleteMessageQuestion'
| 'deleteMessages' | 'deleteMessages'
| 'deleteConversation' | 'deleteMessagesQuestion'
| 'deleted' | 'deleted'
| 'destination' | 'destination'
| 'device' | 'device'
@ -184,6 +146,7 @@ export type LocalizerKeys =
| 'displayName' | 'displayName'
| 'displayNameEmpty' | 'displayNameEmpty'
| 'displayNameTooLong' | 'displayNameTooLong'
| 'document'
| 'documents' | 'documents'
| 'documentsEmptyState' | 'documentsEmptyState'
| 'done' | 'done'
@ -233,6 +196,7 @@ export type LocalizerKeys =
| 'hideRequestBanner' | 'hideRequestBanner'
| 'hideRequestBannerDescription' | 'hideRequestBannerDescription'
| 'iAmSure' | 'iAmSure'
| 'image'
| 'imageAttachmentAlt' | 'imageAttachmentAlt'
| 'imageCaptionIconAlt' | 'imageCaptionIconAlt'
| 'incomingCallFrom' | 'incomingCallFrom'
@ -274,6 +238,7 @@ export type LocalizerKeys =
| 'mainMenuView' | 'mainMenuView'
| 'mainMenuWindow' | 'mainMenuWindow'
| 'markAllAsRead' | 'markAllAsRead'
| 'markUnread'
| 'maxPasswordAttempts' | 'maxPasswordAttempts'
| 'maximumAttachments' | 'maximumAttachments'
| 'media' | 'media'
@ -314,6 +279,9 @@ export type LocalizerKeys =
| 'noMediaUntilApproved' | 'noMediaUntilApproved'
| 'noMembersInThisGroup' | 'noMembersInThisGroup'
| 'noMessageRequestsPending' | 'noMessageRequestsPending'
| 'noMessagesInEverythingElse'
| 'noMessagesInNoteToSelf'
| 'noMessagesInReadOnly'
| 'noModeratorsToRemove' | 'noModeratorsToRemove'
| 'noNameOrMessage' | 'noNameOrMessage'
| 'noSearchResults' | 'noSearchResults'
@ -417,6 +385,7 @@ export type LocalizerKeys =
| 'savedTheFile' | 'savedTheFile'
| 'searchFor...' | 'searchFor...'
| 'searchForContactsOnly' | 'searchForContactsOnly'
| 'searchMessagesHeader'
| 'selectMessage' | 'selectMessage'
| 'sendFailed' | 'sendFailed'
| 'sendMessage' | 'sendMessage'
@ -439,6 +408,7 @@ export type LocalizerKeys =
| 'showRecoveryPhrase' | 'showRecoveryPhrase'
| 'showRecoveryPhrasePasswordRequest' | 'showRecoveryPhrasePasswordRequest'
| 'showUserDetails' | 'showUserDetails'
| 'someOfYourDeviceUseOutdatedVersion'
| 'spellCheckDescription' | 'spellCheckDescription'
| 'spellCheckDirty' | 'spellCheckDirty'
| 'spellCheckTitle' | 'spellCheckTitle'
@ -484,12 +454,26 @@ export type LocalizerKeys =
| 'timerSetOnSync' | 'timerSetOnSync'
| 'timerSetTo' | 'timerSetTo'
| 'titleIsNow' | 'titleIsNow'
| 'joinedTheGroup' | 'to'
| 'multipleJoinedTheGroup' | 'today'
| 'kickedFromTheGroup' | 'tookAScreenshot'
| 'multipleKickedFromTheGroup' | 'trimDatabase'
| 'block' | 'trimDatabaseConfirmationBody'
| 'trimDatabaseDescription'
| 'trustThisContactDialogDescription'
| 'trustThisContactDialogTitle'
| 'tryAgain'
| 'typeInOldPassword'
| 'typingAlt'
| 'typingIndicatorsSettingDescription'
| 'typingIndicatorsSettingTitle'
| 'unableToCall'
| 'unableToCallTitle'
| 'unableToLoadAttachment'
| 'unbanUser'
| 'unblock' | 'unblock'
| 'unblockGroupToSend'
| 'unblockToSend'
| 'unblocked' | 'unblocked'
| 'unknown' | 'unknown'
| 'unknownCountry' | 'unknownCountry'
@ -501,153 +485,27 @@ export type LocalizerKeys =
| 'userBanFailed' | 'userBanFailed'
| 'userBanned' | 'userBanned'
| 'userRemovedFromModerators' | 'userRemovedFromModerators'
| 'orJoinOneOfThese' | 'userUnbanFailed'
| 'helpUsTranslateSession' | 'userUnbanned'
| 'closedGroupInviteFailTitle' | 'video'
| 'closedGroupInviteFailTitlePlural' | 'videoAttachmentAlt'
| 'closedGroupInviteFailMessage' | 'viewMenuResetZoom'
| 'closedGroupInviteFailMessagePlural' | 'viewMenuToggleDevTools'
| 'closedGroupInviteOkText' | 'viewMenuToggleFullScreen'
| 'closedGroupInviteSuccessTitlePlural' | 'viewMenuZoomIn'
| 'closedGroupInviteSuccessTitle' | 'viewMenuZoomOut'
| 'closedGroupInviteSuccessMessage' | 'voiceMessage'
| 'notificationForConvo' | 'welcomeToYourSession'
| 'notificationForConvo_all' | 'windowMenuClose'
| 'notificationForConvo_disabled' | 'windowMenuMinimize'
| 'notificationForConvo_mentions_only' | 'windowMenuZoom'
| 'onionPathIndicatorTitle' | 'yesterday'
| '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'
| 'you' | 'you'
| 'pruneSettingTitle' | 'youChangedTheTimer'
| 'unbanUser' | 'youDisabledDisappearingMessages'
| 'notificationForConvo_mentions_only' | 'youGotKickedFromGroup'
| 'trustThisContactDialogDescription' | 'youHaveANewFriendRequest'
| 'unknownCountry' | 'youLeftTheGroup'
| 'searchFor...' | 'yourSessionID'
| 'displayNameTooLong' | 'yourUniqueSessionID'
| 'joinedTheGroup' | 'zoomFactorSettingTitle';
| 'editGroupName'
| 'reportIssue'
| 'setDisplayPicture';

Loading…
Cancel
Save