refactor: offline roles (#2169)

packages/web/src/javascripts/Components/Footer/UpgradeNow.tsx

@@ -13,6 +13,7 @@ type Props = {
 const UpgradeNow = ({ application, featuresController, subscriptionContoller }: Props) => {
   const shouldShowCTA = !featuresController.hasFolders
   const hasAccount = subscriptionContoller.hasAccount
+  const hasAccessToFeatures = subscriptionContoller.hasFirstPartySubscription
 
   const onClick = useCallback(() => {
     if (hasAccount && application.isNativeIOS()) {
@@ -22,16 +23,20 @@ const UpgradeNow = ({ application, featuresController, subscriptionContoller }:
     }
   }, [application, hasAccount])
 
-  return shouldShowCTA ? (
+  if (!shouldShowCTA || hasAccessToFeatures) {
+    return null
+  }
+
+  return (
     <div className="flex h-full items-center px-2">
       <button
         className="rounded bg-info py-0.5 px-1.5 text-sm font-bold uppercase text-info-contrast hover:brightness-125 lg:text-xs"
         onClick={onClick}
       >
-        {hasAccount ? 'Unlock features' : 'Sign up to sync'}
+        {!hasAccount ? 'Sign up to sync' : 'Unlock features'}
       </button>
     </div>
-  ) : null
+  )
 }
 
 export default observer(UpgradeNow)

packages/web/src/javascripts/Components/Preferences/Panes/Account/Email.tsx

@@ -99,7 +99,7 @@ const Email: FunctionComponent<Props> = ({ application }: Props) => {
               <Subtitle>Disable sign-in notification emails</Subtitle>
               <Text>
                 Disables email notifications when a new sign-in occurs on your account. (Email notifications are
-                available to paid subscribers).
+                available only to paid subscribers).
               </Text>
             </div>
             {isLoading ? (

packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/Subscription.tsx

@@ -15,7 +15,7 @@ type Props = {
 
 const Subscription: FunctionComponent<Props> = ({ application, viewControllerManager }: Props) => {
   const subscriptionState = viewControllerManager.subscriptionController
-  const { userSubscription } = subscriptionState
+  const { onlineSubscription } = subscriptionState
 
   const now = new Date().getTime()
 
@@ -25,7 +25,7 @@ const Subscription: FunctionComponent<Props> = ({ application, viewControllerMan
         <div className="flex flex-row items-center">
           <div className="flex flex-grow flex-col">
             <Title>Subscription</Title>
-            {userSubscription && userSubscription.endsAt > now ? (
+            {onlineSubscription && onlineSubscription.endsAt > now ? (
               <SubscriptionInformation subscriptionState={subscriptionState} application={application} />
             ) : (
               <NoSubscription application={application} />

packages/web/src/javascripts/Components/Preferences/Panes/Backups/CloudBackups/CloudBackupProvider.tsx

@@ -17,7 +17,7 @@ import {
 } from '@standardnotes/snjs'
 import { WebApplication } from '@/Application/Application'
 import Button from '@/Components/Button/Button'
-import { isDev, openInNewTab } from '@/Utils'
+import { openInNewTab } from '@/Utils'
 import { Subtitle } from '@/Components/Preferences/PreferencesComponents/Content'
 import { KeyboardKey } from '@standardnotes/ui-services'
 
@@ -61,7 +61,7 @@ const CloudBackupProvider: FunctionComponent<Props> = ({ application, providerNa
     }
     event.stopPropagation()
 
-    const authUrl = application.getCloudProviderIntegrationUrl(providerName, isDev)
+    const authUrl = application.getCloudProviderIntegrationUrl(providerName)
     openInNewTab(authUrl)
     setAuthBegan(true)
   }

packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/Packages/Provider/PackageProvider.ts

@@ -7,7 +7,7 @@ export class PackageProvider {
   static async load(application: WebApplication): Promise<PackageProvider | undefined> {
     const response = await application.getAvailableSubscriptions()
 
-    if (response instanceof ClientDisplayableError) {
+    if (!response || response instanceof ClientDisplayableError) {
       return undefined
     }
 

packages/web/src/javascripts/Components/PremiumFeaturesModal/Subviews/UpgradePrompt.tsx

@@ -64,7 +64,10 @@ export const UpgradePrompt = ({
             <div className="mb-2 font-bold">The Professional Plan costs $119.99/year and includes benefits like</div>
             <ul className="list-inside list-[circle]">
               <li>100GB encrypted file storage</li>
-              <li>Access to all note types, including markdown, rich text, authenticator, tasks, and spreadsheets</li>
+              <li>
+                Access to all note types, including Super, markdown, rich text, authenticator, tasks, and spreadsheets
+              </li>
+              <li>Access to Daily Notebooks and Moments journals</li>
               <li>Note history going back indefinitely</li>
               <li>Nested folders for your tags</li>
               <li>Premium support</li>
@@ -79,7 +82,7 @@ export const UpgradePrompt = ({
           className="no-border w-full cursor-pointer rounded bg-info py-2 font-bold text-info-contrast hover:brightness-125 focus:brightness-125"
           ref={ctaRef}
         >
-          Upgrade
+          {application.isNativeIOS() ? 'Start Free Trial' : 'Upgrade'}
         </button>
       </div>
     </>