diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmailForm.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmailForm.tsx index 9b01a1925..08b2602f2 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmailForm.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmailForm.tsx @@ -14,7 +14,7 @@ const ChangeEmailForm: FunctionComponent = ({ setNewEmail, setCurrentPass
= ({ setNewEmail, setCurrentPass
{ const activeSubscriptions = subscriptionInvitations?.filter((invitation) => [InvitationStatus.Sent, InvitationStatus.Accepted].includes(invitation.status), ) - const inActiveSubscriptions = subscriptionInvitations?.filter((invitation) => - [InvitationStatus.Declined, InvitationStatus.Canceled].includes(invitation.status), - ) const handleCancel = async (invitationUuid: string) => { if (lockContinue) { @@ -51,7 +48,7 @@ const InvitationsList = ({ subscriptionState, application }: Props) => { return (
- Active Invites: + Active Invites {activeSubscriptions?.map((invitation) => (
@@ -62,20 +59,6 @@ const InvitationsList = ({ subscriptionState, application }: Props) => { )}
))} - {!!inActiveSubscriptions?.length && ( - <> - Inactive Invites: -
- {inActiveSubscriptions?.map((invitation) => ( -
- - {invitation.inviteeIdentifier} ({invitation.status}) - -
- ))} -
- - )} {!subscriptionState.allInvitationsUsed && }
) diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/Invite/Invite.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/Invite/Invite.tsx index 4ac1808ee..d9c463448 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/Invite/Invite.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/Invite/Invite.tsx @@ -134,7 +134,7 @@ const Invite: FunctionComponent = ({ onCloseDialog, application, subscrip ) return ( - +
{currentStep === Steps.InitialStep && } {currentStep === Steps.FinishStep && } diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/Invite/InviteForm.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/Invite/InviteForm.tsx index 87d49cfa4..71187be0f 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/Invite/InviteForm.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/Invite/InviteForm.tsx @@ -10,16 +10,24 @@ const InviteForm: FunctionComponent = ({ setInviteeEmail }) => { return (
-
) diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/Invite/InviteSuccess.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/Invite/InviteSuccess.tsx index d91d892b8..8c2ba90ca 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/Invite/InviteSuccess.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/Invite/InviteSuccess.tsx @@ -1,9 +1,13 @@ +import { Title } from '@/Components/Preferences/PreferencesComponents/Content' import { FunctionComponent } from 'react' const InviteSuccess: FunctionComponent = () => { return (
-
Your invitation has been successfully sent.
+ Invite processed successfully. +
+ If an account is found with that email, they will receive an email with your invitation. +
) } diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/SubscriptionSharing.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/SubscriptionSharing.tsx index d32c2b549..87becc7cf 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/SubscriptionSharing.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/SubscriptionSharing.tsx @@ -39,7 +39,7 @@ const SubscriptionSharing: FunctionComponent = ({ application, viewContro
- Subscription Sharing + Subscription sharing {isSubscriptionSharingFeatureAvailable ? (
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Appearance/EditorAppearance.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Appearance/EditorAppearance.tsx index dd39770da..3171fec9a 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Appearance/EditorAppearance.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Appearance/EditorAppearance.tsx @@ -71,7 +71,7 @@ const EditorDefaults = ({ application }: Props) => { return ( - Editor Appearance + Editor appearance
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/DataBackups.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/DataBackups.tsx index 0dd3088f3..4bf234efe 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/DataBackups.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/DataBackups.tsx @@ -175,7 +175,7 @@ const DataBackups = ({ application, viewControllerManager }: Props) => { <> - Data Backups + Data backups Download a backup of all your text-based data {isEncryptionEnabled && ( diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx index c1d939e22..a13c1ced9 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx @@ -110,7 +110,7 @@ const EmailBackups = ({ application }: Props) => { return ( - Email Backups + Email backups {!isDesktopApplication() && ( Receive daily encrypted email backups of all your notes directly in your email inbox. diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/FileBackupsCrossPlatform.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/FileBackupsCrossPlatform.tsx index 074ea2fdf..77e12f55f 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/FileBackupsCrossPlatform.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/FileBackupsCrossPlatform.tsx @@ -20,7 +20,7 @@ const FileBackupsCrossPlatform = ({ application }: Props) => { <> - Automatic File Backups + Automatic file backups Automatically save encrypted backups of your files. To enable file backups, use the Standard Notes desktop application. diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/FileBackupsDesktop.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/FileBackupsDesktop.tsx index 74c4ee0cf..67da2c570 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/FileBackupsDesktop.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/FileBackupsDesktop.tsx @@ -45,7 +45,7 @@ const FileBackupsDesktop = ({ backupsService }: Props) => { <> - Automatic File Backups + Automatic file backups
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/PlaintextBackups/PlaintextBackupsCrossPlatform.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/PlaintextBackups/PlaintextBackupsCrossPlatform.tsx index 9bd46767e..271d9f53d 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/PlaintextBackups/PlaintextBackupsCrossPlatform.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/PlaintextBackups/PlaintextBackupsCrossPlatform.tsx @@ -16,7 +16,7 @@ const PlaintextBackupsCrossPlatform = () => { <> - Automatic Plaintext Backups + Automatic plaintext backups Automatically save backups of all your notes into plaintext, non-encrypted folders. To enable plaintext backups, use the Standard Notes desktop application. diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/PlaintextBackups/PlaintextBackupsDesktop.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/PlaintextBackups/PlaintextBackupsDesktop.tsx index c8fc35184..4eaf9ede6 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/PlaintextBackups/PlaintextBackupsDesktop.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/PlaintextBackups/PlaintextBackupsDesktop.tsx @@ -42,7 +42,7 @@ const PlaintextBackupsDesktop = ({ backupsService }: Props) => { <> - Automatic Plaintext Backups + Automatic plaintext backups
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/TextBackups/TextBackupsCrossPlatform.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/TextBackups/TextBackupsCrossPlatform.tsx index 41184f919..e3c53426c 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/TextBackups/TextBackupsCrossPlatform.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/TextBackups/TextBackupsCrossPlatform.tsx @@ -18,7 +18,7 @@ const TextBackupsCrossPlatform = ({ application }: Props) => { <> - Automatic Text Backups + Automatic text backups Automatically save encrypted and decrypted backups of your note and tag data. To enable text backups, use the Standard Notes desktop application. diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/AdvancedSection.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/AdvancedSection.tsx index abf67b407..f2b86ef59 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/AdvancedSection.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/AdvancedSection.tsx @@ -19,7 +19,7 @@ const Advanced: FunctionComponent = ({ application, viewControllerManager return ( - +
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/Moments.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/General/Moments.tsx index b9875842a..d9a2f47c6 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/General/Moments.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/General/Moments.tsx @@ -113,22 +113,16 @@ const Moments: FunctionComponent = ({ application }: Props) => {
- Introducing Moments, a new feature in Standard Notes that lets you capture candid photos of yourself - throughout the day, right in the app. With Moments, you can create a visual record of your life, one photo - at a time. + Moments lets you capture photos of yourself throughout the day, creating a visual record of your life, one + photo at a time. - Moments uses your webcam or mobile selfie-cam to take a photo of you every half hour, ensuring that you - have a complete record of your day. And because all photos are end-to-end encrypted and stored in your - private account, you can trust that your memories are safe and secure. + Using your webcam or mobile selfie-cam, Moments takes a photo of you every half hour, keeping a complete + record of your day. All photos are end-to-end encrypted and stored in your private account. Enable Moments + on a per-device basis to get started. - - Whether you're working at your computer or capturing notes on the go from your mobile device, Moments is a - fun and easy way to document your life. Plus, with customizable photo intervals coming soon, you'll be - able to tailor Moments to your unique needs. Enable Moments on a per-device basis to get started. -