From 1f1051a345a6854c274afec8b94e0ada1e6c28c0 Mon Sep 17 00:00:00 2001
From: Vaggelis Yfantis <me@octoper.me>
Date: Fri, 2 May 2025 11:19:42 +0300
Subject: [PATCH 1/3] chore(clerk-js): Remove grand_total usage from checkout
 flows

---
 .../src/ui/components/Checkout/CheckoutComplete.tsx    |  2 +-
 .../src/ui/components/Checkout/CheckoutForm.tsx        | 10 ++--------
 packages/clerk-js/src/utils/commerce.ts                |  6 +++++-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/clerk-js/src/ui/components/Checkout/CheckoutComplete.tsx b/packages/clerk-js/src/ui/components/Checkout/CheckoutComplete.tsx
index c0b07594d76..f52c11cb318 100644
--- a/packages/clerk-js/src/ui/components/Checkout/CheckoutComplete.tsx
+++ b/packages/clerk-js/src/ui/components/Checkout/CheckoutComplete.tsx
@@ -107,7 +107,7 @@ export const CheckoutComplete = ({ checkout }: { checkout: __experimental_Commer
           <LineItems.Group variant='secondary'>
             <LineItems.Title title={localizationKeys('__experimental_commerce.checkout.lineItems.title__totalPaid')} />
             <LineItems.Description
-              text={`${checkout.totals.grandTotal.currencySymbol}${checkout.totals.grandTotal.amountFormatted}`}
+              text={`${checkout.totals.totalDueNow.currencySymbol}${checkout.totals.totalDueNow.amountFormatted}`}
             />
           </LineItems.Group>
           <LineItems.Group variant='secondary'>
diff --git a/packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx b/packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx
index c8bd1d9576b..235644563b7 100644
--- a/packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx
+++ b/packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx
@@ -96,14 +96,8 @@ export const CheckoutForm = ({
           </LineItems.Group>
           <LineItems.Group borderTop>
             {/* TODO(@Commerce): needs localization */}
-            <LineItems.Title title={`Total${totals.totalDueNow ? ' Due Today' : ''}`} />
-            <LineItems.Description
-              text={`${
-                totals.totalDueNow
-                  ? `${totals.totalDueNow.currencySymbol}${totals.totalDueNow.amountFormatted}`
-                  : `${totals.grandTotal.currencySymbol}${totals.grandTotal.amountFormatted}`
-              }`}
-            />
+            <LineItems.Title title={`Total Due Today`} />
+            <LineItems.Description text={`${totals.totalDueNow.currencySymbol}${totals.totalDueNow.amountFormatted}`} />
           </LineItems.Group>
         </LineItems.Root>
       </Box>
diff --git a/packages/clerk-js/src/utils/commerce.ts b/packages/clerk-js/src/utils/commerce.ts
index f3ea1d5e866..36060d64a6b 100644
--- a/packages/clerk-js/src/utils/commerce.ts
+++ b/packages/clerk-js/src/utils/commerce.ts
@@ -22,10 +22,14 @@ export const commerceTotalsFromJSON = <
   data: T,
 ) => {
   const totals = {
-    grandTotal: commerceMoneyFromJSON(data.grand_total),
     subtotal: commerceMoneyFromJSON(data.subtotal),
     taxTotal: commerceMoneyFromJSON(data.tax_total),
   };
+  if ('grandTotal' in data) {
+    // @ts-ignore
+    totals['grandTotal'] = commerceMoneyFromJSON(data.grand_total);
+  }
+
   if ('total_due_now' in data) {
     // @ts-ignore
     totals['totalDueNow'] = commerceMoneyFromJSON(data.total_due_now);

From 2a7e1a237ff80e5b770a87fccc755af5b5b4dadb Mon Sep 17 00:00:00 2001
From: Vaggelis Yfantis <me@octoper.me>
Date: Fri, 2 May 2025 11:21:09 +0300
Subject: [PATCH 2/3] chore(repo): Add changeset

---
 .changeset/shaky-parents-type.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/shaky-parents-type.md

diff --git a/.changeset/shaky-parents-type.md b/.changeset/shaky-parents-type.md
new file mode 100644
index 00000000000..b660cde86ef
--- /dev/null
+++ b/.changeset/shaky-parents-type.md
@@ -0,0 +1,5 @@
+---
+'@clerk/clerk-js': patch
+---
+
+Remove `totals.grandTotal` from checkout flows

From b60194aa567f7a02d5891eaccdf9aa3434a314e2 Mon Sep 17 00:00:00 2001
From: Vaggelis Yfantis <me@octoper.me>
Date: Fri, 2 May 2025 11:24:19 +0300
Subject: [PATCH 3/3] chore(repo): Update changeset

---
 .changeset/shaky-parents-type.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/shaky-parents-type.md b/.changeset/shaky-parents-type.md
index b660cde86ef..3b8ec46c59d 100644
--- a/.changeset/shaky-parents-type.md
+++ b/.changeset/shaky-parents-type.md
@@ -2,4 +2,4 @@
 '@clerk/clerk-js': patch
 ---
 
-Remove `totals.grandTotal` from checkout flows
+Remove usage of `totals.grandTotal` from checkout flows