From 5889312b78d6d0c1f7bfcc7198bd6a331fac2142 Mon Sep 17 00:00:00 2001
From: Robby Uitbeijerse <robbyuitbeijerse@gmail.com>
Date: Mon, 26 May 2025 10:14:00 +0200
Subject: [PATCH 1/3] fix: ensure that the default spinner stroke color gets
 inherited from the parent node

---
 .../ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.tsx   | 4 ++--
 .../ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.tsx   | 4 ++--
 packages/thirdweb/src/react/web/ui/components/Spinner.tsx     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.tsx
index 3e6d83954e2..fcb50f38daf 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.tsx
@@ -230,7 +230,7 @@ export function FiatScreenContent(props: {
       </Container>
 
       <Button
-        variant={disableSubmit ? "outline" : "accent"}
+        variant="accent"
         data-disabled={disableSubmit}
         disabled={disableSubmit}
         fullWidth
@@ -250,7 +250,7 @@ export function FiatScreenContent(props: {
         {fiatQuoteQuery.isLoading ? (
           <>
             Getting price quote
-            <Spinner size="sm" color="accentButtonText" />
+            <Spinner size="sm" />
           </>
         ) : (
           "Continue"
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.tsx
index 2c24a96b6be..e6119da9d75 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.tsx
@@ -334,7 +334,7 @@ export function SwapScreenContent(props: {
         />
       ) : (
         <Button
-          variant={disableContinue ? "outline" : "accent"}
+          variant="accent"
           fullWidth
           data-disabled={disableContinue}
           disabled={disableContinue}
@@ -360,7 +360,7 @@ export function SwapScreenContent(props: {
           {quoteQuery.isLoading ? (
             <>
               Getting price quote
-              <Spinner size="sm" color="accentButtonText" />
+              <Spinner size="sm" />
             </>
           ) : (
             "Continue"
diff --git a/packages/thirdweb/src/react/web/ui/components/Spinner.tsx b/packages/thirdweb/src/react/web/ui/components/Spinner.tsx
index 89d42257d3b..71315386abb 100644
--- a/packages/thirdweb/src/react/web/ui/components/Spinner.tsx
+++ b/packages/thirdweb/src/react/web/ui/components/Spinner.tsx
@@ -9,8 +9,8 @@ import { StyledCircle, StyledSvg } from "../design-system/elements.js";
  * @internal
  */
 export const Spinner: React.FC<{
-  color: keyof Theme["colors"];
   size: keyof typeof iconSize;
+  color?: keyof Theme["colors"];
 }> = (props) => {
   const theme = useCustomTheme();
   return (
@@ -26,7 +26,7 @@ export const Spinner: React.FC<{
         cy="25"
         r="20"
         fill="none"
-        stroke={theme.colors[props.color]}
+        stroke={props.color ? theme.colors[props.color] : "currentColor"}
         strokeWidth={Number(iconSize[props.size]) > 64 ? "2" : "4"}
       />
     </Svg>

From d5c0ad6efa5f06c96f9d89885699af37b08be369 Mon Sep 17 00:00:00 2001
From: Robby Uitbeijerse <robbyuitbeijerse@gmail.com>
Date: Mon, 26 May 2025 10:15:10 +0200
Subject: [PATCH 2/3] chore: restore variant switching

---
 .../web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.tsx | 2 +-
 .../web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.tsx
index fcb50f38daf..9ccc4a29a31 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.tsx
@@ -230,7 +230,7 @@ export function FiatScreenContent(props: {
       </Container>
 
       <Button
-        variant="accent"
+        variant={disableSubmit ? "outline" : "accent"}
         data-disabled={disableSubmit}
         disabled={disableSubmit}
         fullWidth
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.tsx
index e6119da9d75..b18a51de17d 100644
--- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.tsx
+++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.tsx
@@ -334,7 +334,7 @@ export function SwapScreenContent(props: {
         />
       ) : (
         <Button
-          variant="accent"
+          variant={disableContinue ? "outline" : "accent"}
           fullWidth
           data-disabled={disableContinue}
           disabled={disableContinue}

From be0f9737696ef757cd3b42bd11bf2406b422ffbb Mon Sep 17 00:00:00 2001
From: Robby Uitbeijerse <robbyuitbeijerse@gmail.com>
Date: Tue, 27 May 2025 09:26:31 +0200
Subject: [PATCH 3/3] chore: apply changeset

---
 .changeset/fast-onions-obey.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/fast-onions-obey.md

diff --git a/.changeset/fast-onions-obey.md b/.changeset/fast-onions-obey.md
new file mode 100644
index 00000000000..4e72dc94bee
--- /dev/null
+++ b/.changeset/fast-onions-obey.md
@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+default the spinner stroke color to currentColor and make the color prop optional