chore: resolve merge conflicts

Author: RobbyUitbeijerse

.changeset/small-boxes-grow.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Add support for filtering fiat payment providers in PayEmbed

packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.tsx

@@ -1,4 +1,5 @@
 import { useState } from "react";
+import { getErrorMessage } from "src/react/web/utils/errors.js";
 import { trackPayEvent } from "../../../../../../../analytics/track/pay.js";
 import type { Chain } from "../../../../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../../../../client/client.js";
@@ -11,7 +12,6 @@ import type { Theme } from "../../../../../../core/design-system/index.js";
 import type { PayUIOptions } from "../../../../../../core/hooks/connection/ConnectButtonProps.js";
 import { useBuyWithFiatQuote } from "../../../../../../core/hooks/pay/useBuyWithFiatQuote.js";
 import { PREFERRED_FIAT_PROVIDER_STORAGE_KEY } from "../../../../../../core/utils/storage.js";
-import { getErrorMessage } from "../../../../../utils/errors.js";
 import {
   Drawer,
   DrawerOverlay,
@@ -106,8 +106,8 @@ export function FiatScreenContent(props: {
           isTestMode: buyWithFiatOptions?.testMode,
           purchaseData: props.payOptions.purchaseData,
           fromAddress: payer.account.address,
-          preferredProvider: preferredProvider,
           paymentLinkId: paymentLinkId,
+          preferredProvider: preferredProvider ?? "COINBASE",
         }
       : undefined,
   );