From 03f707ee63f0c5bd0c8240011efcce0794eeb851 Mon Sep 17 00:00:00 2001
From: Mo <mo@standardnotes.com>
Date: Fri, 25 Mar 2022 08:10:12 -0500
Subject: [PATCH] feat: improve preference copy and case consistency

---
 .../AccountMenu/GeneralAccountMenu.tsx          |  2 +-
 .../components/ConfirmSignoutModal.tsx          |  4 ++--
 .../components/Preferences/panes/Listed.tsx     |  2 +-
 .../Preferences/panes/account/SignOutView.tsx   | 17 +++++++++++------
 .../panes/backups-segments/DataBackups.tsx      |  2 +-
 .../panes/security-segments/PasscodeLock.tsx    |  2 +-
 app/assets/javascripts/strings.ts               |  2 +-
 7 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/components/AccountMenu/GeneralAccountMenu.tsx b/app/assets/javascripts/components/AccountMenu/GeneralAccountMenu.tsx
index 5f30ff040..be83c04fa 100644
--- a/app/assets/javascripts/components/AccountMenu/GeneralAccountMenu.tsx
+++ b/app/assets/javascripts/components/AccountMenu/GeneralAccountMenu.tsx
@@ -185,7 +185,7 @@ export const GeneralAccountMenu: FunctionComponent<Props> = observer(
                 }}
               >
                 <Icon type="signOut" className={iconClassName} />
-                Sign out and clear local data
+                Sign out workspace
               </MenuItem>
             </>
           ) : null}
diff --git a/app/assets/javascripts/components/ConfirmSignoutModal.tsx b/app/assets/javascripts/components/ConfirmSignoutModal.tsx
index 366f27194..1a286ea39 100644
--- a/app/assets/javascripts/components/ConfirmSignoutModal.tsx
+++ b/app/assets/javascripts/components/ConfirmSignoutModal.tsx
@@ -43,8 +43,8 @@ export const ConfirmSignoutModal = observer(
             <div className="sk-panel">
               <div className="sk-panel-content">
                 <div className="sk-panel-section">
-                  <AlertDialogLabel className="sk-h3 sk-panel-section-title capitalize">
-                    End your session?
+                  <AlertDialogLabel className="sk-h3 sk-panel-section-title">
+                    Sign out workspace?
                   </AlertDialogLabel>
                   <AlertDialogDescription className="sk-panel-row">
                     <p className="color-foreground">
diff --git a/app/assets/javascripts/components/Preferences/panes/Listed.tsx b/app/assets/javascripts/components/Preferences/panes/Listed.tsx
index 09dad1502..8e4bf55df 100644
--- a/app/assets/javascripts/components/Preferences/panes/Listed.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/Listed.tsx
@@ -105,7 +105,7 @@ export const Listed = observer(({ application }: Props) => {
             type="normal"
             disabled={requestingAccount}
             label={
-              requestingAccount ? 'Creating account...' : 'Create New Author'
+              requestingAccount ? 'Creating account...' : 'Create new author'
             }
             onClick={registerNewAccount}
           />
diff --git a/app/assets/javascripts/components/Preferences/panes/account/SignOutView.tsx b/app/assets/javascripts/components/Preferences/panes/account/SignOutView.tsx
index 17c5ed0df..f32db9fa6 100644
--- a/app/assets/javascripts/components/Preferences/panes/account/SignOutView.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/account/SignOutView.tsx
@@ -41,12 +41,15 @@ const SignOutView: FunctionComponent<{
           </div>
         </PreferencesSegment>
         <PreferencesSegment>
-          <Subtitle>This device</Subtitle>
-          <Text>This will delete all local items and preferences.</Text>
+          <Subtitle>This workspace</Subtitle>
+          <Text>
+            Remove all data related to the current workspace from the
+            application.
+          </Text>
           <div className="min-h-3" />
           <Button
             type="danger"
-            label="Sign out and clear local data"
+            label="Sign out workspace"
             onClick={() => {
               appState.accountMenu.setSigningOut(true);
             }}
@@ -67,12 +70,14 @@ const ClearSessionDataView: FunctionComponent<{
   return (
     <PreferencesGroup>
       <PreferencesSegment>
-        <Title>Clear session data</Title>
-        <Text>This will delete all local items and preferences.</Text>
+        <Title>Clear workspace</Title>
+        <Text>
+          Remove all data related to the current workspace from the application.
+        </Text>
         <div className="min-h-3" />
         <Button
           type="danger"
-          label="Clear Session Data"
+          label="Clear workspace"
           onClick={() => {
             appState.accountMenu.setSigningOut(true);
           }}
diff --git a/app/assets/javascripts/components/Preferences/panes/backups-segments/DataBackups.tsx b/app/assets/javascripts/components/Preferences/panes/backups-segments/DataBackups.tsx
index 747772b32..df9040979 100644
--- a/app/assets/javascripts/components/Preferences/panes/backups-segments/DataBackups.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/backups-segments/DataBackups.tsx
@@ -213,7 +213,7 @@ export const DataBackups = observer(({ application, appState }: Props) => {
           <div class="flex flex-row items-center mt-3">
             <Button
               type="normal"
-              label="Import Backup"
+              label="Import backup"
               onClick={handleImportFile}
             />
             <input
diff --git a/app/assets/javascripts/components/Preferences/panes/security-segments/PasscodeLock.tsx b/app/assets/javascripts/components/Preferences/panes/security-segments/PasscodeLock.tsx
index 18a962138..9d2e61483 100644
--- a/app/assets/javascripts/components/Preferences/panes/security-segments/PasscodeLock.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/security-segments/PasscodeLock.tsx
@@ -222,7 +222,7 @@ export const PasscodeLock = observer(({ application, appState }: Props) => {
 
               {!showPasscodeForm && (
                 <Button
-                  label="Add Passcode"
+                  label="Add passcode"
                   onClick={handleAddPassCode}
                   type="primary"
                 />
diff --git a/app/assets/javascripts/strings.ts b/app/assets/javascripts/strings.ts
index 36e810f7d..a5cde2dab 100644
--- a/app/assets/javascripts/strings.ts
+++ b/app/assets/javascripts/strings.ts
@@ -52,7 +52,7 @@ export function StringEmptyTrash(count: number) {
 export const STRING_ACCOUNT_MENU_UNCHECK_MERGE =
   'Unchecking this option means any of the notes you have written while you were signed out will be deleted. Are you sure you want to discard these notes?';
 export const STRING_SIGN_OUT_CONFIRMATION =
-  'This will remove all notes, tags, and other data from this device.';
+  'This action will remove this workspace and its related data from the application.';
 export const STRING_ERROR_DECRYPTING_IMPORT =
   'There was an error decrypting your items. Make sure the password you entered is correct and try again.';
 export const STRING_E2E_ENABLED =