thirdweb 5.87.4 → 5.88.0

package/dist/cjs/client/client.js

@@ -44,7 +44,8 @@ function createThirdwebClient(options) {
             }
         }
         else {
-            realClientId = (0, client_id_js_1.computeClientIdFromSecretKey)(secretKey);
+            // always PREFER the clientId if provided, only compute it from the secretKey if we don't have a clientId passed explicitly
+            realClientId = clientId ?? (0, client_id_js_1.computeClientIdFromSecretKey)(secretKey);
         }
     }
     // only path we get here is if we have no secretKey and no clientId

package/dist/cjs/client/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/client/client.ts"],"names":[],"mappings":";;AAsGA,oDA4BC;AAlID,wDAAqE;AACrE,sDAA+C;AAuE/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,SAAgB,oBAAoB,CAClC,OAAoC;IAEpC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAEjD,IAAI,YAAY,GAAuB,QAAQ,CAAC;IAEhD,IAAI,SAAS,EAAE,CAAC;QACd,IAAI,IAAA,iBAAK,EAAC,SAAS,CAAC,EAAE,CAAC;YACrB,mEAAmE;YACnE,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;YAC1E,CAAC;QACH,CAAC;aAAM,CAAC;YACN,YAAY,GAAG,IAAA,2CAA4B,EAAC,SAAS,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;IAED,mEAAmE;IACnE,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO;QACL,GAAG,IAAI;QACP,QAAQ,EAAE,YAAY;QACtB,SAAS;KACD,CAAC;AACb,CAAC"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/client/client.ts"],"names":[],"mappings":";;AAsGA,oDA6BC;AAnID,wDAAqE;AACrE,sDAA+C;AAuE/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,SAAgB,oBAAoB,CAClC,OAAoC;IAEpC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAEjD,IAAI,YAAY,GAAuB,QAAQ,CAAC;IAEhD,IAAI,SAAS,EAAE,CAAC;QACd,IAAI,IAAA,iBAAK,EAAC,SAAS,CAAC,EAAE,CAAC;YACrB,mEAAmE;YACnE,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;YAC1E,CAAC;QACH,CAAC;aAAM,CAAC;YACN,2HAA2H;YAC3H,YAAY,GAAG,QAAQ,IAAI,IAAA,2CAA4B,EAAC,SAAS,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;IAED,mEAAmE;IACnE,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO;QACL,GAAG,IAAI;QACP,QAAQ,EAAE,YAAY;QACtB,SAAS;KACD,CAAC;AACb,CAAC"}

package/dist/cjs/contract/deployment/zksync/zkDeployContract.js

@@ -8,18 +8,20 @@ const send_and_confirm_transaction_js_1 = require("../../../transaction/actions/
 const prepare_transaction_js_1 = require("../../../transaction/prepare-transaction.js");
 const normalizeFunctionParams_js_1 = require("../../../utils/abi/normalizeFunctionParams.js");
 const constants_js_1 = require("../../../utils/any-evm/zksync/constants.js");
+const prefix_js_1 = require("../../../utils/bytecode/prefix.js");
 const zkDeployDeterministic_js_1 = require("./zkDeployDeterministic.js");
 /**
  * @internal
  */
 async function zkDeployContract(options) {
+    const bytecode = (0, prefix_js_1.ensureBytecodePrefix)(options.bytecode);
     if (options.salt !== undefined) {
         // if a salt is provided, use the deterministic deployer
         return (0, zkDeployDeterministic_js_1.zkDeployContractDeterministic)(options);
     }
     const data = (0, zksync_1.encodeDeployData)({
         abi: options.abi,
-        bytecode: options.bytecode,
+        bytecode,
         deploymentType: options.deploymentType ?? "create",
         args: (0, normalizeFunctionParams_js_1.normalizeFunctionParams)(options.abi.find((abi) => abi.type === "constructor"), options.params),
     });
@@ -31,7 +33,7 @@ async function zkDeployContract(options) {
             to: constants_js_1.CONTRACT_DEPLOYER_ADDRESS,
             data,
             eip712: {
-                factoryDeps: [options.bytecode],
+                factoryDeps: [bytecode],
                 // TODO (zksync): allow passing in a paymaster
             },
         }),

package/dist/cjs/contract/deployment/zksync/zkDeployContract.js.map

@@ -1 +1 @@
-{"version":3,"file":"zkDeployContract.js","sourceRoot":"","sources":["../../../../../src/contract/deployment/zksync/zkDeployContract.ts"],"names":[],"mappings":";;AAeA,4CAiDC;AA/DD,wCAA+C;AAC/C,wEAAsE;AACtE,8HAA6H;AAC7H,kHAAyG;AACzG,wFAAiF;AACjF,8FAAwF;AACxF,6EAAuF;AAGvF,yEAA2E;AAE3E;;GAEG;AACI,KAAK,UAAU,gBAAgB,CACpC,OAMC;IAED,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC/B,wDAAwD;QACxD,OAAO,IAAA,wDAA6B,EAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,IAAI,GAAG,IAAA,yBAAgB,EAAC;QAC5B,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,QAAQ;QAClD,IAAI,EAAE,IAAA,oDAAuB,EAC3B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,aAAa,CAAC,EACrD,OAAO,CAAC,MAAM,CACf;KACF,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,MAAM,IAAA,2DAAyB,EAAC;QAC9C,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,WAAW,EAAE,IAAA,2CAAkB,EAAC;YAC9B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,EAAE,EAAE,wCAAyB;YAC7B,IAAI;YACJ,MAAM,EAAE;gBACN,WAAW,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC;gBAC/B,8CAA8C;aAC/C;SACF,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,IAAA,8BAAc,EAAC;QAC5B,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,MAAM,EAAE,CAAC,IAAA,2CAAqB,GAAE,CAAC;KAClC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC;IAExD,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,eAAe,CAAC;AACzB,CAAC"}
+{"version":3,"file":"zkDeployContract.js","sourceRoot":"","sources":["../../../../../src/contract/deployment/zksync/zkDeployContract.ts"],"names":[],"mappings":";;AAgBA,4CAmDC;AAlED,wCAA+C;AAC/C,wEAAsE;AACtE,8HAA6H;AAC7H,kHAAyG;AACzG,wFAAiF;AACjF,8FAAwF;AACxF,6EAAuF;AACvF,iEAAyE;AAGzE,yEAA2E;AAE3E;;GAEG;AACI,KAAK,UAAU,gBAAgB,CACpC,OAMC;IAED,MAAM,QAAQ,GAAG,IAAA,gCAAoB,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAExD,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC/B,wDAAwD;QACxD,OAAO,IAAA,wDAA6B,EAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,IAAI,GAAG,IAAA,yBAAgB,EAAC;QAC5B,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,QAAQ;QACR,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,QAAQ;QAClD,IAAI,EAAE,IAAA,oDAAuB,EAC3B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,aAAa,CAAC,EACrD,OAAO,CAAC,MAAM,CACf;KACF,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,MAAM,IAAA,2DAAyB,EAAC;QAC9C,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,WAAW,EAAE,IAAA,2CAAkB,EAAC;YAC9B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,EAAE,EAAE,wCAAyB;YAC7B,IAAI;YACJ,MAAM,EAAE;gBACN,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACvB,8CAA8C;aAC/C;SACF,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,IAAA,8BAAc,EAAC;QAC5B,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,MAAM,EAAE,CAAC,IAAA,2CAAqB,GAAE,CAAC;KAClC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC;IAExD,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,eAAe,CAAC;AACzB,CAAC"}

package/dist/cjs/pay/buyWithCrypto/getQuote.js

@@ -2,9 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBuyWithCryptoQuote = getBuyWithCryptoQuote;
 const utils_js_1 = require("../../chains/utils.js");
-const contract_js_1 = require("../../contract/contract.js");
-const allowance_js_1 = require("../../extensions/erc20/__generated__/IERC20/read/allowance.js");
-const approve_js_1 = require("../../extensions/erc20/write/approve.js");
 const fetch_js_1 = require("../../utils/fetch.js");
 const json_js_1 = require("../../utils/json.js");
 const definitions_js_1 = require("../utils/definitions.js");
@@ -70,26 +67,6 @@ async function getBuyWithCryptoQuote(params) {
             .result;
         // check if the fromAddress already has approval for the given amount
         const approvalData = data.approval;
-        let approval = undefined;
-        if (approvalData) {
-            const contract = (0, contract_js_1.getContract)({
-                client: params.client,
-                address: approvalData.tokenAddress,
-                chain: (0, utils_js_1.getCachedChain)(approvalData.chainId),
-            });
-            const approvedAmount = await (0, allowance_js_1.allowance)({
-                contract,
-                spender: approvalData.spenderAddress,
-                owner: params.fromAddress,
-            });
-            if (approvedAmount < BigInt(approvalData.amountWei)) {
-                approval = (0, approve_js_1.approve)({
-                    contract,
-                    spender: approvalData.spenderAddress,
-                    amountWei: BigInt(approvalData.amountWei),
-                });
-            }
-        }
         const swapRoute = {
             transactionRequest: {
                 chain: (0, utils_js_1.getCachedChain)(data.transactionRequest.chainId),
@@ -100,7 +77,7 @@ async function getBuyWithCryptoQuote(params) {
                 gas: BigInt(data.transactionRequest.gasLimit),
                 gasPrice: undefined, // ignore gas price returned by the quote, we handle it ourselves
             },
-            approval: approval,
+            approvalData,
             swapDetails: {
                 fromAddress: data.fromAddress,
                 toAddress: data.toAddress,

package/dist/cjs/pay/buyWithCrypto/getQuote.js.map

@@ -1 +1 @@
-{"version":3,"file":"getQuote.js","sourceRoot":"","sources":["../../../../src/pay/buyWithCrypto/getQuote.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getQuote.js","sourceRoot":"","sources":["../../../../src/pay/buyWithCrypto/getQuote.ts"],"names":[],"mappings":"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"}

package/dist/cjs/pay/buyWithCrypto/getTransfer.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBuyWithCryptoTransfer = getBuyWithCryptoTransfer;
 const utils_js_1 = require("../../chains/utils.js");
-const contract_js_1 = require("../../contract/contract.js");
-const approve_js_1 = require("../../extensions/erc20/write/approve.js");
 const fetch_js_1 = require("../../utils/fetch.js");
 const json_js_1 = require("../../utils/json.js");
 const definitions_js_1 = require("../utils/definitions.js");
@@ -68,17 +66,7 @@ async function getBuyWithCryptoTransfer(params) {
                 value: BigInt(data.transactionRequest.value),
                 gas: BigInt(data.transactionRequest.gasLimit),
             },
-            approval: data.approval
-                ? (0, approve_js_1.approve)({
-                    contract: (0, contract_js_1.getContract)({
-                        client: params.client,
-                        address: data.approval.tokenAddress,
-                        chain: (0, utils_js_1.getCachedChain)(data.approval.chainId),
-                    }),
-                    spender: data.approval.spenderAddress,
-                    amountWei: BigInt(data.approval.amountWei),
-                })
-                : undefined,
+            approvalData: data.approval,
             fromAddress: data.fromAddress,
             toAddress: data.toAddress,
             paymentToken: data.paymentToken,

package/dist/cjs/pay/buyWithCrypto/getTransfer.js.map

@@ -1 +1 @@
-{"version":3,"file":"getTransfer.js","sourceRoot":"","sources":["../../../../src/pay/buyWithCrypto/getTransfer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getTransfer.js","sourceRoot":"","sources":["../../../../src/pay/buyWithCrypto/getTransfer.ts"],"names":[],"mappings":";;AAsHA,4DAuDC;AA5KD,oDAAuD;AAIvD,mDAAsD;AACtD,iDAAgD;AAChD,4DAA8E;AAqF9E;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACI,KAAK,UAAU,wBAAwB,CAC5C,MAAsC;IAEtC,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,IAAA,yBAAc,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAElD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,IAAA,oDAAmC,GAAE,EAAE;YACxE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,MAAM,EAAE,kBAAkB;gBAC1B,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAA,mBAAS,EAAC;gBACd,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,YAAY,EAAE,MAAM,CAAC,YAAY;aAClC,CAAC;SACH,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACvC,IAAI,QAAQ,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;gBACpC,MAAM,QAAQ,CAAC;YACjB,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,IAAI,GAAkC,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QAE3E,MAAM,QAAQ,GAA0B;YACtC,kBAAkB,EAAE;gBAClB,KAAK,EAAE,IAAA,yBAAc,EAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;gBACtD,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAY;gBAC1C,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,EAAa;gBACzC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;gBAC5C,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;aAC9C;YACD,YAAY,EAAE,IAAI,CAAC,QAAQ;YAC3B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,wBAAwB,EAAE,IAAI,CAAC,wBAAwB;YACvD,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB,CAAC;QAEF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAC;QAC/D,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}

package/dist/cjs/pay/buyWithFiat/getQuote.js.map

@@ -1 +1 @@
-{"version":3,"file":"getQuote.js","sourceRoot":"","sources":["../../../../src/pay/buyWithFiat/getQuote.ts"],"names":[],"mappings":";;AAkSA,kDA0CC;AA3UD,mDAAsD;AACtD,iDAAgD;AAEhD,4DAAyE;AA8OzE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AACI,KAAK,UAAU,mBAAmB,CACvC,MAAiC;IAEjC,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,IAAA,yBAAc,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAElD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,IAAA,+CAA8B,GAAE,EAAE;YACnE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,MAAM,EAAE,kBAAkB;gBAC1B,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAA,mBAAS,EAAC;gBACd,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;gBAC7C,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;gBACtC,cAAc,EAAE,MAAM,CAAC,cAAc;gBACrC,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,cAAc,EAAE,MAAM,CAAC,cAAc;gBACrC,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,cAAc,EAAE,MAAM,CAAC,cAAc;gBACrC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;aAC5C,CAAC;SACH,CAAC,CAAC;QAEH,oEAAoE;QACpE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACvC,IAAI,QAAQ,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;gBACpC,MAAM,QAAQ,CAAC;YACjB,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;IACxC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;QAC1D,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
+{"version":3,"file":"getQuote.js","sourceRoot":"","sources":["../../../../src/pay/buyWithFiat/getQuote.ts"],"names":[],"mappings":";;AAuSA,kDA0CC;AAhVD,mDAAsD;AACtD,iDAAgD;AAEhD,4DAAyE;AAmPzE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AACI,KAAK,UAAU,mBAAmB,CACvC,MAAiC;IAEjC,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,IAAA,yBAAc,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAElD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,IAAA,+CAA8B,GAAE,EAAE;YACnE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,MAAM,EAAE,kBAAkB;gBAC1B,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAA,mBAAS,EAAC;gBACd,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;gBAC7C,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;gBACtC,cAAc,EAAE,MAAM,CAAC,cAAc;gBACrC,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,cAAc,EAAE,MAAM,CAAC,cAAc;gBACrC,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,cAAc,EAAE,MAAM,CAAC,cAAc;gBACrC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;aAC5C,CAAC;SACH,CAAC,CAAC;QAEH,oEAAoE;QACpE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACvC,IAAI,QAAQ,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;gBACpC,MAAM,QAAQ,CAAC;YACjB,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;IACxC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;QAC1D,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}

package/dist/cjs/pay/utils/commonTypes.js

@@ -1,3 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FiatProviders = void 0;
+exports.FiatProviders = ["COINBASE", "STRIPE", "TRANSAK", "KADO"];
 //# sourceMappingURL=commonTypes.js.map

package/dist/cjs/pay/utils/commonTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"commonTypes.js","sourceRoot":"","sources":["../../../../src/pay/utils/commonTypes.ts"],"names":[],"mappings":""}
+{"version":3,"file":"commonTypes.js","sourceRoot":"","sources":["../../../../src/pay/utils/commonTypes.ts"],"names":[],"mappings":";;;AAqBa,QAAA,aAAa,GAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAU,CAAC"}

package/dist/cjs/react/core/utils/storage.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LAST_AUTH_PROVIDER_STORAGE_KEY = void 0;
+exports.PREFERRED_FIAT_PROVIDER_STORAGE_KEY = exports.LAST_AUTH_PROVIDER_STORAGE_KEY = void 0;
 exports.setLastAuthProvider = setLastAuthProvider;
 exports.getLastAuthProvider = getLastAuthProvider;
 exports.LAST_AUTH_PROVIDER_STORAGE_KEY = "lastAuthProvider";
+exports.PREFERRED_FIAT_PROVIDER_STORAGE_KEY = "preferredFiatProvider";
 async function setLastAuthProvider(authProvider, storage) {
     await storage.setItem(exports.LAST_AUTH_PROVIDER_STORAGE_KEY, authProvider);
 }

package/dist/cjs/react/core/utils/storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../../../src/react/core/utils/storage.ts"],"names":[],"mappings":";;;AAKA,kDAKC;AAED,kDAIC;AAbY,QAAA,8BAA8B,GAAG,kBAAkB,CAAC;AAE1D,KAAK,UAAU,mBAAmB,CACvC,YAAsC,EACtC,OAAqB;IAErB,MAAM,OAAO,CAAC,OAAO,CAAC,sCAA8B,EAAE,YAAY,CAAC,CAAC;AACtE,CAAC;AAEM,KAAK,UAAU,mBAAmB,CAAC,OAAqB;IAC7D,OAAO,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,sCAA8B,CAAC,CAErD,CAAC;AACX,CAAC"}
+{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../../../src/react/core/utils/storage.ts"],"names":[],"mappings":";;;AAMA,kDAKC;AAED,kDAIC;AAdY,QAAA,8BAA8B,GAAG,kBAAkB,CAAC;AACpD,QAAA,mCAAmC,GAAG,uBAAuB,CAAC;AAEpE,KAAK,UAAU,mBAAmB,CACvC,YAAsC,EACtC,OAAqB;IAErB,MAAM,OAAO,CAAC,OAAO,CAAC,sCAA8B,EAAE,YAAY,CAAC,CAAC;AACtE,CAAC;AAEM,KAAK,UAAU,mBAAmB,CAAC,OAAqB;IAC7D,OAAO,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,sCAA8B,CAAC,CAErD,CAAC;AACX,CAAC"}

package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js

@@ -5,23 +5,16 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const react_query_1 = require("@tanstack/react-query");
 const react_1 = require("react");
 const addresses_js_1 = require("../../../../../../constants/addresses.js");
-const isSwapRequiredPostOnramp_js_1 = require("../../../../../../pay/buyWithFiat/isSwapRequiredPostOnramp.js");
-const formatNumber_js_1 = require("../../../../../../utils/formatNumber.js");
 const index_js_1 = require("../../../../../core/design-system/index.js");
-const useWalletBalance_js_1 = require("../../../../../core/hooks/others/useWalletBalance.js");
-const useBuyWithCryptoQuote_js_1 = require("../../../../../core/hooks/pay/useBuyWithCryptoQuote.js");
-const useBuyWithFiatQuote_js_1 = require("../../../../../core/hooks/pay/useBuyWithFiatQuote.js");
 const useActiveAccount_js_1 = require("../../../../../core/hooks/wallets/useActiveAccount.js");
 const invalidateWalletBalance_js_1 = require("../../../../../core/providers/invalidateWalletBalance.js");
 const ErrorState_js_1 = require("../../../../wallets/shared/ErrorState.js");
 const LoadingScreen_js_1 = require("../../../../wallets/shared/LoadingScreen.js");
 const ChainName_js_1 = require("../../../components/ChainName.js");
-const Drawer_js_1 = require("../../../components/Drawer.js");
 const Spacer_js_1 = require("../../../components/Spacer.js");
-const Spinner_js_1 = require("../../../components/Spinner.js");
-const SwitchNetwork_js_1 = require("../../../components/SwitchNetwork.js");
 const basic_js_1 = require("../../../components/basic.js");
 const buttons_js_1 = require("../../../components/buttons.js");
+const formElements_js_1 = require("../../../components/formElements.js");
 const text_js_1 = require("../../../components/text.js");
 const TokenSymbol_js_1 = require("../../../components/token/TokenSymbol.js");
 const ConnectButton_js_1 = require("../../ConnectButton.js");
@@ -30,22 +23,18 @@ const TokenSelector_js_1 = require("../TokenSelector.js");
 const WalletSwitcherConnectionScreen_js_1 = require("../WalletSwitcherConnectionScreen.js");
 const nativeToken_js_1 = require("../nativeToken.js");
 const DirectPaymentModeScreen_js_1 = require("./DirectPaymentModeScreen.js");
-const EstimatedTimeAndFees_js_1 = require("./EstimatedTimeAndFees.js");
 const PayTokenIcon_js_1 = require("./PayTokenIcon.js");
-const PayWIthCreditCard_js_1 = require("./PayWIthCreditCard.js");
 const TransactionModeScreen_js_1 = require("./TransactionModeScreen.js");
 const CurrencySelection_js_1 = require("./fiat/CurrencySelection.js");
 const FiatFlow_js_1 = require("./fiat/FiatFlow.js");
+const FiatScreenContent_js_1 = require("./fiat/FiatScreenContent.js");
 const useEnabledPaymentMethods_js_1 = require("./main/useEnabledPaymentMethods.js");
 const useUISelectionStates_js_1 = require("./main/useUISelectionStates.js");
-const openOnRamppopup_js_1 = require("./openOnRamppopup.js");
 const BuyTokenInput_js_1 = require("./swap/BuyTokenInput.js");
-const Fees_js_1 = require("./swap/Fees.js");
-const PayWithCrypto_js_1 = require("./swap/PayWithCrypto.js");
 const PaymentSelectionScreen_js_1 = require("./swap/PaymentSelectionScreen.js");
 const SwapFlow_js_1 = require("./swap/SwapFlow.js");
+const SwapScreenContent_js_1 = require("./swap/SwapScreenContent.js");
 const TransferFlow_js_1 = require("./swap/TransferFlow.js");
-const pendingSwapTx_js_1 = require("./swap/pendingSwapTx.js");
 const useSwapSupportedChains_js_1 = require("./swap/useSwapSupportedChains.js");
 const usePayerSetup_js_1 = require("./usePayerSetup.js");
 /**
@@ -159,7 +148,7 @@ function BuyScreenContent(props) {
                 setScreen({
                     id: "buy-with-crypto",
                 });
-            }, onSuccess: onSwapSuccess }));
+            }, onSuccess: onSwapSuccess, approvalAmount: screen.approvalAmount }));
     }
     if (screen.id === "fiat-flow" && payer) {
         return ((0, jsx_runtime_1.jsx)(FiatFlow_js_1.FiatFlow, { title: props.title, transactionMode: payOptions.mode === "transaction", quote: screen.quote, onBack: () => {
@@ -238,7 +227,7 @@ function BuyScreenContent(props) {
     return ((0, jsx_runtime_1.jsx)(basic_js_1.Container, { animate: "fadein", children: (0, jsx_runtime_1.jsxs)("div", { children: [screen.id === "main" && ((0, jsx_runtime_1.jsx)(MainScreen, { title: props.title, payerAccount: payer?.account, client: client, onSelectBuyToken: () => setScreen({ id: "select-to-token", backScreen: screen }), payOptions: payOptions, setTokenAmount: setTokenAmount, setToChain: setToChain, setToToken: setToToken, setFromChain: setFromChain, setFromToken: setFromToken, toChain: toChain, toToken: toToken, tokenAmount: tokenAmount, connectOptions: props.connectOptions, setScreen: setScreen, supportedDestinations: supportedDestinations, onBack: props.onBack, theme: props.theme, hasEditedAmount: hasEditedAmount, setHasEditedAmount: setHasEditedAmount, enabledPaymentMethods: enabledPaymentMethods })), (screen.id === "select-payment-method" ||
                     screen.id === "buy-with-crypto" ||
                     screen.id === "buy-with-fiat") &&
-                    payer && ((0, jsx_runtime_1.jsxs)(TokenSelectedLayout, { title: props.title, selectedChain: toChain, selectedToken: toToken, tokenAmount: tokenAmount, client: client, onBack: () => {
+                    payer && ((0, jsx_runtime_1.jsxs)(TokenSelectedLayout, { title: props.title, selectedChain: toChain, selectedToken: toToken, tokenAmount: tokenAmount, setTokenAmount: setTokenAmount, client: client, onBack: () => {
                         if (enabledPaymentMethods.buyWithCryptoEnabled &&
                             screen.id === "buy-with-fiat") {
                             setScreen({ id: "select-payment-method" });
@@ -272,7 +261,7 @@ function BuyScreenContent(props) {
                                         id: "select-payment-method",
                                     },
                                 });
-                            } })), screen.id === "buy-with-crypto" && activeAccount && ((0, jsx_runtime_1.jsx)(SwapScreenContent, { setScreen: setScreen, tokenAmount: deferredTokenAmount, toChain: toChain, toToken: toToken, fromChain: fromChain, fromToken: fromToken, showFromTokenSelector: () => {
+                            } })), screen.id === "buy-with-crypto" && activeAccount && ((0, jsx_runtime_1.jsx)(SwapScreenContent_js_1.SwapScreenContent, { setScreen: setScreen, tokenAmount: deferredTokenAmount, toChain: toChain, toToken: toToken, fromChain: fromChain, fromToken: fromToken, showFromTokenSelector: () => {
                                 setScreen({
                                     id: "select-from-token",
                                     backScreen: screen,
@@ -284,7 +273,7 @@ function BuyScreenContent(props) {
                                     payOptions.buyWithCrypto?.prefillSource?.allowEdits
                                         ?.chain === false &&
                                     payOptions.buyWithCrypto?.prefillSource?.allowEdits
-                                        ?.token === false) })), screen.id === "buy-with-fiat" && ((0, jsx_runtime_1.jsx)(FiatScreenContent, { setScreen: setScreen, tokenAmount: deferredTokenAmount, toChain: toChain, toToken: toToken, selectedCurrency: selectedCurrency, client: client, isEmbed: props.isEmbed, onDone: onDone, payOptions: payOptions, theme: props.theme, showCurrencySelector: () => {
+                                        ?.token === false) })), screen.id === "buy-with-fiat" && ((0, jsx_runtime_1.jsx)(FiatScreenContent_js_1.FiatScreenContent, { setScreen: setScreen, tokenAmount: deferredTokenAmount, toChain: toChain, toToken: toToken, selectedCurrency: selectedCurrency, client: client, isEmbed: props.isEmbed, onDone: onDone, payOptions: payOptions, theme: props.theme, showCurrencySelector: () => {
                                 setScreen({
                                     id: "select-currency",
                                     backScreen: screen,
@@ -292,9 +281,50 @@ function BuyScreenContent(props) {
                             }, payer: payer, setTokenAmount: setTokenAmount, setHasEditedAmount: setHasEditedAmount }))] }))] }) }));
 }
 function SelectedTokenInfo(props) {
+    const getWidth = () => {
+        let chars = props.tokenAmount.replace(".", "").length;
+        const hasDot = props.tokenAmount.includes(".");
+        if (hasDot) {
+            chars += 0.3;
+        }
+        return `calc(${`${Math.max(1, chars)}ch + 2px`})`;
+    };
     return ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "row", gap: "sm", center: "y", style: {
                 justifyContent: "space-between",
-            }, children: [(0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "row", gap: "xs", center: "y", children: [(0, jsx_runtime_1.jsx)(text_js_1.Text, { color: "primaryText", "data-testid": "tokenAmount", size: "xl", children: (0, formatNumber_js_1.formatNumber)(Number(props.tokenAmount), 6) }), (0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "row", gap: "xxs", center: "y", children: [(0, jsx_runtime_1.jsx)(TokenSymbol_js_1.TokenSymbol, { token: props.selectedToken, chain: props.selectedChain, size: "md", color: "secondaryText" }), (0, jsx_runtime_1.jsx)(PayTokenIcon_js_1.PayTokenIcon, { chain: props.selectedChain, client: props.client, size: "sm", token: props.selectedToken })] })] }), (0, jsx_runtime_1.jsx)(ChainName_js_1.ChainName, { chain: props.selectedChain, client: props.client, size: "sm", short: true })] }) }));
+            }, children: [(0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "row", gap: "xs", center: "y", children: [(0, jsx_runtime_1.jsx)(formElements_js_1.Input, { variant: "outline", pattern: "^[0-9]*[.,]?[0-9]*$", inputMode: "decimal", tabIndex: -1, placeholder: "0", type: "text", "data-placeholder": props.tokenAmount === "", value: props.tokenAmount || "0", disabled: false, onClick: (e) => {
+                                // put cursor at the end of the input
+                                if (props.tokenAmount === "") {
+                                    e.currentTarget.setSelectionRange(e.currentTarget.value.length, e.currentTarget.value.length);
+                                }
+                            }, onChange: (e) => {
+                                let value = e.target.value;
+                                if (value.startsWith(".")) {
+                                    value = `0${value}`;
+                                }
+                                if (value.length > 10) {
+                                    return;
+                                }
+                                const numValue = Number(value);
+                                if (Number.isNaN(numValue)) {
+                                    return;
+                                }
+                                if (value.startsWith("0") && !value.startsWith("0.")) {
+                                    props.setTokenAmount(value.slice(1));
+                                }
+                                else {
+                                    props.setTokenAmount(value);
+                                }
+                            }, style: {
+                                border: "none",
+                                fontSize: index_js_1.fontSize.lg,
+                                boxShadow: "none",
+                                borderRadius: "0",
+                                padding: "0",
+                                paddingBlock: "2px",
+                                fontWeight: 600,
+                                textAlign: "left",
+                                width: getWidth(),
+                            } }), (0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "row", gap: "xxs", center: "y", children: [(0, jsx_runtime_1.jsx)(TokenSymbol_js_1.TokenSymbol, { token: props.selectedToken, chain: props.selectedChain, size: "md", color: "secondaryText" }), (0, jsx_runtime_1.jsx)(PayTokenIcon_js_1.PayTokenIcon, { chain: props.selectedChain, client: props.client, size: "sm", token: props.selectedToken })] })] }), (0, jsx_runtime_1.jsx)(ChainName_js_1.ChainName, { chain: props.selectedChain, client: props.client, size: "sm", short: true })] }) }));
 }
 function MainScreen(props) {
     const { setTokenAmount, setToChain, setToToken, setFromChain, setFromToken, payerAccount, client, tokenAmount, payOptions, toToken, toChain, supportedDestinations, enabledPaymentMethods, } = props;
@@ -354,176 +384,7 @@ function MainScreen(props) {
 function TokenSelectedLayout(props) {
     return ((0, jsx_runtime_1.jsxs)(basic_js_1.Container, { children: [(0, jsx_runtime_1.jsx)(basic_js_1.Container, { p: "lg", children: (0, jsx_runtime_1.jsx)(basic_js_1.ModalHeader, { title: props.title, onBack: props.onBack }) }), (0, jsx_runtime_1.jsxs)(basic_js_1.Container, { px: "lg", style: {
                     paddingBottom: index_js_1.spacing.lg,
-                }, children: [(0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "xs" }), (0, jsx_runtime_1.jsx)(SelectedTokenInfo, { selectedToken: props.selectedToken, selectedChain: props.selectedChain, tokenAmount: props.tokenAmount, client: props.client }), (0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "md" }), (0, jsx_runtime_1.jsx)(basic_js_1.Line, {}), (0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "lg" }), (0, jsx_runtime_1.jsx)(text_js_1.Text, { size: "sm", children: " Pay with " }), (0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "sm" }), props.children] })] }));
-}
-function SwapScreenContent(props) {
-    const { setScreen, payer, client, toChain, tokenAmount, toToken, fromChain, fromToken, payOptions, disableTokenSelection, } = props;
-    const defaultRecipientAddress = props.payOptions?.paymentInfo?.sellerAddress;
-    const receiverAddress = defaultRecipientAddress || props.activeAccount.address;
-    const { drawerRef, drawerOverlayRef, isOpen, setIsOpen } = (0, Drawer_js_1.useDrawer)();
-    const [drawerScreen, setDrawerScreen] = (0, react_1.useState)("fees");
-    const fromTokenBalanceQuery = (0, useWalletBalance_js_1.useWalletBalance)({
-        address: payer.account.address,
-        chain: fromChain,
-        tokenAddress: (0, nativeToken_js_1.isNativeToken)(fromToken) ? undefined : fromToken.address,
-        client,
-    });
-    const fromTokenId = (0, nativeToken_js_1.isNativeToken)(fromToken)
-        ? addresses_js_1.NATIVE_TOKEN_ADDRESS
-        : fromToken.address.toLowerCase();
-    const toTokenId = (0, nativeToken_js_1.isNativeToken)(toToken)
-        ? addresses_js_1.NATIVE_TOKEN_ADDRESS
-        : toToken.address.toLowerCase();
-    const swapRequired = !!tokenAmount &&
-        !(fromChain.id === toChain.id && fromTokenId === toTokenId);
-    const quoteParams = swapRequired
-        ? {
-            // wallets
-            fromAddress: payer.account.address,
-            toAddress: receiverAddress,
-            // from
-            fromChainId: fromChain.id,
-            fromTokenAddress: (0, nativeToken_js_1.isNativeToken)(fromToken)
-                ? addresses_js_1.NATIVE_TOKEN_ADDRESS
-                : fromToken.address,
-            // to
-            toChainId: toChain.id,
-            toTokenAddress: (0, nativeToken_js_1.isNativeToken)(toToken)
-                ? addresses_js_1.NATIVE_TOKEN_ADDRESS
-                : toToken.address,
-            toAmount: tokenAmount,
-            client,
-            purchaseData: payOptions.purchaseData,
-        }
-        : undefined;
-    const quoteQuery = (0, useBuyWithCryptoQuote_js_1.useBuyWithCryptoQuote)(quoteParams, {
-        // refetch every 30 seconds
-        staleTime: 30 * 1000,
-        refetchInterval: 30 * 1000,
-        gcTime: 30 * 1000,
-    });
-    const sourceTokenAmount = swapRequired
-        ? quoteQuery.data?.swapDetails.fromAmount
-        : tokenAmount;
-    const isNotEnoughBalance = !!sourceTokenAmount &&
-        !!fromTokenBalanceQuery.data &&
-        Number(fromTokenBalanceQuery.data.displayValue) < Number(sourceTokenAmount);
-    const disableContinue = (swapRequired && !quoteQuery.data) || isNotEnoughBalance;
-    const switchChainRequired = props.payer.wallet.getChain()?.id !== fromChain.id;
-    const errorMsg = !quoteQuery.isLoading && quoteQuery.error
-        ? getErrorMessage(quoteQuery.error)
-        : undefined;
-    function showSwapFlow() {
-        if ((props.payOptions.mode === "direct_payment" ||
-            props.payOptions.mode === "fund_wallet") &&
-            !isNotEnoughBalance &&
-            !swapRequired) {
-            // same currency, just direct transfer
-            setScreen({
-                id: "transfer-flow",
-            });
-        }
-        else if (props.payOptions.mode === "transaction" &&
-            !isNotEnoughBalance &&
-            !swapRequired) {
-            if (payer.account.address !== receiverAddress) {
-                // needs transfer from another wallet before executing the transaction
-                setScreen({
-                    id: "transfer-flow",
-                });
-            }
-            else {
-                // has enough balance to just do the transaction directly
-                props.onDone();
-            }
-            return;
-        }
-        if (!quoteQuery.data) {
-            return;
-        }
-        setScreen({
-            id: "swap-flow",
-            quote: quoteQuery.data,
-        });
-    }
-    function showFees() {
-        if (!quoteQuery.data) {
-            return;
-        }
-        setIsOpen(true);
-        setDrawerScreen("fees");
-    }
-    return ((0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "column", gap: "md", animate: "fadein", children: [isOpen && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Drawer_js_1.DrawerOverlay, { ref: drawerOverlayRef }), (0, jsx_runtime_1.jsx)(Drawer_js_1.Drawer, { ref: drawerRef, close: () => setIsOpen(false), children: drawerScreen === "fees" && quoteQuery.data && ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(text_js_1.Text, { size: "lg", color: "primaryText", children: "Fees" }), (0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "lg" }), (0, jsx_runtime_1.jsx)(Fees_js_1.SwapFees, { quote: quoteQuery.data })] })) })] })), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(PayWithCrypto_js_1.PayWithCryptoQuoteInfo, { value: sourceTokenAmount || "", chain: fromChain, token: fromToken, isLoading: quoteQuery.isLoading && !sourceTokenAmount, client: client, freezeChainAndTokenSelection: disableTokenSelection, payerAccount: props.payer.account, swapRequired: swapRequired }), swapRequired && ((0, jsx_runtime_1.jsx)(EstimatedTimeAndFees_js_1.EstimatedTimeAndFees, { quoteIsLoading: quoteQuery.isLoading, estimatedSeconds: quoteQuery.data?.swapDetails.estimated.durationSeconds, onViewFees: showFees })), (0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "md" })] }), errorMsg && ((0, jsx_runtime_1.jsx)("div", { children: errorMsg.data?.minimumAmountEth ? ((0, jsx_runtime_1.jsxs)(text_js_1.Text, { color: "danger", size: "sm", center: true, multiline: true, children: ["Minimum amount is", " ", (0, formatNumber_js_1.formatNumber)(Number(errorMsg.data.minimumAmountEth), 6), " ", (0, jsx_runtime_1.jsx)(TokenSymbol_js_1.TokenSymbol, { token: toToken, chain: toChain, size: "sm", inline: true, color: "danger" })] })) : ((0, jsx_runtime_1.jsx)(text_js_1.Text, { color: "danger", size: "sm", center: true, multiline: true, children: errorMsg.message || defaultMessage })) })), !errorMsg && isNotEnoughBalance && ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(text_js_1.Text, { color: "danger", size: "sm", center: true, multiline: true, children: "Not enough funds." }), (0, jsx_runtime_1.jsx)(text_js_1.Text, { color: "danger", size: "sm", center: true, multiline: true, children: "Try a different wallet or token." })] })), errorMsg?.data?.minimumAmountEth ? ((0, jsx_runtime_1.jsx)(buttons_js_1.Button, { variant: "accent", fullWidth: true, onClick: () => {
-                    props.setTokenAmount((0, formatNumber_js_1.formatNumber)(Number(errorMsg.data?.minimumAmountEth), 6).toString());
-                    props.setHasEditedAmount(true);
-                }, children: "Set Minimum" })) : switchChainRequired &&
-                !quoteQuery.isLoading &&
-                !isNotEnoughBalance &&
-                !quoteQuery.error ? ((0, jsx_runtime_1.jsx)(SwitchNetwork_js_1.SwitchNetworkButton, { variant: "accent", fullWidth: true, switchChain: async () => {
-                    await props.payer.wallet.switchChain(fromChain);
-                } })) : ((0, jsx_runtime_1.jsx)(buttons_js_1.Button, { variant: disableContinue ? "outline" : "accent", fullWidth: true, "data-disabled": disableContinue, disabled: disableContinue, onClick: async () => {
-                    if (!disableContinue) {
-                        showSwapFlow();
-                    }
-                }, gap: "xs", children: quoteQuery.isLoading ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["Getting price quote", (0, jsx_runtime_1.jsx)(Spinner_js_1.Spinner, { size: "sm", color: "accentText" })] })) : ("Continue") }))] }));
-}
-function FiatScreenContent(props) {
-    const { toToken, tokenAmount, payer, client, setScreen, toChain, showCurrencySelector, selectedCurrency, } = props;
-    const defaultRecipientAddress = props.payOptions?.paymentInfo?.sellerAddress;
-    const receiverAddress = defaultRecipientAddress || props.payer.account.address;
-    const { drawerRef, drawerOverlayRef, isOpen, setIsOpen } = (0, Drawer_js_1.useDrawer)();
-    const [drawerScreen, setDrawerScreen] = (0, react_1.useState)("fees");
-    const buyWithFiatOptions = props.payOptions.buyWithFiat;
-    const fiatQuoteQuery = (0, useBuyWithFiatQuote_js_1.useBuyWithFiatQuote)(buyWithFiatOptions !== false && tokenAmount
-        ? {
-            fromCurrencySymbol: selectedCurrency.shorthand,
-            toChainId: toChain.id,
-            toAddress: receiverAddress,
-            toTokenAddress: (0, nativeToken_js_1.isNativeToken)(toToken)
-                ? addresses_js_1.NATIVE_TOKEN_ADDRESS
-                : toToken.address,
-            toAmount: tokenAmount,
-            client,
-            isTestMode: buyWithFiatOptions?.testMode,
-            purchaseData: props.payOptions.purchaseData,
-            fromAddress: payer.account.address,
-            preferredProvider: buyWithFiatOptions?.preferredProvider,
-        }
-        : undefined);
-    function handleSubmit() {
-        if (!fiatQuoteQuery.data) {
-            return;
-        }
-        const hasTwoSteps = (0, isSwapRequiredPostOnramp_js_1.isSwapRequiredPostOnramp)(fiatQuoteQuery.data);
-        let openedWindow = null;
-        if (!hasTwoSteps) {
-            openedWindow = (0, openOnRamppopup_js_1.openOnrampPopup)(fiatQuoteQuery.data.onRampLink, typeof props.theme === "string" ? props.theme : props.theme.type);
-            (0, pendingSwapTx_js_1.addPendingTx)({
-                type: "fiat",
-                intentId: fiatQuoteQuery.data.intentId,
-            });
-        }
-        setScreen({
-            id: "fiat-flow",
-            quote: fiatQuoteQuery.data,
-            openedWindow,
-        });
-    }
-    function showFees() {
-        if (!fiatQuoteQuery.data) {
-            return;
-        }
-        setDrawerScreen("fees");
-        setIsOpen(true);
-    }
-    const disableSubmit = !fiatQuoteQuery.data;
-    const errorMsg = !fiatQuoteQuery.isLoading && fiatQuoteQuery.error
-        ? getErrorMessage(fiatQuoteQuery.error)
-        : undefined;
-    return ((0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "column", gap: "md", animate: "fadein", children: [isOpen && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Drawer_js_1.DrawerOverlay, { ref: drawerOverlayRef }), (0, jsx_runtime_1.jsx)(Drawer_js_1.Drawer, { ref: drawerRef, close: () => setIsOpen(false), children: drawerScreen === "fees" && fiatQuoteQuery.data && ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(text_js_1.Text, { size: "lg", color: "primaryText", children: "Fees" }), (0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "lg" }), (0, jsx_runtime_1.jsx)(Fees_js_1.FiatFees, { quote: fiatQuoteQuery.data })] })) })] })), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(PayWIthCreditCard_js_1.PayWithCreditCard, { isLoading: fiatQuoteQuery.isLoading, value: fiatQuoteQuery.data?.fromCurrencyWithFees.amount, client: client, currency: selectedCurrency, onSelectCurrency: showCurrencySelector }), (0, jsx_runtime_1.jsx)(EstimatedTimeAndFees_js_1.EstimatedTimeAndFees, { quoteIsLoading: fiatQuoteQuery.isLoading, estimatedSeconds: fiatQuoteQuery.data?.estimatedDurationSeconds, onViewFees: showFees }), (0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "md" })] }), errorMsg && ((0, jsx_runtime_1.jsx)("div", { children: errorMsg.data?.minimumAmountEth ? ((0, jsx_runtime_1.jsxs)(text_js_1.Text, { color: "danger", size: "sm", center: true, multiline: true, children: ["Minimum amount is", " ", (0, formatNumber_js_1.formatNumber)(Number(errorMsg.data.minimumAmountEth), 6), " ", (0, jsx_runtime_1.jsx)(TokenSymbol_js_1.TokenSymbol, { token: toToken, chain: toChain, size: "sm", inline: true, color: "danger" })] })) : ((0, jsx_runtime_1.jsx)(text_js_1.Text, { color: "danger", size: "sm", center: true, multiline: true, children: errorMsg.message || defaultMessage })) })), errorMsg?.data?.minimumAmountEth ? ((0, jsx_runtime_1.jsx)(buttons_js_1.Button, { variant: "accent", fullWidth: true, onClick: () => {
-                    props.setTokenAmount((0, formatNumber_js_1.formatNumber)(Number(errorMsg.data?.minimumAmountEth), 6).toString());
-                    props.setHasEditedAmount(true);
-                }, children: "Set Minimum" })) : ((0, jsx_runtime_1.jsx)(buttons_js_1.Button, { variant: disableSubmit ? "outline" : "accent", "data-disabled": disableSubmit, disabled: disableSubmit, fullWidth: true, onClick: handleSubmit, gap: "xs", children: fiatQuoteQuery.isLoading ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["Getting price quote", (0, jsx_runtime_1.jsx)(Spinner_js_1.Spinner, { size: "sm", color: "accentText" })] })) : ("Continue") }))] }));
+                }, children: [(0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "xs" }), (0, jsx_runtime_1.jsx)(SelectedTokenInfo, { selectedToken: props.selectedToken, selectedChain: props.selectedChain, tokenAmount: props.tokenAmount, setTokenAmount: props.setTokenAmount, client: props.client }), (0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "md" }), (0, jsx_runtime_1.jsx)(basic_js_1.Line, {}), (0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "lg" }), (0, jsx_runtime_1.jsx)(text_js_1.Text, { size: "sm", children: " Pay with " }), (0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "sm" }), props.children] })] }));
 }
 function createSupportedTokens(data, payOptions, supportedTokensOverrides) {
     const tokens = {};
@@ -574,15 +435,4 @@ function ChainSelectionScreen(props) {
             },
         } }));
 }
-const defaultMessage = "Unable to get price quote";
-// biome-ignore lint/suspicious/noExplicitAny: <explanation>
-function getErrorMessage(err) {
-    if (typeof err.error === "object") {
-        return err.error;
-    }
-    return {
-        code: "UNABLE_TO_GET_PRICE_QUOTE",
-        message: defaultMessage,
-    };
-}
 //# sourceMappingURL=BuyScreen.js.map