Skip to content

Commit

Permalink
Merge pull request #5227 from swaponline/customPrice
Browse files Browse the repository at this point in the history
Custom token fiat price + new api endpoints + phi price
  • Loading branch information
noxonsu authored Dec 7, 2023
2 parents 87e8db5 + 87a757a commit a25b7c4
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 21 deletions.
14 changes: 7 additions & 7 deletions src/front/config/mainnet/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default {
nextExplorerCustom: 'https://next.swaponline.io/mainnet',
blockcypher: 'https://api.blockcypher.com/v1/btc/main',
etherscan: 'https://api.etherscan.io/api',
etherscanInvoices: 'https://invoices.swaponline.site/proxyetherscan',
etherscanInvoices: 'https://invoices.onout.org/proxyetherscan',
etherscan_ApiKey: 'GK6YHJ5NMEF67R4FTRNQS2EK3HRBP5VVHW',
bscscan: 'https://api.bscscan.com/api',
bscscan_ApiKey: 'WI4QEJSV19U3TF2H1DPQ2HR6712HW4MYKJ',
Expand All @@ -37,12 +37,12 @@ export default {
ame_ApiKey: '',
aurorascan: 'https://api.aurorascan.dev/api',
aurora_ApiKey: 'J9ZZ9C6FI4YHJVISBI2VYRRJ1MTU3ID45Q',
faucet: 'https://faucet.swaponline.site/mainnet/',
btc2FAProtected: 'https://2fa.swaponline.site',
btcPin: 'https://2fapin.swaponline.site',
invoiceApi: 'https://invoices.swaponline.site',
multisig: 'https://multisig.swaponline.site',
txinfo: 'https://txinfo.swaponline.site',
faucet: 'https://faucet.onout.org/mainnet/', // deprecated
btc2FAProtected: 'https://2fa.onout.org',
btcPin: 'https://2fapin.onout.org',
invoiceApi: 'https://invoices.onout.org',
multisig: 'https://multisig.onout.org',
txinfo: 'https://txinfo.onout.org',
noxon: 'https://noxon.wpmix.net',
phiscan: 'https://phiscan.com/api',
fkwscan: 'https://explorer.fokawa.com/api',
Expand Down
14 changes: 7 additions & 7 deletions src/front/config/testnet/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default {
etherscan_ApiKey: 'GK6YHJ5NMEF67R4FTRNQS2EK3HRBP5VVHW',
bscscan: 'https://api-testnet.bscscan.com/api',
// TODO: replace proxy link
bscscanInvoices: 'https://invoices.swaponline.site/proxyetherscan-testnet',
bscscanInvoices: 'https://invoices.onout.org/proxyetherscan-testnet',
bscscan_ApiKey: 'WI4QEJSV19U3TF2H1DPQ2HR6712HW4MYKJ',
maticscan: 'https://api-testnet.polygonscan.com/api',
polygon_ApiKey: '8S2R45ZWG94HI7YK9RCXSK4VCASJ4XVA15',
Expand All @@ -37,12 +37,12 @@ export default {
ame_ApiKey: '',
aurorascan: 'https://api-testnet.aurorascan.dev/api',
aurora_ApiKey: 'J9ZZ9C6FI4YHJVISBI2VYRRJ1MTU3ID45Q',
faucet: 'https://faucet.swaponline.site/testnet/',
btc2FAProtected: 'https://2fa.swaponline.site',
btcPin: 'https://2fapin.swaponline.site',
invoiceApi: 'https://invoices.swaponline.site',
multisig: 'https://multisig.swaponline.site',
txinfo: 'https://txinfo.swaponline.site',
faucet: 'https://faucet.onout.org/testnet/',
btc2FAProtected: 'https://2fa.onout.org',
btcPin: 'https://2fapin.onout.org',
invoiceApi: 'https://invoices.onout.org',
multisig: 'https://multisig.onout.org',
txinfo: 'https://txinfo.onout.org',
noxon: 'https://noxon.wpmix.net',
WalletConnectProjectId: 'a23677c4af3139b4eccb52981f76ad94',
}
1 change: 1 addition & 0 deletions src/front/externalConfigs/testnet-default.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ window.widgetEvmLikeTokens = [
// fullName: '',
// icon: '',
// customExchangeRate: '',
// customFiatPrice: '',
// iconBgColor: '',
// howToDeposit: '',
// howToWithdraw: '',
Expand Down
50 changes: 43 additions & 7 deletions src/front/shared/redux/actions/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { getState } from 'redux/core'
import reducers from 'redux/core/reducers'
import { getActivatedCurrencies } from 'helpers/user'


const onlyEvmWallets = (config?.opts?.ui?.disableInternalWallet) ? true : false
const enabledCurrencies = config.opts.curEnabled

Expand Down Expand Up @@ -302,14 +301,25 @@ const getInfoAboutPHI = (fiat, btcPrice) => new Promise((resolve, reject) => {
filter: `WPHI`,
},
}).then((apiData: any) => {
/*
Answer 07.12.2003
{
"quotes": {
"USD": {
"last_updated": "2023-04-16T05:35:15+00:00",
"price": 3098295.179276145
}
}
}
@ToDo - При следующей смене формата - коректировка платная
*/
if (apiData
&& apiData.data
&& apiData.data.WPHI
&& apiData.data.quotes
&& apiData.data.quotes[fiat]
&& apiData
&& apiData.quotes
&& apiData.quotes[fiat]
) {

const currencyInfoItem = apiData.data
const currencyInfoItem = apiData
const priceInFiat = currencyInfoItem.quotes[fiat].price
const priceInBtc = priceInFiat / btcPrice

Expand Down Expand Up @@ -433,12 +443,38 @@ const getInfoAboutCurrency = (currencyNames) => new Promise(async (resolve, reje
if (currencyNames.includes('phi_v1') || currencyNames.includes('phi')) {
getInfoAboutPHI(fiat, btcPrice).then((isOk) => { /* Ok */ }).catch((e) => { console.log('Fail fetch Prices for PHI',e) })
}
processCustomTokenPrice(btcPrice)
resolve(true)
}).catch((error) => {
console.log('>>> getInfoAboutCurrency error', error)
reject(error)
}).finally(() => reducers.user.setIsFetching({ isFetching: false }))
})

const processCustomTokenPrice = (btcPrice) => {
for (const key in TOKEN_STANDARDS) {
const { standard, currency } = TOKEN_STANDARDS[key]

for (const name in config[standard]) {

if (config[standard][name].customFiatPrice) {
const priceInFiat = config[standard][name].customFiatPrice
const priceInBtc = priceInFiat / btcPrice

reducers.user.setInfoAboutToken({
baseCurrency: currency.toLowerCase(),
name: name.toLowerCase(),
infoAboutCurrency: {
price_fiat: priceInFiat,
price_btc: priceInBtc,
},
})
}

}
}
}

const clearTransactions = () => {
reducers.history.setTransactions([])
}
Expand Down

0 comments on commit a25b7c4

Please sign in to comment.