Onboarding Chunk 2

.eslintrc.js

@@ -79,7 +79,7 @@ module.exports = {
     // make imports without file extensions
     'import/extensions': ['warn', 'never'],
 
-    // NOTE Remove this line when debugging cyclic dependencies
+    // NOTE Comment out this line when debugging cyclic dependencies / circular imports
     'import/no-cycle': 'off',
 
     // Prettier overrides:
@@ -122,6 +122,19 @@ module.exports = {
         ignoreRegExpLiterals: true,
       },
     ],
+    'no-restricted-imports': [
+      'error',
+      {
+        paths: [
+          // There is an issue with the current version of react-use where it requires an arbitrary 'Locale' package on the window object which causes random app crashes on startup in some cases
+          {
+            name: 'react-use',
+            message:
+              "Don't import from 'react-use' directly. Please use a default import for each hook from 'react-use/lib' instead.",
+          },
+        ],
+      },
+    ],
   },
   overrides: [
     {

.mocharc.json

@@ -0,0 +1,7 @@
+{
+  "exit": true,
+  "spec": ["ts/test/**/*_test.js"],
+  "require": "jsdom-global/register",
+  "timeout": "10000",
+  "recursive": true
+}

_locales/en/messages.json

@@ -1,11 +1,12 @@
 {
   "about": "About",
   "accept": "Accept",
+  "accountIDCopied": "Account ID Copied",
   "accountIDCopy": "Copy Account ID",
   "accountIdEnter": "Enter Account ID",
-  "accountIdEnterYourFriends": "Enter your friend's Account ID or ONS",
-  "accountIdYours": "Your Account ID",
   "accountIdErrorInvalid": "This Account ID is invalid. Please check and try again.",
+  "accountIdOrOnsEnter": "Enter Account ID or ONS",
+  "accountIdYours": "Your Account ID",
   "activeMembers": "$count$ active members",
   "add": "Add",
   "addACaption": "Add a caption...",
@@ -69,7 +70,7 @@
   "changePassword": "Change Password",
   "changePasswordInvalid": "The old password you entered is incorrect",
   "changePasswordTitle": "Password Changed",
-  "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
+  "changePasswordToastDescription": "Your password has been changed. Please keep it safe and restart Session.",
   "chooseAnAction": "Choose an action to start a conversation",
   "classicDarkThemeTitle": "Classic Dark",
   "classicLightThemeTitle": "Classic Light",
@@ -101,9 +102,10 @@
   "connectToServerSuccess": "Successfully connected to community",
   "contactAvatarAlt": "Avatar for contact $name$",
   "contactsHeader": "Contacts",
+  "contactsNone": "You don't have any contacts yet",
   "contextMenuNoSuggestions": "No Suggestions",
   "continue": "Continue",
-  "conversationsHeader": "Contacts and Groups: $count$",
+  "conversationId": "Conversation ID",
   "conversationsNone": "You don't have any conversations yet",
   "conversationsSettingsTitle": "Conversations",
   "copiedToClipboard": "Copied",
@@ -112,7 +114,6 @@
   "copyOpenGroupURL": "Copy Group URL",
   "couldntFindServerMatching": "Couldn't find the corresponding Community server",
   "create": "Create",
-  "createClosedGroupNamePrompt": "Group Name",
   "createClosedGroupPlaceholder": "Enter a group name",
   "createConversationNewContact": "Create a conversation with a new contact",
   "createConversationNewGroup": "Create a group with existing contacts",
@@ -241,7 +242,6 @@
   "invalidOldPassword": "Old password is invalid",
   "invalidOpenGroupUrl": "Invalid URL",
   "invalidPassword": "Invalid password",
-  "invalidPubkeyFormat": "Invalid Pubkey Format",
   "inviteContacts": "Invite Contacts",
   "join": "Join",
   "joinACommunity": "Join a community",
@@ -305,8 +305,10 @@
   "messageRequestAcceptedOurs": "You have accepted $name$'s message request",
   "messageRequestAcceptedOursNoName": "You have accepted the message request",
   "messageRequestPending": "Your message request is currently pending",
+  "messageRequestPendingDescription": "You will be able to send voice messages and attachments once the recipient has approved this message request.",
   "messageRequests": "Message Requests",
   "messageRequestsAcceptDescription": "Sending a message to this user will automatically accept their message request and reveal your Account ID.",
+  "messages": "Messages",
   "messagesHeader": "Conversations",
   "messageWillDisappear": "Messages will disappear in $countAndUnit$",
   "moreInformation": "More information",
@@ -339,10 +341,10 @@
   "noSearchResults": "No results found for \"$searchTerm$\"",
   "notApplicable": "N/A",
   "noteToSelf": "Note to Self",
-  "notificationForConvo": "Notifications",
   "notificationForConvo_all": "All",
   "notificationForConvo_disabled": "Disabled",
   "notificationForConvo_mentions_only": "Mentions only",
+  "notificationForConvo": "Notifications",
   "notificationFrom": "From:",
   "notificationMostRecent": "Most recent:",
   "notificationMostRecentFrom": "Most recent from: $name$",
@@ -358,6 +360,8 @@
   "onboardingAccountCreate": "Create account",
   "onboardingAccountCreated": "Account Created",
   "onboardingAccountExists": "I have an account",
+  "onboardingBackAccountCreation": "You cannot go back further. In order to cancel your account creation, Session needs to quit.",
+  "onboardingBackLoadAccount": "You cannot go back further. In order to stop loading your account, Session needs to quit.",
   "onboardingBubbleWelcomeToSession": "Welcome to Session",
   "onboardingHitThePlusButton": "Hit the plus button to start a chat, create a group, or join an official community!",
   "onboardingRecoveryPassword": "Enter your recovery password to load your account. If you haven't saved it, you can find it in your app settings.",
@@ -368,10 +372,10 @@
   "onlyAdminCanRemoveMembers": "You are not the creator",
   "onlyAdminCanRemoveMembersDesc": "Only the creator of the group can remove users",
   "onlyGroupAdminsCanChange": "Only group admins can change this setting.",
-  "onsErrorNotRecognised": "We couldn't recognise this ONS. Please check it and try again.",
+  "onsErrorNotRecognized": "We couldn't recognize this ONS. Please check it and try again.",
+  "onsErrorUnableToSearch": "We were unable to search for this ONS. Please try again later.",
   "open": "Open",
   "openGroupInvitation": "Community invitation",
-  "openGroupURL": "Community URL",
   "openMessageRequestInbox": "Message Requests",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "or": "or",
@@ -384,6 +388,7 @@
   "passwordLengthError": "Password must be between 6 and 64 characters long",
   "passwordsDoNotMatch": "Passwords do not match",
   "passwordTypeError": "Password must be a string",
+  "passwordView": "View as Password",
   "passwordViewTitle": "Enter Password",
   "permissionsSettingsTitle": "Permissions",
   "photo": "Photo",
@@ -404,6 +409,8 @@
   "pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
   "pruneSettingTitle": "Trim Communities",
   "publicChatExists": "You are already connected to this community",
+  "qrView": "View QR",
+  "quitButton": "Quit",
   "quoteThumbnailAlt": "Thumbnail of image from quoted message",
   "rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
   "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message",
@@ -418,12 +425,16 @@
   "readReceiptSettingDescription": "Send read receipts in one-to-one chats.",
   "readReceiptSettingTitle": "Read Receipts",
   "received": "Received",
+  "recoveryPasswordDescription": "Use your recovery password to load your account on new devices.<br/>Your account cannot be recovered without your recovery password. Make sure it's stored somewhere safe and secure — and don't share it with anyone.",
   "recoveryPasswordEnter": "Enter your recovery password",
   "recoveryPasswordErrorMessageGeneric": "Please check your recovery password and try again.",
   "recoveryPasswordErrorMessageIncorrect": "Some of the words in your Recovery Password are incorrect. Please check and try again.",
   "recoveryPasswordErrorMessageShort": "The Recovery Password you entered is not long enough. Please check and try again.",
+  "recoveryPasswordHidePermanently": "Hide Recovery Password Permanently",
+  "recoveryPasswordHidePermanentlyDescription1": "Without your recovery password, you cannot load your account on new devices. <br /><br />We strongly recommend you save your recovery password in a safe and secure place before continuing.",
+  "recoveryPasswordHidePermanentlyDescription2": "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.",
+  "recoveryPasswordHideRecoveryPasswordDescription": "Permanently hide your recover password on this device.",
   "recoveryPasswordWarningSendDescription": "This is your recovery password. If you send it to someone they'll have full access to your account.",
-  "recoveryPhraseSavePromptMain": "Your recovery password is the master key to your Account ID — you can use it to restore your Account ID if you lose access to your device. Store your recovery password in a safe place, and don't give it to anyone.",
   "remove": "Remove",
   "removeAccountPasswordDescription": "Remove the password required to unlock Session.",
   "removeAccountPasswordTitle": "Remove Password",
@@ -432,7 +443,7 @@
   "removePassword": "Remove Password",
   "removePasswordInvalid": "Incorrect password",
   "removePasswordTitle": "Password Removed",
-  "removePasswordToastDescription": "Your password has been removed.",
+  "removePasswordToastDescription": "Your password has been removed. Please restart Session.",
   "removeResidueMembers": "Clicking ok will also remove those members as they left the group.",
   "replyingToMessage": "Replying to:",
   "replyToMessage": "Reply",
@@ -451,13 +462,15 @@
   "saveRecoveryPasswordDescription": "Save your recovery password to make sure you don't lose access to your account.",
   "searchFor...": "Search conversations and contacts",
   "searchForContactsOnly": "Search for contacts",
-  "searchMessagesHeader": "Messages: $count$",
   "selectMessage": "Select message",
   "sendFailed": "Send Failed",
   "sending": "Sending",
   "sendMessage": "Message",
   "sent": "Sent",
   "serverId": "Server ID",
+  "sessionConversations": "Conversations",
+  "sessionInviteAFriend": "Invite a Friend",
+  "sessionInviteAFriendIDCopied": "Share with your friends wherever you usually speak with them — then move the conversation here.",
   "sessionMessenger": "Session",
   "sessionRecoveryPassword": "Recovery Password",
   "set": "Set",
@@ -467,10 +480,11 @@
   "setPasswordFail": "Failed to set password",
   "setPasswordInvalid": "Passwords do not match",
   "setPasswordTitle": "Password Set",
-  "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
+  "setPasswordToastDescription": "Your password has been set. Please keep it safe and restart Session",
   "settingAppliesToEveryone": "This setting applies to everyone in this conversation.",
   "settingAppliesToYourMessages": "This setting applies to messages you send in this conversation.",
   "settingsHeader": "Settings",
+  "shareAccountIdDescription": "Invite your friend to chat with you on Session by sharing your Account ID with them.",
   "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
   "show": "Show",
   "showDebugLog": "Export Logs",
@@ -498,32 +512,32 @@
   "timer": "Timer",
   "timerModeRead": "read",
   "timerModeSent": "sent",
-  "timerOption_0_seconds": "Off",
   "timerOption_0_seconds_abbreviated": "off",
-  "timerOption_10_seconds": "10 seconds",
-  "timerOption_10_seconds_abbreviated": "10s",
-  "timerOption_12_hours": "12 hours",
-  "timerOption_12_hours_abbreviated": "12h",
-  "timerOption_1_day": "1 day",
+  "timerOption_0_seconds": "Off",
   "timerOption_1_day_abbreviated": "1d",
-  "timerOption_1_hour": "1 hour",
+  "timerOption_1_day": "1 day",
   "timerOption_1_hour_abbreviated": "1h",
-  "timerOption_1_minute": "1 minute",
+  "timerOption_1_hour": "1 hour",
   "timerOption_1_minute_abbreviated": "1m",
-  "timerOption_1_week": "1 week",
+  "timerOption_1_minute": "1 minute",
   "timerOption_1_week_abbreviated": "1w",
-  "timerOption_2_weeks": "2 weeks",
+  "timerOption_1_week": "1 week",
+  "timerOption_10_seconds_abbreviated": "10s",
+  "timerOption_10_seconds": "10 seconds",
+  "timerOption_12_hours_abbreviated": "12h",
+  "timerOption_12_hours": "12 hours",
   "timerOption_2_weeks_abbreviated": "2w",
-  "timerOption_30_minutes": "30 minutes",
+  "timerOption_2_weeks": "2 weeks",
   "timerOption_30_minutes_abbreviated": "30m",
-  "timerOption_30_seconds": "30 seconds",
+  "timerOption_30_minutes": "30 minutes",
   "timerOption_30_seconds_abbreviated": "30s",
-  "timerOption_5_minutes": "5 minutes",
+  "timerOption_30_seconds": "30 seconds",
   "timerOption_5_minutes_abbreviated": "5m",
-  "timerOption_5_seconds": "5 seconds",
+  "timerOption_5_minutes": "5 minutes",
   "timerOption_5_seconds_abbreviated": "5s",
-  "timerOption_6_hours": "6 hours",
+  "timerOption_5_seconds": "5 seconds",
   "timerOption_6_hours_abbreviated": "6h",
+  "timerOption_6_hours": "6 hours",
   "timerSetTo": "Disappearing message time set to $time$",
   "titleIsNow": "Group name is now '$name$'.",
   "to": "To:",
@@ -576,6 +590,7 @@
   "windowMenuClose": "Close Window",
   "windowMenuMinimize": "Minimize",
   "windowMenuZoom": "Zoom",
+  "yes": "Yes",
   "yesterday": "Yesterday",
   "you": "You",
   "youChangedTheTimer": "<b>You</b> have set messages to disappear <b>$time$</b> after they have been <b>$mode$</b>",