♻️ (examples.tsx): reorder imports for consistency

💡 (examples.tsx): update error message for clarity on no matching accounts 🔧 (shopifyCampaignParameters.query.gql): add @cached directive to shopify campaign queries for performance optimization ✨ (Text.tsx): add whitespace-pre to paragraph text variant for better text formatting control
OfflineHQ · May 1, 2024 · 55314d3 · 55314d3
1 parent a7f0276
commit 55314d3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/libs/features/unlock/shopify/src/lib/OffKeyGateNotConnected/examples.tsx b/libs/features/unlock/shopify/src/lib/OffKeyGateNotConnected/examples.tsx
@@ -1,5 +1,5 @@
-import { OffKeyGateNotConnectedProps } from './OffKeyGateNotConnected';
 import { ShopifyCustomerStatus } from '../types';
+import { OffKeyGateNotConnectedProps } from './OffKeyGateNotConnected';
 
 export const offKeyGateNotConnectedProps: OffKeyGateNotConnectedProps = {
   locale: 'en',
@@ -21,7 +21,8 @@ export const offKeyGateNotConnectedProps: OffKeyGateNotConnectedProps = {
         'Welcome! Please create a new account.',
       [ShopifyCustomerStatus.MatchingAccount]:
         'Your account is successfully linked.',
-      [ShopifyCustomerStatus.NoMatchingAccount]: 'No matching accounts found.',
+      [ShopifyCustomerStatus.NoMatchingAccount]:
+        'No account where found for "{customerEmail}".\n\nPlease try to connect to an existing one or proceed with the recovery process.',
     },
   },
 } satisfies OffKeyGateNotConnectedProps;
diff --git a/libs/gql/admin/api/src/generated/index.ts b/libs/gql/admin/api/src/generated/index.ts
@@ -1358,7 +1358,7 @@ ${EventParametersFieldsFragmentDoc}`;
 }
     `;
  const GetShopifyCampaignParametersForNotConnectedDocument = `
-    query GetShopifyCampaignParametersForNotConnected($gateId: String!, $locale: Locale!, $stage: Stage!) {
+    query GetShopifyCampaignParametersForNotConnected($gateId: String!, $locale: Locale!, $stage: Stage!) @cached {
   shopifyCampaignParameters_by_pk(gateId: $gateId) {
     organizerId
     status
@@ -1393,7 +1393,7 @@ ${EventParametersFieldsFragmentDoc}`;
 }
     `;
  const GetShopifyCampaignParametersForConnectedDocument = `
-    query GetShopifyCampaignParametersForConnected($gateId: String!, $locale: Locale!, $stage: Stage!) {
+    query GetShopifyCampaignParametersForConnected($gateId: String!, $locale: Locale!, $stage: Stage!) @cached {
   shopifyCampaignParameters_by_pk(gateId: $gateId) {
     organizerId
     status

diff --git a/libs/gql/admin/api/src/queries/organizer/shopify/shopifyCampaignParameters.query.gql b/libs/gql/admin/api/src/queries/organizer/shopify/shopifyCampaignParameters.query.gql
@@ -2,7 +2,7 @@ query GetShopifyCampaignParametersForNotConnected(
   $gateId: String!
   $locale: Locale!
   $stage: Stage!
-) {
+) @cached {
   shopifyCampaignParameters_by_pk(gateId: $gateId) {
     organizerId
     status
@@ -40,7 +40,7 @@ query GetShopifyCampaignParametersForConnected(
   $gateId: String!
   $locale: Locale!
   $stage: Stage!
-) {
+) @cached {
   shopifyCampaignParameters_by_pk(gateId: $gateId) {
     organizerId
     status

diff --git a/libs/ui/components/src/lib/text/Text.tsx b/libs/ui/components/src/lib/text/Text.tsx
@@ -11,7 +11,7 @@ const textVariants = {
   h4: 'scroll-m-20 text-xl font-semibold tracking-tight text-balance text-pretty',
   h5: 'scroll-m-20 text-lg font-medium text-balance text-pretty',
   h6: 'scroll-m-20 text-base font-medium text-balance text-pretty',
-  p: 'text-base leading-7',
+  p: 'text-base leading-7 whitespace-pre',
   span: 'text-base',
   small: 'text-sm font-medium leading-none',
 };