From bdb9d0942b27e523eb05d901a603ce4d196a7b3d Mon Sep 17 00:00:00 2001 From: Gamaliel Padillo Date: Tue, 30 Jul 2024 16:28:48 -0700 Subject: [PATCH 1/6] devop: update version --- package.json | 2 +- .../OrderForm/components/TokenSelect.vue | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 726d1a39..cf490139 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mew-ccswap", - "version": "6.9.10", + "version": "6.9.11-ccswap.2", "private": true, "packageManager": "yarn@1.22.19", "scripts": { diff --git a/src/components/OrderForm/components/TokenSelect.vue b/src/components/OrderForm/components/TokenSelect.vue index cb884d7b..31a323ec 100644 --- a/src/components/OrderForm/components/TokenSelect.vue +++ b/src/components/OrderForm/components/TokenSelect.vue @@ -258,13 +258,13 @@ const networkList = computed(() => { }); const filteredNetworkList = computed(() => { - const withTokensNetwork = networkList.value - .filter((network) => { - if (network.tokens.length > 0) return network; - }) - .filter((network) => { - if (hasValidPrices(network.name)) return network; - }); + const withTokensNetwork = networkList.value; + // .filter((network) => { + // if (network.tokens.length > 0) return network; + // }) + // .filter((network) => { + // if (hasValidPrices(network.name)) return network; + // }); const filter = networkSearchInput.value.toLowerCase(); return withTokensNetwork.filter((network) => { if ( From 4b8319bced731d7eb34c28f5d3a90cac5f172c18 Mon Sep 17 00:00:00 2001 From: Gamaliel Padillo Date: Tue, 30 Jul 2024 16:29:47 -0700 Subject: [PATCH 2/6] devop: remove comments --- src/components/OrderForm/components/TokenSelect.vue | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/components/OrderForm/components/TokenSelect.vue b/src/components/OrderForm/components/TokenSelect.vue index 31a323ec..fb65a6d4 100644 --- a/src/components/OrderForm/components/TokenSelect.vue +++ b/src/components/OrderForm/components/TokenSelect.vue @@ -259,12 +259,6 @@ const networkList = computed(() => { const filteredNetworkList = computed(() => { const withTokensNetwork = networkList.value; - // .filter((network) => { - // if (network.tokens.length > 0) return network; - // }) - // .filter((network) => { - // if (hasValidPrices(network.name)) return network; - // }); const filter = networkSearchInput.value.toLowerCase(); return withTokensNetwork.filter((network) => { if ( From ca82fefe9eb34330f4cace9c1dacbd06fb3bfeec Mon Sep 17 00:00:00 2001 From: Gamaliel Padillo Date: Tue, 30 Jul 2024 16:30:33 -0700 Subject: [PATCH 3/6] devop: bring back release github actions --- .github/workflows/create-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 0e7a4c2b..7e9d589c 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -3,7 +3,7 @@ name: create release on: push: branches: - - develop + - main jobs: deploy: From 919f6d57ff35b60df90acf39f182f3795b6c6304 Mon Sep 17 00:00:00 2001 From: Gamaliel Padillo Date: Tue, 30 Jul 2024 16:33:20 -0700 Subject: [PATCH 4/6] devop: disable BSC for now as no response from simplex --- src/components/OrderForm/network/networks.ts | 88 ++++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/src/components/OrderForm/network/networks.ts b/src/components/OrderForm/network/networks.ts index 851681ce..1874d907 100644 --- a/src/components/OrderForm/network/networks.ts +++ b/src/components/OrderForm/network/networks.ts @@ -94,50 +94,50 @@ export const Networks = >[ username: '', password: '', }, - { - name: 'BNB', - name_long: 'Binance Smart Chain', - chainID: 56, - tokens: [ - { - img: require('@/assets/images/crypto/FDUSD-SC.png'), - name: 'First Digital USD', - subtext: 'First Digital USD', - value: 'First Digital USD', - symbol: 'FDUSD-SC', - network: 'BNB', - decimals: 18 - }, - { - img: getIcon('USDC'), - name: 'USD Coin (Binance Pegged)', - subtext: 'USD Coin (Binance Pegged)', - value: 'USD Coin (Binance Pegged)', - symbol: 'USDC-SC', - network: 'BNB', - decimals: 18 - }, - { - img: getIcon('USDT'), - name: 'Tether USD (Binance Smart Chain)', - subtext: 'Tether USD (Binance Smart Chain)', - value: 'Tether USD (Binance Smart Chain)', - symbol: 'USDT-SC', - network: 'BNB', - decimals: 18 - }, - ], - icon: getIcon('BNB'), - currencyName: 'BNB', - gasPriceMultiplier: 1, - coingeckoID: 'binancecoin', - service: 'myetherwallet.com-ws', - url: 'wss://nodes.mewapi.io/ws/bsc', - port: 443, - auth: false, - username: '', - password: '', - }, + // { + // name: 'BNB', + // name_long: 'Binance Smart Chain', + // chainID: 56, + // tokens: [ + // { + // img: require('@/assets/images/crypto/FDUSD-SC.png'), + // name: 'First Digital USD', + // subtext: 'First Digital USD', + // value: 'First Digital USD', + // symbol: 'FDUSD-SC', + // network: 'BNB', + // decimals: 18 + // }, + // { + // img: getIcon('USDC'), + // name: 'USD Coin (Binance Pegged)', + // subtext: 'USD Coin (Binance Pegged)', + // value: 'USD Coin (Binance Pegged)', + // symbol: 'USDC-SC', + // network: 'BNB', + // decimals: 18 + // }, + // { + // img: getIcon('USDT'), + // name: 'Tether USD (Binance Smart Chain)', + // subtext: 'Tether USD (Binance Smart Chain)', + // value: 'Tether USD (Binance Smart Chain)', + // symbol: 'USDT-SC', + // network: 'BNB', + // decimals: 18 + // }, + // ], + // icon: getIcon('BNB'), + // currencyName: 'BNB', + // gasPriceMultiplier: 1, + // coingeckoID: 'binancecoin', + // service: 'myetherwallet.com-ws', + // url: 'wss://nodes.mewapi.io/ws/bsc', + // port: 443, + // auth: false, + // username: '', + // password: '', + // }, { name: 'MATIC', name_long: 'Polygon (Matic)', From b5b2701c304d6913a591deac1ebbb3d73c8ab57f Mon Sep 17 00:00:00 2001 From: Gamaliel Padillo Date: Tue, 30 Jul 2024 16:33:41 -0700 Subject: [PATCH 5/6] devop: remove comment --- src/components/OrderForm/network/networks.ts | 44 -------------------- 1 file changed, 44 deletions(-) diff --git a/src/components/OrderForm/network/networks.ts b/src/components/OrderForm/network/networks.ts index 1874d907..53076cf2 100644 --- a/src/components/OrderForm/network/networks.ts +++ b/src/components/OrderForm/network/networks.ts @@ -94,50 +94,6 @@ export const Networks = >[ username: '', password: '', }, - // { - // name: 'BNB', - // name_long: 'Binance Smart Chain', - // chainID: 56, - // tokens: [ - // { - // img: require('@/assets/images/crypto/FDUSD-SC.png'), - // name: 'First Digital USD', - // subtext: 'First Digital USD', - // value: 'First Digital USD', - // symbol: 'FDUSD-SC', - // network: 'BNB', - // decimals: 18 - // }, - // { - // img: getIcon('USDC'), - // name: 'USD Coin (Binance Pegged)', - // subtext: 'USD Coin (Binance Pegged)', - // value: 'USD Coin (Binance Pegged)', - // symbol: 'USDC-SC', - // network: 'BNB', - // decimals: 18 - // }, - // { - // img: getIcon('USDT'), - // name: 'Tether USD (Binance Smart Chain)', - // subtext: 'Tether USD (Binance Smart Chain)', - // value: 'Tether USD (Binance Smart Chain)', - // symbol: 'USDT-SC', - // network: 'BNB', - // decimals: 18 - // }, - // ], - // icon: getIcon('BNB'), - // currencyName: 'BNB', - // gasPriceMultiplier: 1, - // coingeckoID: 'binancecoin', - // service: 'myetherwallet.com-ws', - // url: 'wss://nodes.mewapi.io/ws/bsc', - // port: 443, - // auth: false, - // username: '', - // password: '', - // }, { name: 'MATIC', name_long: 'Polygon (Matic)', From 3eca69c68a754c109fa3e0ca4922cd460a96eec9 Mon Sep 17 00:00:00 2001 From: Gamaliel Padillo Date: Tue, 30 Jul 2024 16:56:29 -0700 Subject: [PATCH 6/6] devop: cleanup --- src/components/OrderForm/BuyForm.vue | 12 ++++++++++-- src/components/OrderForm/BuyProviders.vue | 9 ++++++++- src/components/OrderForm/network/types.ts | 1 + 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/components/OrderForm/BuyForm.vue b/src/components/OrderForm/BuyForm.vue index 3646cf70..a1ee129b 100644 --- a/src/components/OrderForm/BuyForm.vue +++ b/src/components/OrderForm/BuyForm.vue @@ -607,7 +607,7 @@ const topperPrice = computed(() => { return new BigNumber( topperAvailable.value ? topperData[form.cryptoSelected]?.prices[form.fiatSelected] - : 0 + : "0" ); }); const topperNetworkFeeText = computed(() => { @@ -653,7 +653,7 @@ const topperCryptoAmount = computed(() => { ? formatFloatingPointValue( amount.dividedBy(topperPrice.value.toFixed(2)).toString() ).value - : 0; + : "0"; }); /** @@ -1088,6 +1088,8 @@ const submitForm = (): void => { dailyLimit: dailyLimit("topper"), monthlyLimit: monthlyLimit(), fiatAmount: topperFiatAmount.value, + fiatAmountF: formatFiatValue(topperFiatAmount.value, currencyConfig.value) + .value, min: topperData[cryptoSelected]?.limits[fiatSelected]?.min || 50, }, simplex_quote: { @@ -1099,6 +1101,10 @@ const submitForm = (): void => { dailyLimit: dailyLimit("simplex"), monthlyLimit: monthlyLimit(), fiatAmount: simplexFiatAmount.value, + fiatAmountF: formatFiatValue( + simplexFiatAmount.value, + currencyConfig.value + ).value, min: simplexData[cryptoSelected]?.limits[fiatSelected]?.min || 50, }, address: address, @@ -1111,6 +1117,8 @@ const submitForm = (): void => { dailyLimit: dailyLimit("moonpay"), monthlyLimit: monthlyLimit(), fiatAmount: moonpayFiatAmount, + fiatAmountF: formatFiatValue(moonpayFiatAmount, currencyConfig.value) + .value, min: moonpayData[cryptoSelected]?.limits[fiatSelected]?.min || 50, }, open_providers: 2, diff --git a/src/components/OrderForm/BuyProviders.vue b/src/components/OrderForm/BuyProviders.vue index d8fafe0b..fe8ab8d7 100644 --- a/src/components/OrderForm/BuyProviders.vue +++ b/src/components/OrderForm/BuyProviders.vue @@ -8,7 +8,7 @@
Select provider
- Spending {{ topperQuote.plusFeeF }} + Spending {{ formattedFiat }}
@@ -317,6 +317,13 @@ export default defineComponent({ }; }, computed: { + formattedFiat(): string { + return ( + this.simplexQuote.fiatAmountF || + this.moonpayQuote.fiatAmountF || + this.topperQuote.fiatAmountF + ); + }, selectedFiatName(): string { return this.selectedFiat.name; }, diff --git a/src/components/OrderForm/network/types.ts b/src/components/OrderForm/network/types.ts index 88c10024..be756e7a 100644 --- a/src/components/OrderForm/network/types.ts +++ b/src/components/OrderForm/network/types.ts @@ -41,6 +41,7 @@ interface QuoteData { dailyLimit: string; monthlyLimit: string; fiatAmount: string; + fiatAmountF: string; } interface SubmitData { simplex_quote: QuoteData;