From 5f2cc3b28aec97208b448d735d0fccdf8536c8ce Mon Sep 17 00:00:00 2001 From: NotEternal Date: Tue, 9 Mar 2021 02:30:35 -0800 Subject: [PATCH 1/7] Exchange cleanup --- .../client/scss/config/vars/_colors.scss | 6 +- src/front/shared/pages/Exchange/Exchange.scss | 263 +----------------- src/front/shared/pages/Exchange/Exchange.tsx | 10 - .../pages/Exchange/HowItWorks/HowItWorks.tsx | 5 +- 4 files changed, 12 insertions(+), 272 deletions(-) diff --git a/src/front/client/scss/config/vars/_colors.scss b/src/front/client/scss/config/vars/_colors.scss index d05d4891a5..19b8c78a32 100644 --- a/src/front/client/scss/config/vars/_colors.scss +++ b/src/front/client/scss/config/vars/_colors.scss @@ -16,6 +16,7 @@ $l-background-elements: #fff; $l-box-shadow: 0px 4px 16px rgba(0,0,0,0.08), 0px 1px 4px rgba(0,0,0,0.08); $l-read-only: rgb(233, 233, 233); + // ----------------------------------------- // Dark theme @@ -26,6 +27,7 @@ $d-background-elements: #242425; $d-box-shadow: 0px 4px 16px rgba(0, 0, 0, 0.49),0px 1px 4px rgba(13, 13, 13, 0.06); $d-read-only: rgb(44, 44, 44); + // ----------------------------------------- // Unchanging colors @@ -33,8 +35,8 @@ $pale-color: #8882; $indicating-color: #808080; $notice-color: #8e9aa3; $color-brand: #6144e5; -$color-f-brightest : #fff; -$color-f-error : #e32950; +$color-f-brightest: #fff; +$color-f-error: #e32950; $color-good: #4dd3ab; $color-bad: #f56e85; $color-link: #007bff; \ No newline at end of file diff --git a/src/front/shared/pages/Exchange/Exchange.scss b/src/front/shared/pages/Exchange/Exchange.scss index a7b347a345..e7f2a69a32 100644 --- a/src/front/shared/pages/Exchange/Exchange.scss +++ b/src/front/shared/pages/Exchange/Exchange.scss @@ -41,30 +41,11 @@ will-change: max-height, opacity; } -@media (min-width: 831px) { - .TitleHolder { - position: absolute; - width: 50%; - top: 87px; - - h1, - span { - font-size: 45px; - } - - * { - margin: 0; - padding: 0; - } - } - -} - .promoContainer { position: relative; &.--dark { - background: #222427; + background: $d-background-color; color: $d-color; .formExchange { @@ -72,50 +53,14 @@ background: $d-background-elements; } - .maxAmount { - background: none; - color: #8e9aa3; - } - - .buttonOrders, &:before { background: #694cff !important; - color: white; - } - - .notifyThat { - background: #2e2941; + color: $l-background-elements; } .maxAmount { - color: white; - background: #242425; - } - - .IsSearching { - color: white; - } -} - -} - -.darkForm { - .maxAmount { - color: white; - background: #242425; - } - - .IsSearching { - color: white; - } - - .mobileDubleHeader { - display: none; - } - - @media screen and (max-width: 480px) { - .maxAmount { - background: none; + color: $d-color; + background: $d-background-elements; } } } @@ -173,13 +118,6 @@ margin: 0 auto; } -.IsSearching { - display: block; - position: relative; - margin-bottom: 10px; - @include errAppend(); -} - .button { margin-top: 0; width: 50%; @@ -191,7 +129,7 @@ } .button.link-like { - color: #007bff; + color: $color-link; text-decoration: underline; } @@ -319,7 +257,6 @@ } - .buttons { margin-top: 1em; display: flex; @@ -333,29 +270,6 @@ } } -.buttonOrders { - border: 1px solid #000; - background: #fff; - transition: background-color 0.2s ease, color 0.1s ease, border-color 0.2s ease; - - &:hover { - background: black; - color: white; - border-color: white; - } -} - -.darkButton { - background: #694cff; - color: white; - - &:hover { - background: black; - color: white; - border-color: white; - } -} - .swapStartStatus { text-align: center; margin-top: 0.7em; @@ -411,24 +325,13 @@ justify-content: space-between; } -.widgetSection { - display: flex; - justify-content: space-between; - margin-bottom: 20px; -} - .section { - @media screen and (max-width: 480px) { display: flex; flex-direction: column; justify-content: center; padding: 0; - .formExchange_widgetBuild { - padding: 0; - } - .maxAmount { top: -5px; right: 10px; @@ -436,15 +339,6 @@ } } -.blockVideo { - flex-basis: 58%; - - iframe { - width: 100%; - height: 355px; - } -} - .formExchange { position: relative; margin-bottom: 44px; @@ -490,25 +384,8 @@ cursor: pointer; } -.notifyThat { - display: flex; - align-items: center; - color: #fff; - padding: 0.3em 10px; - font-size: 13px; - background: #6244e5; - border-radius: 3px; - @include errAppend(); - - a { - color: inherit; - font-size: inherit; - text-decoration: underline; - } -} - .notCorrect { - color: red; + color: $color-f-error; } .row { @@ -516,24 +393,11 @@ align-items: center; } -.flipButton { - position: static; - padding: 0; - margin: 0px 12px -20px auto; - transform: rotate(90deg); -} - -.withLoader { - display: block; - position: relative; -} - .inform { color: #626262; margin-top: 40px; } - .scan { display: flex; flex-direction: column; @@ -554,12 +418,6 @@ font-size: 30px; } -.qrCode { - position: absolute; - left: 97%; - top: 9px; -} - .extendedControls { position: relative; z-index: 1; @@ -588,14 +446,6 @@ z-index: 2; } -.widgetLink { - position: absolute; - right: 0; - bottom: -1.7em; - text-decoration: underline; - font-size: 13px; -} - .networkStatusPlace { position: absolute; left: 0; @@ -603,36 +453,7 @@ font-size: 13px; } -.mobileDubleHeader { - display: none; -} - -.tooltipHeader { - font-size: 1em; - line-height: 1em; - - *[class*="tooltip"] { - line-height: 1.2em; - font-size: 16px; - } -} - -.referralText { - margin: 100px auto 40px; - max-width: 1200px; -} - -@media (max-width: 1200px) { - .referralText { - padding: 0 2em; - } -} - @include media-tablet { - .blockVideo { - flex-basis: 50%; - } - .block { flex-basis: 45%; } @@ -644,16 +465,6 @@ .maxAmount { font-size: 14px; } - - .TitleHolder { - width: 45%; - - h1, - span { - font-size: 35px; - } - } - } @media all and (max-width: 830px) { @@ -661,8 +472,7 @@ bottom: 25px; } - .section, - .widgetSection { + .section { margin-top: 20px; justify-content: center; flex-direction: column-reverse; @@ -678,25 +488,6 @@ margin-bottom: 80px; margin-top: 60px; } - - .widgetSection { - padding: 0 25px; - overflow: hidden; - - .flipButton { - left: auto; - right: 40px; - transform: translateY(12px) rotate(90deg); - } - - .selectedItem { - width: auto; - } - } - - .TitleHolder { - width: 100%; - } } @media all and (max-width: 400px) { @@ -713,55 +504,15 @@ } @include media-mobile { - - .formExchange_widgetBuild { - padding: 50px 15px; - box-shadow: unset; - border-radius: unset; - } - .scrollToTutorialSection { bottom: 40px; right: 40%; } - .referralText { - overflow: hidden; - width: 90%; - position: relative; - margin: 60px auto 0; - } - - .mobileDubleHeader { - display: block; - background: white; - - h3 { - display: block; - margin: auto; - margin-top: -100px; - margin-bottom: 100px; - padding: 0; - padding-bottom: 10px; - padding-top: 15px; - - div { - display: block; - margin: auto; - width: 90%; - text-align: center; - } - } - } - .inform { margin-top: 10px; } - .IsSearching { - font-size: 12px; - } - .maxAmount { top: 43px; right: 20px; diff --git a/src/front/shared/pages/Exchange/Exchange.tsx b/src/front/shared/pages/Exchange/Exchange.tsx index c2a631acae..27d81076db 100644 --- a/src/front/shared/pages/Exchange/Exchange.tsx +++ b/src/front/shared/pages/Exchange/Exchange.tsx @@ -19,7 +19,6 @@ import Promo from './Promo/Promo' import Quote from './Quote' import HowItWorks from './HowItWorks/HowItWorks' import VideoAndFeatures from './VideoAndFeatures/VideoAndFeatures' -import Tooltip from 'components/ui/Tooltip/Tooltip' import InlineLoader from 'components/loaders/InlineLoader/InlineLoader' import { FormattedMessage, injectIntl } from 'react-intl' import { localisedUrl } from 'helpers/locale' @@ -1335,7 +1334,6 @@ export default class Exchange extends Component { redirectToSwap, isWaitForPeerAnswer, directionOrders, - filteredOrders, desclineOrders, isDeclinedOffer, pairFees, @@ -1403,18 +1401,12 @@ export default class Exchange extends Component { .toNumber() : 0 - const currentCurrency = this.getCoinData(sellCoin) - const oneCryptoCost = maxBuyAmount.isLessThanOrEqualTo(0) ? new BigNumber(0) : new BigNumber(goodRate) const linked = Link.all(this, 'haveAmount', 'getAmount') - const isWidgetLink = - this.props.location.pathname.includes('/exchange') && this.props.location.hash === '#widget' - const isWidget = isWidgetBuild || isWidgetLink - const availableAmount = pairFees && pairFees.byCoins && @@ -1806,8 +1798,6 @@ export default class Exchange extends Component { {config && config.showHowItsWork && ( - {/* - //@ts-ignore */} diff --git a/src/front/shared/pages/Exchange/HowItWorks/HowItWorks.tsx b/src/front/shared/pages/Exchange/HowItWorks/HowItWorks.tsx index e6d596de43..e11bd7af91 100644 --- a/src/front/shared/pages/Exchange/HowItWorks/HowItWorks.tsx +++ b/src/front/shared/pages/Exchange/HowItWorks/HowItWorks.tsx @@ -1,8 +1,5 @@ import React from 'react' -import PropTypes from 'prop-types' - import { FormattedMessage } from 'react-intl' - import CSSModules from 'react-css-modules' import styles from './HowItWorks.scss' @@ -11,7 +8,7 @@ import { constants } from 'helpers' const isDark = localStorage.getItem(constants.localStorage.isDark) -const HowItWorks = ({ className }) => ( +const HowItWorks = () => (

From 2c0858f972f70a60444e2fec870b28607bad5899 Mon Sep 17 00:00:00 2001 From: NotEternal Date: Thu, 11 Mar 2021 08:11:19 -0800 Subject: [PATCH 2/7] Minore fix. Useful comment about wrong fee --- src/front/shared/pages/Exchange/Exchange.tsx | 15 +++++++- src/front/shared/redux/actions/user.ts | 39 +++++--------------- 2 files changed, 22 insertions(+), 32 deletions(-) diff --git a/src/front/shared/pages/Exchange/Exchange.tsx b/src/front/shared/pages/Exchange/Exchange.tsx index 27d81076db..f2e8709fb8 100644 --- a/src/front/shared/pages/Exchange/Exchange.tsx +++ b/src/front/shared/pages/Exchange/Exchange.tsx @@ -184,7 +184,7 @@ const bannedPeers = {} // rejected swap peers }) ) @CSSModules(styles, { allowMultiple: true }) -export default class Exchange extends Component { +export default class Exchange extends Component { props: ExchangeProps state: ExchangeState @@ -1306,7 +1306,6 @@ export default class Exchange extends Component { activeFiat, currencies, addSelectedItems, - intl: { locale }, match: { params: { linkedOrderId }, }, @@ -1392,6 +1391,18 @@ export default class Exchange extends Component { const getFiat = new BigNumber(exGetRate).times(getAmount).dp(2, BigNumber.ROUND_CEIL) + + // FIXME: redux state + // user + // currencyData or tokensData.currency + // ******************* + // in this level we don't have any info about currency + // in the private mode - why ? + // + // infoAboutCurrency <- there isn't in the state + // ******************* + // price_fiat <- we need it + const fiatFeeCalculation = pairFees && pairFees.buy && pairFees.sell ? new BigNumber(pairFees.buyExRate) diff --git a/src/front/shared/redux/actions/user.ts b/src/front/shared/redux/actions/user.ts index 555dc1437e..3c90704fc8 100644 --- a/src/front/shared/redux/actions/user.ts +++ b/src/front/shared/redux/actions/user.ts @@ -327,8 +327,7 @@ const getDemoMoney = process.env.MAINNET ? () => { } : () => { localStorage.setItem(constants.privateKeyNames.eth, r[1]) localStorage.setItem(constants.privateKeyNames.ghost, r[2]) localStorage.setItem(constants.privateKeyNames.next, r[3]) - //@ts-ignore - localStorage.setItem(constants.localStorage.demoMoneyReceived, true) + localStorage.setItem(constants.localStorage.demoMoneyReceived, 'true') window.location.reload() }) } @@ -437,11 +436,6 @@ const mergeTransactions = (mergeTxs: any[]) => { reducers.history.setTransactions(data) } -const pullTransactions = transactions => { - let data = [].concat([], ...transactions).sort((a, b) => b.date - a.date).filter((item) => item) - reducers.history.setTransactions(data) -} - const pullActiveCurrency = (currency) => { reducers.user.setActiveCurrency({ activeCurrency: currency }) } @@ -467,30 +461,15 @@ const fetchMultisigStatus = async () => { } } -const setTransactions = async (objCurrency = null) => { - /* - objCurrency = { - currency: { - isBalanceFetched: bool - } - } - - "GHOST", - "NEXT" - "ETH" - "BTC" - "BTC (SMS-Protected)" - "BTC (PIN-Protected)" - "BTC (Google 2FA)" - "BTC (Multisig)" - "USDT", - "ETH" - */ +type ObjCurrencyType = { + currency: { + isBalanceFetched: boolean + } +} +const setTransactions = async (objCurrency: ObjCurrencyType | {} = null) => { const isBtcSweeped = actions.btc.isSweeped() const isEthSweeped = actions.eth.isSweeped() - const isGhostSweeped = actions.ghost.isSweeped() - const isNextSweeped = actions.next.isSweeped() const { core: { hiddenCoinsList }, @@ -657,8 +636,8 @@ const downloadPrivateKeys = () => { actions.notifications.show(constants.notifications.Message, { message, }) - //@ts-ignore - localStorage.setItem(constants.localStorage.privateKeysSaved, true) + + localStorage.setItem(constants.localStorage.privateKeysSaved, 'true') } window.downloadPrivateKeys = downloadPrivateKeys From 8f4c0951bc388fdcf9de36bb2f2cf4f5a6f47904 Mon Sep 17 00:00:00 2001 From: NotEternal Date: Fri, 12 Mar 2021 02:12:24 -0800 Subject: [PATCH 3/7] request for currency exchange rate in the exchange (fix incognito bug) --- src/front/shared/pages/Exchange/Exchange.tsx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/front/shared/pages/Exchange/Exchange.tsx b/src/front/shared/pages/Exchange/Exchange.tsx index f2ec300ade..5849913c67 100644 --- a/src/front/shared/pages/Exchange/Exchange.tsx +++ b/src/front/shared/pages/Exchange/Exchange.tsx @@ -254,7 +254,6 @@ class Exchange extends Component { let getCurrency = buy || (!isWidgetBuild ? 'eth' : config.erc20token) const exchangeDataStr = localStorage.getItem(constants.localStorage.exchangeSettings) - console.log('EXCHANGE DATA STR FROM CONSTRUCTOR: ', exchangeDataStr) const exchangeSettings = exchangeDataStr && JSON.parse(exchangeDataStr) // to get data from last session if (exchangeSettings && exchangeSettings.currency) { @@ -423,11 +422,20 @@ class Exchange extends Component { isFullLoadingComplite: true, }) } - }, 60 * 1000) + }, 60 * 1000) // 1 minute + + this.getInfoAboutCurrency() this.fetchPairFeesAndBalances() metamask.web3connect.on('updated', this.fetchPairFeesAndBalances.bind(this)) } + getInfoAboutCurrency = async () => { + const { currencies } = this.props + const currencyNames = currencies.map(({ name }) => name) + + await actions.user.getInfoAboutCurrency(currencyNames) + } + getBalance(currency) { const { balances } = this.state From d9aecef6fe42e7b5c8fdfd2a48c10245cce1f888 Mon Sep 17 00:00:00 2001 From: NotEternal Date: Fri, 12 Mar 2021 03:28:19 -0800 Subject: [PATCH 4/7] My orders - ui improvement --- src/front/shared/pages/Exchange/Exchange.tsx | 12 ----- .../Exchange/Orders/MyOrders/MyOrders.scss | 9 ++-- .../Exchange/Orders/MyOrders/MyOrders.tsx | 23 ++++----- .../Orders/MyOrders/RowFeeds/RowFeeds.scss | 51 +++++-------------- 4 files changed, 26 insertions(+), 69 deletions(-) diff --git a/src/front/shared/pages/Exchange/Exchange.tsx b/src/front/shared/pages/Exchange/Exchange.tsx index 5849913c67..586fe798d4 100644 --- a/src/front/shared/pages/Exchange/Exchange.tsx +++ b/src/front/shared/pages/Exchange/Exchange.tsx @@ -1398,18 +1398,6 @@ class Exchange extends Component { const getFiat = new BigNumber(exGetRate).times(getAmount).dp(2, BigNumber.ROUND_CEIL) - - // FIXME: redux state - // user - // currencyData or tokensData.currency - // ******************* - // in this level we don't have any info about currency - // in the private mode - why ? - // - // infoAboutCurrency <- there isn't in the state - // ******************* - // price_fiat <- we need it - const fiatFeeCalculation = pairFees && pairFees.buy && pairFees.sell ? new BigNumber(pairFees.buyExRate) diff --git a/src/front/shared/pages/Exchange/Orders/MyOrders/MyOrders.scss b/src/front/shared/pages/Exchange/Orders/MyOrders/MyOrders.scss index 5f8d0ddc15..83453be686 100644 --- a/src/front/shared/pages/Exchange/Orders/MyOrders/MyOrders.scss +++ b/src/front/shared/pages/Exchange/Orders/MyOrders/MyOrders.scss @@ -1,8 +1,5 @@ .myOrdersTable { - margin-top: 15px; - margin-left: auto; - margin-right: auto; - font-size: 15px; + width: 100%; @media screen and (max-width: 720px) { font-size: 13px; @@ -14,7 +11,8 @@ th, td { - text-align: right; + text-align: left; + padding: 0.2em 0.3em; line-height: 1.1em; @@ -31,5 +29,4 @@ th { padding-bottom: 0.5em; } - } \ No newline at end of file diff --git a/src/front/shared/pages/Exchange/Orders/MyOrders/MyOrders.tsx b/src/front/shared/pages/Exchange/Orders/MyOrders/MyOrders.tsx index 9129e4d355..3b6119728e 100644 --- a/src/front/shared/pages/Exchange/Orders/MyOrders/MyOrders.tsx +++ b/src/front/shared/pages/Exchange/Orders/MyOrders/MyOrders.tsx @@ -1,8 +1,5 @@ import React, { PureComponent, Fragment } from 'react' import cssModules from 'react-css-modules' - -import actions from 'redux/actions' - import styles from './MyOrders.scss' import RowFeeds from './RowFeeds/RowFeeds' @@ -13,11 +10,11 @@ export default class MyOrders extends PureComponent { render() { const titles = [ - ' ', + ' ', // empty title in the table , , , - ' ', + ' ', // empty title in the table ] const { myOrders, declineRequest, acceptRequest, removeOrder } = this.props @@ -39,13 +36,15 @@ export default class MyOrders extends PureComponent { {myOrders.map((order, index) => { - return () + return ( + + ) })} diff --git a/src/front/shared/pages/Exchange/Orders/MyOrders/RowFeeds/RowFeeds.scss b/src/front/shared/pages/Exchange/Orders/MyOrders/RowFeeds/RowFeeds.scss index ea0119d1fb..ab5485fd5f 100644 --- a/src/front/shared/pages/Exchange/Orders/MyOrders/RowFeeds/RowFeeds.scss +++ b/src/front/shared/pages/Exchange/Orders/MyOrders/RowFeeds/RowFeeds.scss @@ -1,19 +1,11 @@ -.userTooltip { - display: flex; - justify-content: flex-start; - align-items: center; -} - - -.buy, .accept { - color: #3de25b; +.accept { + color: $color-good; } -.sell, .delete { - color: #e32950; +.delete { + color: $color-f-error; } - .delete, .accept { cursor: pointer; } @@ -21,6 +13,12 @@ td { text-align: center; + // currency info + &:not(:first-child), + &:not(:last-child) { + font-family: 'Roboto Mono', monospace; + } + &.with-icon { display: flex; align-items: center; @@ -32,40 +30,15 @@ td { } } -/* .currency { - font-size: 14px; - font-weight: 700; - min-width: 150px; - margin-right: 10px; - display: flex; - align-items: center; -} */ - -.coin { - text-transform: uppercase; -} - .buttons { display: flex; - justify-content: space-around; + justify-content: flex-end; > * + * { - margin-left: 3px; + margin-left: 8px; } } -.arrow { - display: inline-block; - width: 5px; - margin: 5px; -} - -.arrow img { - display: block; - width: 100%; - height: auto; -} - .img { position: absolute; top: 50%; From 86cf317ed9f451354fe6bd840cf9025133cb8696 Mon Sep 17 00:00:00 2001 From: NotEternal Date: Fri, 12 Mar 2021 04:01:54 -0800 Subject: [PATCH 5/7] Btc helper - delete useless code --- src/front/shared/helpers/btc.ts | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/src/front/shared/helpers/btc.ts b/src/front/shared/helpers/btc.ts index cba3ab938f..ce075bc8ae 100644 --- a/src/front/shared/helpers/btc.ts +++ b/src/front/shared/helpers/btc.ts @@ -246,33 +246,7 @@ const estimateFeeValue = async (options: EstimateFeeValueOptions): Promise return finalFeeValue } -const estimateFeeRateBitcoinfees = async ({ speed = 'fast' } = {}) => { - const defaultRate = constants.defaultFeeRates.btc.rate - - let apiResult - - try { - apiResult = await api.asyncFetchApi(`https://bitcoinfees.earn.com/api/v1/fees/recommended`) - } catch (err) { - console.error(`EstimateFeeRate: ${err.message}`) - return defaultRate[speed] - } - - const apiSpeeds = { - slow: `hourFee`, - normal: `halfHourFee`, - fast: `fastestFee`, - } - - const apiSpeed = apiSpeeds[speed] || apiSpeeds.normal - const apiRate = new BigNumber(apiResult[apiSpeed]).multipliedBy(1024) - - return apiRate.isGreaterThanOrEqualTo(DUST) - ? apiRate.toString() - : defaultRate[speed] -} - -const estimateFeeRateBlockcypher = async ({ speed = 'fast' } = {}) => { +const estimateFeeRate = async ({ speed = 'fast' } = {}) => { const link = config.feeRates.btc const defaultRate = constants.defaultFeeRates.btc.rate @@ -304,8 +278,6 @@ const estimateFeeRateBlockcypher = async ({ speed = 'fast' } = {}) => { : defaultRate[speed] } -const estimateFeeRate = estimateFeeRateBlockcypher - export default { calculateTxSize, estimateFeeValue, From e2d9184015ec0fa5ce81c40cc6279aefafef105f Mon Sep 17 00:00:00 2001 From: NotEternal Date: Fri, 12 Mar 2021 04:39:17 -0800 Subject: [PATCH 6/7] Fix arrow style in the Exchange Table Row --- .../Exchange/Orders/OrderBook/Row/Row.scss | 18 ++++++++++++++---- .../Exchange/Orders/OrderBook/Row/Row.tsx | 4 ++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/front/shared/pages/Exchange/Orders/OrderBook/Row/Row.scss b/src/front/shared/pages/Exchange/Orders/OrderBook/Row/Row.scss index 14e941e47f..e105642589 100644 --- a/src/front/shared/pages/Exchange/Orders/OrderBook/Row/Row.scss +++ b/src/front/shared/pages/Exchange/Orders/OrderBook/Row/Row.scss @@ -11,11 +11,20 @@ margin-left: 0.5em; } } +// mobile arrow between send and get currency +.arrowsIcon { + margin: 0 0.8em; + color: $l-color; +} .rowDark { .rowAmount { color: $d-color; } + + .arrowsIcon { + color: $d-color; + } } .rowCell:nth-of-type(1) { @@ -31,23 +40,25 @@ width: 25%; } -.mobileRowRemove, -.mobileRowStart { +.mobileRow { .firstType, .secondType { color: $indicating-color; display: block; } + .tdContainer-1, .tdContainer-2, .tdContainer-3 { position: relative; } + .startButton { width: auto; height: auto; margin-left: 0.6em; } + .bigContainer { font-size: 14px; display: flex; @@ -57,8 +68,7 @@ } @media screen and (max-width: 400px) { - .mobileRowRemove, - .mobileRowStart { + .mobileRow { .bigContainer { font-size: 12px; } diff --git a/src/front/shared/pages/Exchange/Orders/OrderBook/Row/Row.tsx b/src/front/shared/pages/Exchange/Orders/OrderBook/Row/Row.tsx index 91d52b8dfe..c3bf4c3fd9 100644 --- a/src/front/shared/pages/Exchange/Orders/OrderBook/Row/Row.tsx +++ b/src/front/shared/pages/Exchange/Orders/OrderBook/Row/Row.tsx @@ -426,7 +426,7 @@ class Row extends Component {

- +
From e6a23bafbc9e820807772f1451a3232a3d905a90 Mon Sep 17 00:00:00 2001 From: NotEternal Date: Fri, 12 Mar 2021 08:53:13 -0800 Subject: [PATCH 7/7] Change explorer link in configs --- src/front/config/bsc-mainnet/swapConfig.js | 2 +- src/front/config/bsc-testnet/swapConfig.js | 2 +- src/front/config/mainnet/swapConfig.js | 2 +- src/front/config/testnet/api.js | 2 +- src/front/config/testnet/swapConfig.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/front/config/bsc-mainnet/swapConfig.js b/src/front/config/bsc-mainnet/swapConfig.js index 2a329d203f..e11eed8e75 100644 --- a/src/front/config/bsc-mainnet/swapConfig.js +++ b/src/front/config/bsc-mainnet/swapConfig.js @@ -5,7 +5,7 @@ export default { BTC: { withdrawTransactionHash: `btcSwapWithdrawTransactionHash`, scriptCreatingTransactionHash: `utxoScriptCreatingTransactionHash`, // @to-do - remove this - use directly - explorerLink: api.blockcypher, + explorerLink: api.bitpay, verifyScriptFunc: `verifyScript`, // @to-do - remove this - use directly scriptValues: `utxoScriptValues`, // @to-do - remove this - use directly utxoScriptValues }, diff --git a/src/front/config/bsc-testnet/swapConfig.js b/src/front/config/bsc-testnet/swapConfig.js index fa0797f9ec..9a28360329 100644 --- a/src/front/config/bsc-testnet/swapConfig.js +++ b/src/front/config/bsc-testnet/swapConfig.js @@ -5,7 +5,7 @@ export default { BTC: { withdrawTransactionHash: `btcSwapWithdrawTransactionHash`, scriptCreatingTransactionHash: `utxoScriptCreatingTransactionHash`, - explorerLink: api.blockcypher, + explorerLink: api.bitpay, verifyScriptFunc: `verifyScript`, scriptValues: `utxoScriptValues`, // @to-do - remove this - use in code utxoScriptValues }, diff --git a/src/front/config/mainnet/swapConfig.js b/src/front/config/mainnet/swapConfig.js index 2a329d203f..e11eed8e75 100644 --- a/src/front/config/mainnet/swapConfig.js +++ b/src/front/config/mainnet/swapConfig.js @@ -5,7 +5,7 @@ export default { BTC: { withdrawTransactionHash: `btcSwapWithdrawTransactionHash`, scriptCreatingTransactionHash: `utxoScriptCreatingTransactionHash`, // @to-do - remove this - use directly - explorerLink: api.blockcypher, + explorerLink: api.bitpay, verifyScriptFunc: `verifyScript`, // @to-do - remove this - use directly scriptValues: `utxoScriptValues`, // @to-do - remove this - use directly utxoScriptValues }, diff --git a/src/front/config/testnet/api.js b/src/front/config/testnet/api.js index 6d6c141590..b12481c102 100644 --- a/src/front/config/testnet/api.js +++ b/src/front/config/testnet/api.js @@ -4,6 +4,7 @@ export default { defipulse: 'https://data-api.defipulse.com/api/v1/egs/api/ethgasAPI.json?api-key=53be2a60f8bc0bb818ad161f034286d709a9c4ccb1362054b0543df78e27', bitpay: [ 'https://api.bitcore.io/api/BTC/testnet', + // 'https://test-insight.bitpay.com/api' // 'http://localhost:32250/btc/testnet', //'https://test-insight.swaponline.io/insight-api', //'https://invoices.swaponline.site/proxybitpay-testnet', @@ -13,7 +14,6 @@ export default { nextExplorer: 'https://explore.next.exchange/api', nextExplorerCustom: 'https://next.swaponline.io/mainnet', blockcypher: 'https://api.blockcypher.com/v1/btc/test3', - // bitpay: 'https://test-insight.bitpay.com/api', etherscan: [ 'https://api-ropsten.etherscan.io/api', 'https://invoices.swaponline.site/proxyetherscan-testnet', diff --git a/src/front/config/testnet/swapConfig.js b/src/front/config/testnet/swapConfig.js index fa0797f9ec..9a28360329 100644 --- a/src/front/config/testnet/swapConfig.js +++ b/src/front/config/testnet/swapConfig.js @@ -5,7 +5,7 @@ export default { BTC: { withdrawTransactionHash: `btcSwapWithdrawTransactionHash`, scriptCreatingTransactionHash: `utxoScriptCreatingTransactionHash`, - explorerLink: api.blockcypher, + explorerLink: api.bitpay, verifyScriptFunc: `verifyScript`, scriptValues: `utxoScriptValues`, // @to-do - remove this - use in code utxoScriptValues },