From 56b1bcac019746cc097fa1c8c6ca2b48f113d80d Mon Sep 17 00:00:00 2001 From: Vincent Date: Wed, 22 Jan 2020 17:17:15 +1100 Subject: [PATCH] Partial copy updates --- _locales/en/messages.json | 44 ++++++++++++---------- preload.js | 2 +- stylesheets/_session.scss | 11 +++++- ts/components/EditProfileDialog.tsx | 22 +++++++---- ts/components/session/RegistrationTabs.tsx | 4 +- 5 files changed, 52 insertions(+), 31 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 60b5ddc0c..ecb6f561a 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -774,7 +774,7 @@ "description": "Shown to separate the types of search results" }, "messagesHeader": { - "message": "Messages", + "message": "Sessions", "description": "Shown to separate the types of search results" }, "settingsHeader": { @@ -961,6 +961,9 @@ "close": { "message": "Close" }, + "continue": { + "message": "Continue" + }, "pairNewDevice": { "message": "Pair New Device" }, @@ -1070,7 +1073,7 @@ "description": "Label for the time a message was received" }, "sendMessage": { - "message": "Send a message", + "message": " Type your message", "description": "Placeholder text in the message entry field" }, "secondaryDeviceDefaultFR": { @@ -2476,54 +2479,57 @@ "message": "Sign In" }, "yourUniqueSessionID": { - "message": "Your Unique Session ID" + "message": "Say hello to your Session ID" }, "allUsersAreRandomly...": { "message": - "All users are randomly generated a set of numbers that act as their unique Session ID. Share your Session ID in order to chat with your friends!" + "Your Session ID is the unique address people can use to contact you on Session. Your Session ID is totally private, anonymous, and has no connection to your real identity." }, "getStarted": { "message": "Get started" }, "generateSessionID": { - "message": "Generate Session ID" + "message": "Create Session ID" }, "mnemonicSeed": { "message": "Mnemonic Seed" }, "enterSeed": { - "message": "Enter Seed" + "message": "Enter Recovery Phrase" }, "displayName": { "message": "Display Name" }, "enterDisplayName": { - "message": "Enter Display Name / Alias" + "message": "Enter a display name" }, "optionalPassword": { - "message": "Optional Password" + "message": "Verify Password" }, "enterOptionalPassword": { - "message": "Enter Optional Password" + "message": "Enter password (optional)" }, "verifyPassword": { "message": "Verify Password" }, "devicePairingHeader": { "message": - "Open the Session Messenger App on your primary device and select Device Pairing from the main menu. Then, enter your Session ID below to sign in." + "Open Session on your other device and navigate to the Linked Devices section in your user account screen. Select Link a Device to prepare your other device for pairing, then enter your Session ID below to link this device to your Session ID." }, "enterSessionIDHere": { - "message": "Enter your Session ID here" + "message": "Enter other device’s Session ID here" }, "continueYourSession": { - "message": "Continue Your Session" + "message": "Link Device" + }, + "restoreSessionID": { + "message": "Restore Session ID" }, "restoreUsingSeed": { - "message": "Restore Using Seed" + "message": "Restore From Recovery Phrase" }, "linkDeviceToExistingAccount": { - "message": "Link Device To Existing Account" + "message": "Link Device to Existing Session ID" }, "or": { "message": "or" @@ -2536,13 +2542,13 @@ "message": "Begin
your
Session." }, "welcomeToYourSession": { - "message": "Welcome to your Session!" + "message": "Welcome to your Session" }, "completeSignUp": { "message": "Complete Sign Up" }, "compose": { - "message": "Compose" + "message": "New Session" }, "searchForAKeyPhrase": { "message": "Search for a key phrase or contact" @@ -2554,11 +2560,11 @@ "message": "Enter Session ID" }, "pasteSessionIDRecipient": { - "message": "Paste Session ID of recipient" + "message": "Enter a Session ID" }, "usersCanShareTheir...": { "message": - "Users can share their Session ID by going into their account settings and clicking \"Share Public Key\"." + "Users can share their Session ID from their account settings, or by sharing their QR code." }, "searchByIDOrDisplayName": { "message": "Search by ID # or Display Name" @@ -2579,7 +2585,7 @@ "message": "Create Group" }, "yourPublicKey": { - "message": "Your Public Key" + "message": "Your Session ID" }, "accept": { "message": "Accept" diff --git a/preload.js b/preload.js index 84478fe43..341d08f3c 100644 --- a/preload.js +++ b/preload.js @@ -504,7 +504,7 @@ window.SMALL_GROUP_SIZE_LIMIT = 10; window.lokiFeatureFlags = { multiDeviceUnpairing: true, - privateGroupChats: false, + privateGroupChats: true, }; // eslint-disable-next-line no-extend-native,func-names diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss index b64ba3f2c..8ee6dc6d5 100644 --- a/stylesheets/_session.scss +++ b/stylesheets/_session.scss @@ -1140,10 +1140,19 @@ label { &__version-info { display: flex; justify-content: space-between; - opacity: 0.4; + padding: $session-margin-sm $session-margin-md; background-color: $session-shade-5; font-size: $session-font-xs; + + span{ + opacity: 0.4; + transition: $session-transition-duration; + + &:hover { + opacity: 1; + } + } } &__password-lock { diff --git a/ts/components/EditProfileDialog.tsx b/ts/components/EditProfileDialog.tsx index 0d9a43d66..8a8c47cca 100644 --- a/ts/components/EditProfileDialog.tsx +++ b/ts/components/EditProfileDialog.tsx @@ -140,10 +140,7 @@ export class EditProfileDialog extends React.Component { className="image-upload-section" role="button" onClick={() => { - const el = this.inputEl.current; - if (el) { - el.click(); - } + this.setState({mode: 'edit'}, this.fireInputEvent); }} > { onChange={this.onFileSelected} /> -
+
{ ); } + private fireInputEvent() { + const el = this.inputEl.current; + if (el) { + el.click(); + } + } + private renderDefaultView() { return ( <> @@ -273,7 +275,9 @@ export class EditProfileDialog extends React.Component { private onKeyUp(event: any) { switch (event.key) { case 'Enter': - this.onClickOK(); + if (this.state.mode === 'edit'){ + this.onClickOK(); + } break; case 'Esc': case 'Escape': @@ -297,6 +301,8 @@ export class EditProfileDialog extends React.Component { const newName = this.state.profileName.trim(); if (newName === '') { + this.setState({mode: 'default'}); + return; } diff --git a/ts/components/session/RegistrationTabs.tsx b/ts/components/session/RegistrationTabs.tsx index 1602bcfbe..4824de3b5 100644 --- a/ts/components/session/RegistrationTabs.tsx +++ b/ts/components/session/RegistrationTabs.tsx @@ -299,7 +299,7 @@ export class RegistrationTabs extends React.Component<{}, State> { }} buttonType={SessionButtonType.Brand} buttonColor={SessionButtonColor.Green} - text={window.i18n('completeSignUp')} + text={window.i18n('getStarted')} disabled={!enableCompleteSignUp} />
@@ -337,7 +337,7 @@ export class RegistrationTabs extends React.Component<{}, State> { if (signUpMode !== SignUpMode.Default) { buttonType = SessionButtonType.Brand; buttonColor = SessionButtonColor.Green; - buttonText = window.i18n('getStarted'); + buttonText = window.i18n('continue'); } else { buttonType = SessionButtonType.BrandOutline; buttonColor = SessionButtonColor.Green;