Merge remote-tracking branch 'origin/main' into joaquim/always-show-modal

Author: joaquim-verges

apps/portal/src/app/engine/v3/faq/page.mdx

@@ -3,11 +3,11 @@ import { Callout, Details } from "@doc";
 # Engine FAQs
 
 <Details summary="How is pricing calculated for Engine Cloud?">
-Pricing is calculated through the number of write requests (ex: /v1/write/contract) made through the Engine API. Requests cost $1 per 1,000 requests. Read requests made through Engine API are free, within the RPC limits/plan. 
+Pricing is calculated through the number of write requests (ex: /v1/write/contract) and sign requests (ex: /v1/sign/transaction) made through the Engine API. Write and sign requests cost $1 per 1,000 requests. Read requests made through Engine API are free, within the RPC limits/plan. 
 
 For transactions through server wallets paid through the user's thirdweb account, users will pay a 5% premium on the gas fee of each transaction completed on any mainnet as part of account abstraction fees. There are no gas charges for testnets.
 
-**Please note: Legacy pricing plans may be subject to the 10% fee instead of 5%. Please update your pricing plan to avoid being subject to the 10% fee.** 
+**Please note: Legacy pricing plans may be subject to the 10% fee specified when signed up instead of 5%. [See pricing page for updated plans and benefits](https://thirdweb.com/pricing)** 
 
 The breakdown for usage and transaction fees can be found in your usage dashboard under the team overview. 
 </Details>

packages/thirdweb/src/bridge/Onramp.ts

@@ -79,7 +79,7 @@ interface OnrampApiRequestBody {
  * });
  *
  * console.log(preparedOnramp.link); // URL to redirect the user to
- * console.log(preparedOnramp.destinationAmount); // Amount of token user will receive
+ * console.log(preparedOnramp.currencyAmount); // Amount in fiat the user will pay
  * ```
  *
  * This function returns a quote that might look like:

packages/thirdweb/src/pay/convert/cryptoToFiat.test.ts

@@ -1,10 +1,12 @@
 import { describe, expect, it, vi } from "vitest";
 import { TEST_CLIENT } from "~test/test-clients.js";
-import { TEST_ACCOUNT_A } from "~test/test-wallets.js";
 import { base } from "../../chains/chain-definitions/base.js";
 import { ethereum } from "../../chains/chain-definitions/ethereum.js";
 import { sepolia } from "../../chains/chain-definitions/sepolia.js";
-import { NATIVE_TOKEN_ADDRESS } from "../../constants/addresses.js";
+import {
+  NATIVE_TOKEN_ADDRESS,
+  ZERO_ADDRESS,
+} from "../../constants/addresses.js";
 import { convertCryptoToFiat } from "./cryptoToFiat.js";
 
 describe.runIf(process.env.TW_SECRET_KEY)("Pay: crypto-to-fiat", () => {
@@ -49,7 +51,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: crypto-to-fiat", () => {
     expect(data.result).toBe(0);
   });
 
-  it("should throw error for testnet chain (because testnets are not supported", async () => {
+  it("should throw error for testnet chain (because testnets are not supported)", async () => {
     await expect(
       convertCryptoToFiat({
         chain: sepolia,
@@ -81,13 +83,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: crypto-to-fiat", () => {
     await expect(
       convertCryptoToFiat({
         chain: base,
-        fromTokenAddress: TEST_ACCOUNT_A.address,
+        fromTokenAddress: ZERO_ADDRESS,
         fromAmount: 1,
         to: "USD",
         client: TEST_CLIENT,
       }),
     ).rejects.toThrowError(
-      `Error: ${TEST_ACCOUNT_A.address} on chainId: ${base.id} is not a valid contract address.`,
+      `Error: ${ZERO_ADDRESS} on chainId: ${base.id} is not a valid contract address.`,
     );
   });
   it("should throw if response is not OK", async () => {

packages/thirdweb/src/pay/convert/fiatToCrypto.test.ts

@@ -1,10 +1,12 @@
 import { describe, expect, it, vi } from "vitest";
 import { TEST_CLIENT } from "~test/test-clients.js";
-import { TEST_ACCOUNT_A } from "~test/test-wallets.js";
 import { base } from "../../chains/chain-definitions/base.js";
 import { ethereum } from "../../chains/chain-definitions/ethereum.js";
 import { sepolia } from "../../chains/chain-definitions/sepolia.js";
-import { NATIVE_TOKEN_ADDRESS } from "../../constants/addresses.js";
+import {
+  NATIVE_TOKEN_ADDRESS,
+  ZERO_ADDRESS,
+} from "../../constants/addresses.js";
 import { convertFiatToCrypto } from "./fiatToCrypto.js";
 
 describe.runIf(process.env.TW_SECRET_KEY)("Pay: fiatToCrypto", () => {
@@ -84,13 +86,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: fiatToCrypto", () => {
     await expect(
       convertFiatToCrypto({
         chain: base,
-        to: TEST_ACCOUNT_A.address,
+        to: ZERO_ADDRESS,
         fromAmount: 1,
         from: "USD",
         client: TEST_CLIENT,
       }),
     ).rejects.toThrowError(
-      `Error: ${TEST_ACCOUNT_A.address} on chainId: ${base.id} is not a valid contract address.`,
+      `Error: ${ZERO_ADDRESS} on chainId: ${base.id} is not a valid contract address.`,
     );
   });
   it("should throw if response is not OK", async () => {