From 10d49aa9b12c53d05d6fdde5245fc94220ce5b20 Mon Sep 17 00:00:00 2001 From: Chaitanya Potti Date: Thu, 14 Dec 2023 19:20:26 +0800 Subject: [PATCH] remove xanpool, wyre --- .vscode/settings.json | 2 +- .../WalletTopupBase/WalletTopupBase.vue | 5 +- src/config.js | 7 -- .../WalletTopupXanpool.scss | 22 ---- .../WalletTopupXanpool/WalletTopupXanpool.vue | 103 ------------------ .../WalletTopup/WalletTopupXanpool/index.js | 1 - src/containers/WalletTopup/index.js | 1 - src/plugins/xanpool.js | 21 ---- src/router.js | 5 - src/store/PaymentActions/index.js | 16 +-- src/store/PaymentActions/xanpool.js | 45 -------- src/supportedCurrencies.js | 4 +- src/utils/enums.js | 1 - src/utils/sentry.js | 1 - src/utils/utils.js | 23 ---- 15 files changed, 4 insertions(+), 253 deletions(-) delete mode 100644 src/containers/WalletTopup/WalletTopupXanpool/WalletTopupXanpool.scss delete mode 100644 src/containers/WalletTopup/WalletTopupXanpool/WalletTopupXanpool.vue delete mode 100644 src/containers/WalletTopup/WalletTopupXanpool/index.js delete mode 100644 src/plugins/xanpool.js delete mode 100644 src/store/PaymentActions/xanpool.js diff --git a/.vscode/settings.json b/.vscode/settings.json index 0fb614cc5..94bf22912 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,7 +6,7 @@ "eslint.format.enable": true, "eslint.lintTask.enable": true, "editor.codeActionsOnSave": { - "source.fixAll": true + "source.fixAll": "explicit" }, "prettier.printWidth": 150, "cSpell.words": ["ARBITRUM", "loglevel", "openlogin", "toruslabs", "unstoppabledomains", "walletconnect"] diff --git a/src/components/WalletTopup/WalletTopupBase/WalletTopupBase.vue b/src/components/WalletTopup/WalletTopupBase/WalletTopupBase.vue index 6114da19c..0e3c78f3b 100644 --- a/src/components/WalletTopup/WalletTopupBase/WalletTopupBase.vue +++ b/src/components/WalletTopup/WalletTopupBase/WalletTopupBase.vue @@ -33,8 +33,7 @@
{{ t('walletTopUp.youSend') }} - {{ t('walletTopUp.min') }} {{ selectedProvider === XANPOOL ? '0.1 ETH' : minOrderValue }}, {{ t('walletTopUp.max') }} - {{ maxOrderValue }} USD* + {{ t('walletTopUp.min') }} {{ minOrderValue }}, {{ t('walletTopUp.max') }} {{ maxOrderValue }} USD*
- - - - - - diff --git a/src/containers/WalletTopup/WalletTopupXanpool/index.js b/src/containers/WalletTopup/WalletTopupXanpool/index.js deleted file mode 100644 index 54d205eea..000000000 --- a/src/containers/WalletTopup/WalletTopupXanpool/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './WalletTopupXanpool.vue' diff --git a/src/containers/WalletTopup/index.js b/src/containers/WalletTopup/index.js index cabeb889e..595b400c3 100644 --- a/src/containers/WalletTopup/index.js +++ b/src/containers/WalletTopup/index.js @@ -4,4 +4,3 @@ export { default as WalletTopupMoonpay } from './WalletTopupMoonpay' export { default as WalletTopupRampNetwork } from './WalletTopupRampNetwork' export { default as WalletTopupSimplex } from './WalletTopupSimplex' export { default as WalletTopupTransak } from './WalletTopupTransak' -export { default as WalletTopupXanpool } from './WalletTopupXanpool' diff --git a/src/plugins/xanpool.js b/src/plugins/xanpool.js deleted file mode 100644 index 8d04b05fe..000000000 --- a/src/plugins/xanpool.js +++ /dev/null @@ -1,21 +0,0 @@ -import log from 'loglevel' - -import config from '../config' -import { post } from '../utils/httpHelpers' - -const postQuote = (requestObject, headers) => { - try { - const options = { - mode: 'cors', - headers: { - 'Content-Type': 'application/json;charset=UTF-8', - ...headers, - }, - } - return post(`${config.xanpoolApiQuoteHost}`, requestObject, options) - } catch (error) { - log.error(error) - } - return undefined -} -export default postQuote diff --git a/src/router.js b/src/router.js index b1de007c0..554a9f1ba 100644 --- a/src/router.js +++ b/src/router.js @@ -124,11 +124,6 @@ const router = new Router({ name: 'walletTopupMoonpay', component: () => import(/* webpackChunkName: "walletTopupMoonpay" */ './containers/WalletTopup/WalletTopupMoonpay'), }, - { - path: 'xanpool', - name: 'walletTopupXanpool', - component: () => import(/* webpackChunkName: "walletTopupXanpool" */ './containers/WalletTopup/WalletTopupXanpool'), - }, { path: 'mercuryo', name: 'walletTopupMercuryo', diff --git a/src/store/PaymentActions/index.js b/src/store/PaymentActions/index.js index 593619c3a..69b45e634 100644 --- a/src/store/PaymentActions/index.js +++ b/src/store/PaymentActions/index.js @@ -4,7 +4,7 @@ import config from '../../config' import PopupWithBcHandler from '../../handlers/Popup/PopupWithBcHandler' import vuetify from '../../plugins/vuetify' import torus from '../../torus' -import { BANXA, BANXA_NETWORK_MAP, MAINNET, MERCURYO, MOONPAY, RAMPNETWORK, TRANSAK, TRANSAK_NETWORK_MAP, XANPOOL } from '../../utils/enums' +import { BANXA, BANXA_NETWORK_MAP, MAINNET, MERCURYO, MOONPAY, RAMPNETWORK, TRANSAK, TRANSAK_NETWORK_MAP } from '../../utils/enums' import { fakeStream, getTimeout, paymentProviders, randomId } from '../../utils/utils' import banxa from './banxa' import mercuryo from './mercuryo' @@ -12,7 +12,6 @@ import moonpay from './moonpay' import rampnetwork from './rampnetwork' import simplex from './simplex' import transak from './transak' -import xanpool from './xanpool' const topupStream = (torus && torus.communicationMux && torus.communicationMux.getStream('topup')) || fakeStream @@ -40,7 +39,6 @@ export default { ...simplex, ...rampnetwork, ...moonpay, - ...xanpool, ...mercuryo, ...transak, async initiateTopup({ state, dispatch }, { provider, params, preopenInstanceId }) { @@ -109,18 +107,6 @@ export default { selectedAddress: selectedParameters.selectedAddress, }) handleSuccess(success) - } else if (provider === XANPOOL) { - // xanpool - const { success } = await dispatch('fetchXanpoolOrder', { - currentOrder: { - selectedCryptoCurrency: selectedParameters.selectedCryptoCurrency || 'ETH', - fiatValue: selectedParameters.fiatValue || '', - selectedCurrency: selectedParameters.selectedCurrency || '', - }, - preopenInstanceId, - selectedAddress: selectedParameters.selectedAddress, - }) - handleSuccess(success) } else if (provider === MERCURYO) { // mercuryo const currentOrder = { diff --git a/src/store/PaymentActions/xanpool.js b/src/store/PaymentActions/xanpool.js deleted file mode 100644 index 206a39379..000000000 --- a/src/store/PaymentActions/xanpool.js +++ /dev/null @@ -1,45 +0,0 @@ -import config from '../../config' -import PopupWithBcHandler from '../../handlers/Popup/PopupWithBcHandler' -import getQuote from '../../plugins/xanpool' -import { XANPOOL } from '../../utils/enums' -import { getTimeout, randomId } from '../../utils/utils' - -export default { - fetchXanpoolQuote(context, payload) { - // returns a promise - return getQuote({ - type: payload.type || 'buy', - cryptoCurrency: payload.selectedCryptoCurrency, - currency: payload.selectedCurrency, - fiat: +Number.parseFloat(payload.fiatValue), - }) - }, - fetchXanpoolOrder({ state, dispatch }, { currentOrder, preopenInstanceId, selectedAddress }) { - const orderInstanceId = randomId() - const instanceState = encodeURIComponent(window.btoa(JSON.stringify({ instanceId: orderInstanceId, provider: XANPOOL }))) - const parameters = { - apiKey: config.xanpoolLiveAPIKEY, - wallet: selectedAddress || undefined, - fiat: currentOrder.fiatValue || undefined, - cryptoCurrency: currentOrder.selectedCryptoCurrency || undefined, - currency: currentOrder.selectedCurrency || undefined, - partnerData: selectedAddress || state.selectedAddress, - redirectUrl: `${config.redirect_uri}?state=${instanceState}`, - transactionType: 'buy', - } - - return dispatch('postXanpoolOrder', { params: parameters, path: config.xanpoolHost, preopenInstanceId, orderInstanceId }) - }, - async postXanpoolOrder(_, { path, params, preopenInstanceId, orderInstanceId }) { - const parameterString = new URLSearchParams(JSON.parse(JSON.stringify(params))) - const finalUrl = `${path}?${parameterString.toString()}` - const xanpoolWindow = new PopupWithBcHandler({ - preopenInstanceId, - url: finalUrl, - channelName: `redirect_channel_${orderInstanceId}`, - timeout: getTimeout({ isPaymentTx: true }), - }) - await xanpoolWindow.handle() - return { success: true } - }, -} diff --git a/src/supportedCurrencies.js b/src/supportedCurrencies.js index 7d3f1de16..549fac130 100644 --- a/src/supportedCurrencies.js +++ b/src/supportedCurrencies.js @@ -1,4 +1,4 @@ -import { BANXA, MERCURYO, MOONPAY, RAMPNETWORK, SIMPLEX, TRANSAK, XANPOOL } from './utils/enums' +import { BANXA, MERCURYO, MOONPAY, RAMPNETWORK, SIMPLEX, TRANSAK } from './utils/enums' /** * From https://min-api.cryptocompare.com/data/v2/pair/mapping/fsym?fsym=BTC&extraParams=YourSite @@ -492,8 +492,6 @@ const PROVIDER_SUPPORTED_FIAT_CURRENCIES = { 'THB', 'UYU', ], - // From https://xanpool.com/ fiat select dropdown - [XANPOOL]: ['SGD', 'HKD', 'THB', 'PHP', 'INR', 'IDR', 'MYR', 'AUD', 'NZD', 'KRW'], // https://help.mercuryo.io/en/articles/6121246-which-fiat-currencies-are-supported // RUB / UAH currently not supported [MERCURYO]: [ diff --git a/src/utils/enums.js b/src/utils/enums.js index 92637fd5a..ba9065fa1 100644 --- a/src/utils/enums.js +++ b/src/utils/enums.js @@ -657,7 +657,6 @@ export const ALLOWED_VERIFIERS = [ }, ] -export const XANPOOL = 'xanpool' export const RAMPNETWORK = 'rampnetwork' export const SIMPLEX = 'simplex' export const MOONPAY = 'moonpay' diff --git a/src/utils/sentry.js b/src/utils/sentry.js index dd9f05123..b68dca200 100644 --- a/src/utils/sentry.js +++ b/src/utils/sentry.js @@ -35,7 +35,6 @@ export function installSentry(Vue) { config.simplexApiHost, config.moonpayApiHost, config.rampApiHost, - config.xanpoolApiHost, config.mercuryoApiHost, config.transakApiHost, ], diff --git a/src/utils/utils.js b/src/utils/utils.js index 44ed44554..dd3856dc5 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -113,7 +113,6 @@ import { TWITTER, WECHAT, WEIBO, - XANPOOL, // XDAI, XDAI_CHAIN_ID, XDAI_CODE, @@ -544,28 +543,6 @@ export const paymentProviders = { receiveHint: 'walletTopUp.receiveHintRamp', enforceMax: false, }, - [XANPOOL]: { - line1: 'PayNow/ InstaPay/ FPS/ GoJekPay/ UPI/ PromptPay/
ViettelPay/ DuitNow', - line2: '2.5% buying, 3% selling', - line3: '$2,500 / day', - status: ACTIVE, - logoExtension: SVG, - supportPage: 'mailto:support@xanpool.com', - minOrderValue: 100, - maxOrderValue: 2500, - validCurrencies: supportedFiatCurrencies(XANPOOL), - validCryptoCurrenciesByChain: { - [MAINNET]: [ - { value: 'ETH', display: 'ETH' }, - { value: 'USDT', display: 'USDT' }, - { value: 'USDC', display: 'USDC' }, - ], - }, - includeFees: true, - api: true, - sell: true, - enforceMax: false, - }, [MERCURYO]: { line1: 'Credit/ Debit Card/ Apple Pay', line2: '3.95% or 4 USD',