From 55314d3fdabf61406fbe48a2bf9f285747428795 Mon Sep 17 00:00:00 2001
From: sebpalluel <sebpalluel@gmail.com>
Date: Wed, 1 May 2024 13:30:24 +0100
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20(examples.tsx):=20reorder?=
 =?UTF-8?q?=20imports=20for=20consistency=20=F0=9F=92=A1=20(examples.tsx):?=
 =?UTF-8?q?=20update=20error=20message=20for=20clarity=20on=20no=20matchin?=
 =?UTF-8?q?g=20accounts=20=F0=9F=94=A7=20(shopifyCampaignParameters.query.?=
 =?UTF-8?q?gql):=20add=20@cached=20directive=20to=20shopify=20campaign=20q?=
 =?UTF-8?q?ueries=20for=20performance=20optimization=20=E2=9C=A8=20(Text.t?=
 =?UTF-8?q?sx):=20add=20whitespace-pre=20to=20paragraph=20text=20variant?=
 =?UTF-8?q?=20for=20better=20text=20formatting=20control?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shopify/src/lib/OffKeyGateNotConnected/examples.tsx      | 5 +++--
 libs/gql/admin/api/src/generated/index.ts                    | 4 ++--
 .../organizer/shopify/shopifyCampaignParameters.query.gql    | 4 ++--
 libs/ui/components/src/lib/text/Text.tsx                     | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/libs/features/unlock/shopify/src/lib/OffKeyGateNotConnected/examples.tsx b/libs/features/unlock/shopify/src/lib/OffKeyGateNotConnected/examples.tsx
index 49d6bf7e6..1c331a166 100644
--- 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
index fd260d676..06d7aac6d 100644
--- 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
index 858973b54..f295544c3 100644
--- 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
index aad86d938..7e273ec6e 100644
--- 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',
 };