{{ t("dappLogin.completeVerification") }}.
diff --git a/src/plugins/Topup/moonpay.ts b/src/plugins/Topup/moonpay.ts
index 2f9e1183..d2e1c907 100644
--- a/src/plugins/Topup/moonpay.ts
+++ b/src/plugins/Topup/moonpay.ts
@@ -74,6 +74,11 @@ const configDetails: TopUpProvider = {
label: "SOL",
symbol: "sol",
},
+ {
+ value: "USDC",
+ label: "USDC",
+ symbol: "usdc_sol",
+ },
],
validCurrencies: ["USD", "EUR", "GBP"].map((k) => {
return { value: k, label: k };
diff --git a/src/scripts/importLocales.js b/src/scripts/importLocales.js
deleted file mode 100644
index 44b127a8..00000000
--- a/src/scripts/importLocales.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/* eslint-disable */
-const https = require("https");
-const fs = require("fs");
-const path = require("path");
-const log = require("loglevel");
-
-const localeUrl = "https://solana-api.tor.us/locales";
-
-function getLocale() {
- return new Promise((resolve, reject) => {
- const request = https.get(`${localeUrl}`, (response) => {
- let body = "";
- response.on("data", (data) => {
- body += data;
- });
- response.on("end", () => {
- resolve(JSON.parse(body));
- });
- });
-
- request.on("error", (error) => {
- reject(error);
- });
-
- request.end();
- });
-}
-
-getLocale()
- .then((result) => {
- const locales = result.data;
- const folder = "./src/plugins/i18n/";
- const folderPath = path.resolve(folder);
- if (!fs.existsSync(folderPath)) {
- fs.mkdirSync(folderPath);
- }
- // Create json files
- const keys = Object.keys(locales);
- for (const localeKey of keys) {
- if (Object.prototype.hasOwnProperty.call(locales, localeKey)) {
- const filePath = path.resolve(`${folder}${localeKey}.json`);
- fs.writeFile(filePath, JSON.stringify(locales[localeKey], null, 2), { flag: "w" }, (error) => {
- if (error) throw error;
- });
- }
- }
- })
- .catch((error) => {
- log.error(error);
- });
diff --git a/src/scripts/importLocales.mjs b/src/scripts/importLocales.mjs
new file mode 100644
index 00000000..fa7e6e89
--- /dev/null
+++ b/src/scripts/importLocales.mjs
@@ -0,0 +1,70 @@
+import fs from "fs";
+import fetch from "node-fetch";
+import path from "path";
+
+const args = process.argv.slice(2);
+const branch = args[0] || "main";
+const repoUrl = `https://raw.githubusercontent.com/Web3Auth/web3auth-locales/${branch}/Solana-locale`;
+const localeGroups = [
+ "locales-account-menu",
+ "locales-email-phone-login",
+ "locales-login",
+ "locales-nav-bar",
+ "locales-wallet-activity",
+ "locales-wallet-dapp",
+ "locales-wallet-discover",
+ "locales-wallet-home",
+ "locales-wallet-nft",
+ "locales-wallet-settings",
+ "locales-wallet-spay",
+ "locales-wallet-top-up",
+ "locales-wallet-transfer",
+];
+
+const promises = [];
+const locales = {};
+
+localeGroups.forEach((group) => {
+ const urlFetch = `${repoUrl}/${group}.json`;
+ promises.push(fetch(urlFetch).then((res) => res.json()));
+});
+
+function processRecords(items) {
+ Object.keys(items).forEach((groupKey) => {
+ Object.keys(items[groupKey]).forEach((wordKey) => {
+ Object.keys(items[groupKey][wordKey]).forEach((localeKey) => {
+ if (!locales[localeKey]) locales[localeKey] = {};
+ if (!locales[localeKey][groupKey]) locales[localeKey][groupKey] = {};
+ locales[localeKey][groupKey][wordKey] = items[groupKey][wordKey][localeKey];
+ });
+ });
+ });
+}
+
+Promise.all(promises)
+ .then((results) => {
+ results.forEach((set) => {
+ processRecords(set);
+ });
+
+ // Create json files
+ const folder = "./src/plugins/i18n/";
+ const folderPath = path.resolve(folder);
+ if (!fs.existsSync(folderPath)) {
+ fs.mkdirSync(folderPath);
+ }
+
+ const keys = Object.keys(locales);
+ for (const localeKey of keys) {
+ if (Object.prototype.hasOwnProperty.call(locales, localeKey)) {
+ const filePath = path.resolve(`${folder}${localeKey}.json`);
+ fs.writeFile(filePath, JSON.stringify(locales[localeKey], null, 2), { flag: "w" }, (error) => {
+ if (error) throw error;
+ });
+ }
+ }
+ })
+ .catch((error) => {
+ // eslint-disable-next-line no-console
+ console.error(error);
+ });
diff --git a/src/utils/const.ts b/src/utils/const.ts
index c02b08e9..f9b2633c 100644
--- a/src/utils/const.ts
+++ b/src/utils/const.ts
@@ -5,7 +5,7 @@ export const WALLET_SUPPORTED_NETWORKS: { [key: string]: ProviderConfig } = {
...SUPPORTED_NETWORKS,
mainnet: {
...SUPPORTED_NETWORKS.mainnet,
- rpcTarget: "https://green-dark-sky.solana-mainnet.quiknode.pro/0b4b99540b7930cf590dc7fb0a2d1c9a906fd53c/",
+ rpcTarget: "https://green-dark-sky.solana-mainnet.quiknode.pro/97c87069b81ef4ec0765a267525c82153e5404fc/",
},
testnet: {
...SUPPORTED_NETWORKS.testnet,
diff --git a/src/utils/enums.ts b/src/utils/enums.ts
index 9c69d9b7..231e6419 100644
--- a/src/utils/enums.ts
+++ b/src/utils/enums.ts
@@ -354,3 +354,10 @@ export enum SORT_SPL_TOKEN {
TOKEN_CURRENCY_VALUE = "token_currency_value",
TOKEN_AMOUNT = "noOfTokens",
}
+
+export const AVAILABLE_WEBSITES = {
+ Ethereum: "https://app.tor.us",
+ Solana: "https://solana.tor.us",
+ Polygon: "https://polygon.tor.us",
+ Binance: "https://bnb.tor.us",
+};
diff --git a/src/utils/solanaHelpers.ts b/src/utils/solanaHelpers.ts
index bddae629..53805429 100644
--- a/src/utils/solanaHelpers.ts
+++ b/src/utils/solanaHelpers.ts
@@ -1,4 +1,4 @@
-import { parseURL, TransactionRequestURL } from "@solana/pay";
+import { TransactionRequestURL } from "@solana/pay";
import {
Account,
AccountLayout,
@@ -445,9 +445,9 @@ export const validateUrlTransactionSignature = (transaction: Transaction, select
transaction.serialize({ requireAllSignatures: false });
};
-export const parseSolanaPayRequestLink = async (request: string, account: string, connection: Connection) => {
+export const parseSolanaPayRequestLink = async (request: TransactionRequestURL, account: string, connection: Connection) => {
log.info(request);
- const { label, message, link } = parseURL(request) as TransactionRequestURL;
+ const { label, message, link } = request;
// get link
// return {"label":"