From ffc315a87e101fe0a249a38b61da85ad3ea4cbd6 Mon Sep 17 00:00:00 2001
From: Matt Aitken <matt@mattaitken.com>
Date: Wed, 26 Jun 2024 17:04:26 +0100
Subject: [PATCH] Loading state improvements

---
 .../resources.orgs.$organizationSlug.select-plan.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.select-plan.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.select-plan.tsx
index 8e48c39e0..09c324e5a 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.select-plan.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.select-plan.tsx
@@ -276,7 +276,9 @@ export function TierFree({
                 fullWidth
                 className="text-md font-medium"
                 disabled={isLoading}
-                LeadingIcon={isLoading ? Spinner : undefined}
+                LeadingIcon={
+                  isLoading && navigation.formData?.get("planCode") === null ? Spinner : undefined
+                }
               >
                 {subscription?.plan === undefined
                   ? "Select plan"
@@ -340,7 +342,9 @@ export function TierHobby({
             fullWidth
             className="text-md font-medium"
             disabled={isLoading || subscription?.plan?.code === plan.code}
-            LeadingIcon={isLoading ? Spinner : undefined}
+            LeadingIcon={
+              isLoading && navigation.formData?.get("planCode") === plan.code ? Spinner : undefined
+            }
           >
             {subscription?.plan === undefined
               ? "Select plan"
@@ -403,7 +407,9 @@ export function TierPro({
             fullWidth
             className="text-md font-medium"
             disabled={isLoading || subscription?.plan?.code === plan.code}
-            LeadingIcon={isLoading ? Spinner : undefined}
+            LeadingIcon={
+              isLoading && navigation.formData?.get("planCode") === plan.code ? Spinner : undefined
+            }
           >
             {subscription?.plan === undefined
               ? "Select plan"