From 7a75f58029629dfc575a19101ecc2e8337db6c8c Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Thu, 22 Jun 2023 13:27:58 +0300 Subject: [PATCH 001/115] Fix table scroll --- src/styles/index.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/styles/index.scss b/src/styles/index.scss index 7cdfc6b80..d8e613f20 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -100,6 +100,12 @@ html { overflow: hidden; } +.data-table-wrapper { + display: flex; + flex-direction: column; + max-width: fit-content; +} + .color--active { color: var(--activeColor); } From 08ba67db64dbfe58f4848086c67d67bfe57a9bf2 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Mon, 26 Jun 2023 11:17:21 +0300 Subject: [PATCH 002/115] Revert "Revert "(improvements) Reports tables representation"" This reverts commit 2ba60e9f602e0e859d2c0a7e9d074f212661bb4d. --- .../AffiliatesEarnings/AffiliatesEarnings.js | 4 +- .../ChangeLogs/ChangeLogs.columns.js | 13 ++--- src/components/ChangeLogs/ChangeLogs.js | 4 +- .../Derivatives/Derivatives.columns.js | 9 +--- .../FundingCreditHistory.columns.js | 17 ++----- .../FundingCreditHistory.js | 4 +- .../FundingLoanHistory.columns.js | 17 ++----- .../FundingLoanHistory/FundingLoanHistory.js | 4 +- .../FundingOfferHistory.columns.js | 9 +--- .../FundingOfferHistory.js | 4 +- .../FundingPayment/FundingPayment.js | 4 +- src/components/Invoices/Invoices.columns.js | 6 +-- src/components/Invoices/Invoices.js | 4 +- src/components/Ledgers/Ledgers.columns.js | 6 +-- src/components/Ledgers/Ledgers.js | 4 +- src/components/Logins/Logins.columns.js | 9 +--- src/components/Logins/Logins.js | 4 +- src/components/Movements/Movements.columns.js | 9 +--- src/components/Movements/Movements.js | 4 +- src/components/Orders/Orders.columns.js | 13 ++--- src/components/Orders/Orders.js | 4 +- src/components/Positions/Positions.columns.js | 9 +--- src/components/Positions/Positions.js | 4 +- .../PositionsAudit/PositionsAudit.js | 4 +- .../PublicFunding/PublicFunding.columns.js | 9 +--- src/components/PublicFunding/PublicFunding.js | 6 +-- .../PublicTrades/PublicTrades.columns.js | 9 +--- src/components/PublicTrades/PublicTrades.js | 6 +-- .../StakingPayments/StakingPayments.js | 4 +- src/components/Tickers/Tickers.columns.js | 9 +--- src/components/Tickers/Tickers.js | 6 +-- src/components/Trades/Trades.columns.js | 6 +-- src/components/Trades/Trades.js | 6 +-- src/styles/themes/_dark.scss | 10 ++-- src/ui/CollapsedTable/_CollapsedTable.scss | 25 +++++----- src/ui/DataTable/DataTable.js | 1 + src/ui/DataTable/_DataTable.scss | 29 +++++------ src/ui/Pagination/Pagination.js | 40 +++++++++------- src/ui/Pagination/_Pagination.scss | 48 ++++++++++++++----- src/ui/SectionHeader/_SectionHeader.scss | 2 +- src/ui/utils.js | 8 +--- src/utils/columns.js | 6 +-- 42 files changed, 176 insertions(+), 223 deletions(-) diff --git a/src/components/AffiliatesEarnings/AffiliatesEarnings.js b/src/components/AffiliatesEarnings/AffiliatesEarnings.js index 99e6274d8..d7a6ebeb8 100644 --- a/src/components/AffiliatesEarnings/AffiliatesEarnings.js +++ b/src/components/AffiliatesEarnings/AffiliatesEarnings.js @@ -107,7 +107,7 @@ class AffiliatesEarnings extends PureComponent { showContent = } else { showContent = ( - <> +
- +
) } return ( diff --git a/src/components/ChangeLogs/ChangeLogs.columns.js b/src/components/ChangeLogs/ChangeLogs.columns.js index 6078f8fed..63c0657c3 100644 --- a/src/components/ChangeLogs/ChangeLogs.columns.js +++ b/src/components/ChangeLogs/ChangeLogs.columns.js @@ -1,8 +1,5 @@ import React from 'react' -import { - Cell, - TruncatedFormat, -} from '@blueprintjs/table' +import { Cell } from '@blueprintjs/table' import JSONFormat from 'ui/JSONFormat' import { getColumnWidth } from 'utils/columns' @@ -22,9 +19,7 @@ export const getColumns = ({ const timestamp = getFullTime(filteredData[rowIndex].mtsCreate) return ( - - {timestamp} - + {timestamp} ) }, @@ -38,9 +33,7 @@ export const getColumns = ({ const { log } = filteredData[rowIndex] return ( - - {log} - + {log} ) }, diff --git a/src/components/ChangeLogs/ChangeLogs.js b/src/components/ChangeLogs/ChangeLogs.js index 43a85aa10..d14a983a9 100644 --- a/src/components/ChangeLogs/ChangeLogs.js +++ b/src/components/ChangeLogs/ChangeLogs.js @@ -75,7 +75,7 @@ class ChangeLogs extends PureComponent { showContent = } else { showContent = ( - <> +
- +
) } return ( diff --git a/src/components/Derivatives/Derivatives.columns.js b/src/components/Derivatives/Derivatives.columns.js index b7c57ef7f..dc6fe78f4 100644 --- a/src/components/Derivatives/Derivatives.columns.js +++ b/src/components/Derivatives/Derivatives.columns.js @@ -1,8 +1,5 @@ import React from 'react' -import { - Cell, - TruncatedFormat, -} from '@blueprintjs/table' +import { Cell } from '@blueprintjs/table' import { formatAmount, fixedFloat } from 'ui/utils' import { getColumnWidth } from 'utils/columns' @@ -129,9 +126,7 @@ export const getColumns = ({ const timestamp = getFullTime(filteredData[rowIndex].timestamp) return ( - - {timestamp} - + {timestamp} ) }, diff --git a/src/components/FundingCreditHistory/FundingCreditHistory.columns.js b/src/components/FundingCreditHistory/FundingCreditHistory.columns.js index 4d70aff1c..86f5a79d3 100644 --- a/src/components/FundingCreditHistory/FundingCreditHistory.columns.js +++ b/src/components/FundingCreditHistory/FundingCreditHistory.columns.js @@ -1,8 +1,5 @@ import React from 'react' -import { - Cell, - TruncatedFormat, -} from '@blueprintjs/table' +import { Cell } from '@blueprintjs/table' import { getColumnWidth } from 'utils/columns' import { getSideMsg, getSideColor } from 'state/utils' @@ -150,9 +147,7 @@ export const getColumns = ({ const timestamp = getFullTime(filteredData[rowIndex].mtsOpening) return ( - - {timestamp} - + {timestamp} ) }, @@ -166,9 +161,7 @@ export const getColumns = ({ const timestamp = getFullTime(filteredData[rowIndex].mtsLastPayout) return ( - - {timestamp} - + {timestamp} ) }, @@ -196,9 +189,7 @@ export const getColumns = ({ const timestamp = getFullTime(filteredData[rowIndex].mtsUpdate) return ( - - {timestamp} - + {timestamp} ) }, diff --git a/src/components/FundingCreditHistory/FundingCreditHistory.js b/src/components/FundingCreditHistory/FundingCreditHistory.js index 5dc9b7e42..b5faf7487 100644 --- a/src/components/FundingCreditHistory/FundingCreditHistory.js +++ b/src/components/FundingCreditHistory/FundingCreditHistory.js @@ -114,14 +114,14 @@ class FundingCreditHistory extends PureComponent { showContent = } else { showContent = ( - <> +
- +
) } diff --git a/src/components/FundingLoanHistory/FundingLoanHistory.columns.js b/src/components/FundingLoanHistory/FundingLoanHistory.columns.js index ddeac2f26..06e7ed7fd 100644 --- a/src/components/FundingLoanHistory/FundingLoanHistory.columns.js +++ b/src/components/FundingLoanHistory/FundingLoanHistory.columns.js @@ -1,8 +1,5 @@ import React from 'react' -import { - Cell, - TruncatedFormat, -} from '@blueprintjs/table' +import { Cell } from '@blueprintjs/table' import { getSideMsg, getSideColor } from 'state/utils' import { formatAmount, formatColor, fixedFloat } from 'ui/utils' @@ -148,9 +145,7 @@ export const getColumns = ({ const timestamp = getFullTime(filteredData[rowIndex].mtsOpening) return ( - - {timestamp} - + {timestamp} ) }, @@ -164,9 +159,7 @@ export const getColumns = ({ const timestamp = getFullTime(filteredData[rowIndex].mtsLastPayout) return ( - - {timestamp} - + {timestamp} ) }, @@ -180,9 +173,7 @@ export const getColumns = ({ const timestamp = getFullTime(filteredData[rowIndex].mtsUpdate) return ( - - {timestamp} - + {timestamp} ) }, diff --git a/src/components/FundingLoanHistory/FundingLoanHistory.js b/src/components/FundingLoanHistory/FundingLoanHistory.js index 3a043524c..18ea9628f 100644 --- a/src/components/FundingLoanHistory/FundingLoanHistory.js +++ b/src/components/FundingLoanHistory/FundingLoanHistory.js @@ -112,7 +112,7 @@ class FundingLoanHistory extends PureComponent { showContent = } else { showContent = ( - <> +
- +
) } diff --git a/src/components/FundingOfferHistory/FundingOfferHistory.columns.js b/src/components/FundingOfferHistory/FundingOfferHistory.columns.js index 0f4d505f4..46ccbfaee 100644 --- a/src/components/FundingOfferHistory/FundingOfferHistory.columns.js +++ b/src/components/FundingOfferHistory/FundingOfferHistory.columns.js @@ -1,8 +1,5 @@ import React from 'react' -import { - Cell, - TruncatedFormat, -} from '@blueprintjs/table' +import { Cell } from '@blueprintjs/table' import { getColumnWidth } from 'utils/columns' import { formatAmount, fixedFloat } from 'ui/utils' @@ -154,9 +151,7 @@ export const getColumns = ({ const timestamp = getFullTime(filteredData[rowIndex].mtsUpdate) return ( - - {timestamp} - + {timestamp} ) }, diff --git a/src/components/FundingOfferHistory/FundingOfferHistory.js b/src/components/FundingOfferHistory/FundingOfferHistory.js index 14d238381..220042044 100644 --- a/src/components/FundingOfferHistory/FundingOfferHistory.js +++ b/src/components/FundingOfferHistory/FundingOfferHistory.js @@ -109,7 +109,7 @@ class FundingOfferHistory extends PureComponent { showContent = } else { showContent = ( - <> +
- +
) } diff --git a/src/components/FundingPayment/FundingPayment.js b/src/components/FundingPayment/FundingPayment.js index fd480cb00..bc9595268 100644 --- a/src/components/FundingPayment/FundingPayment.js +++ b/src/components/FundingPayment/FundingPayment.js @@ -109,7 +109,7 @@ class FundingPayment extends PureComponent { showContent = } else { showContent = ( - <> +
- +
) } return ( diff --git a/src/components/Invoices/Invoices.columns.js b/src/components/Invoices/Invoices.columns.js index 4265c27cc..6e2c973f2 100644 --- a/src/components/Invoices/Invoices.columns.js +++ b/src/components/Invoices/Invoices.columns.js @@ -1,5 +1,5 @@ import React from 'react' -import { Cell, TruncatedFormat } from '@blueprintjs/table' +import { Cell } from '@blueprintjs/table' import JSONFormat from 'ui/JSONFormat' import { getColumnWidth } from 'utils/columns' @@ -213,9 +213,7 @@ export const getColumns = ({ const timestamp = getFullTime(filteredData[rowIndex].mts) return ( - - {timestamp} - + {timestamp} ) }, diff --git a/src/components/Invoices/Invoices.js b/src/components/Invoices/Invoices.js index 36940aad5..eb20c6554 100644 --- a/src/components/Invoices/Invoices.js +++ b/src/components/Invoices/Invoices.js @@ -132,7 +132,7 @@ class Invoices extends PureComponent { showContent = } else { showContent = ( - <> +
- +
) } diff --git a/src/components/Ledgers/Ledgers.columns.js b/src/components/Ledgers/Ledgers.columns.js index 45a529e81..8cfd97535 100644 --- a/src/components/Ledgers/Ledgers.columns.js +++ b/src/components/Ledgers/Ledgers.columns.js @@ -1,5 +1,5 @@ import React from 'react' -import { Cell, TruncatedFormat } from '@blueprintjs/table' +import { Cell } from '@blueprintjs/table' import { insertIf, fixedFloat, formatAmount } from 'ui/utils' import queryConstants from 'state/query/constants' @@ -151,9 +151,7 @@ export default function getColumns(props) { const timestamp = getFullTime(filteredData[rowIndex].mts) return ( - - {timestamp} - + {timestamp} ) }, diff --git a/src/components/Ledgers/Ledgers.js b/src/components/Ledgers/Ledgers.js index 29a2099d8..2dad8be5c 100644 --- a/src/components/Ledgers/Ledgers.js +++ b/src/components/Ledgers/Ledgers.js @@ -124,7 +124,7 @@ class Ledgers extends PureComponent { showContent = } else { showContent = ( - <> +
- +
) } diff --git a/src/components/Logins/Logins.columns.js b/src/components/Logins/Logins.columns.js index 3849416a4..f96d2d6e9 100644 --- a/src/components/Logins/Logins.columns.js +++ b/src/components/Logins/Logins.columns.js @@ -1,8 +1,5 @@ import React from 'react' -import { - Cell, - TruncatedFormat, -} from '@blueprintjs/table' +import { Cell } from '@blueprintjs/table' import JSONFormat from 'ui/JSONFormat' import { getColumnWidth } from 'utils/columns' @@ -36,9 +33,7 @@ export const getColumns = ({ const timestamp = getFullTime(filteredData[rowIndex].time) return ( - - {timestamp} - + {timestamp} ) }, diff --git a/src/components/Logins/Logins.js b/src/components/Logins/Logins.js index 846275c6e..2e83dbdad 100644 --- a/src/components/Logins/Logins.js +++ b/src/components/Logins/Logins.js @@ -88,7 +88,7 @@ class Logins extends PureComponent { showContent = } else { showContent = ( - <> +
- +
) } return ( diff --git a/src/components/Movements/Movements.columns.js b/src/components/Movements/Movements.columns.js index 3d6425dc1..eae793ae3 100644 --- a/src/components/Movements/Movements.columns.js +++ b/src/components/Movements/Movements.columns.js @@ -1,8 +1,5 @@ import React from 'react' -import { - Cell, - TruncatedFormat, -} from '@blueprintjs/table' +import { Cell } from '@blueprintjs/table' import { formatAmount, fixedFloat, insertIf } from 'ui/utils' import Explorer from 'ui/Explorer' @@ -38,9 +35,7 @@ const getColumns = ({ const timestamp = getFullTime(filteredData[rowIndex].mtsUpdated) return ( - - {timestamp} - + {timestamp} ) }, diff --git a/src/components/Movements/Movements.js b/src/components/Movements/Movements.js index 8b5d7f243..7a8f62b93 100644 --- a/src/components/Movements/Movements.js +++ b/src/components/Movements/Movements.js @@ -116,7 +116,7 @@ class Movements extends PureComponent { showContent = } else { showContent = ( - <> +
- +
) } return ( diff --git a/src/components/Orders/Orders.columns.js b/src/components/Orders/Orders.columns.js index 8ebd8cf86..9039f8de6 100644 --- a/src/components/Orders/Orders.columns.js +++ b/src/components/Orders/Orders.columns.js @@ -1,8 +1,5 @@ import React from 'react' -import { - Cell, - TruncatedFormat, -} from '@blueprintjs/table' +import { Cell } from '@blueprintjs/table' import JSONFormat from 'ui/JSONFormat' import { formatAmount, fixedFloat } from 'ui/utils' @@ -147,9 +144,7 @@ export const getColumns = ({ const timestamp = getFullTime(filteredData[rowIndex].mtsCreate) return ( - - {timestamp} - + {timestamp} ) }, @@ -163,9 +158,7 @@ export const getColumns = ({ const timestamp = getFullTime(filteredData[rowIndex].mtsUpdate) return ( - - {timestamp} - + {timestamp} ) }, diff --git a/src/components/Orders/Orders.js b/src/components/Orders/Orders.js index d276e9197..34e8905c1 100644 --- a/src/components/Orders/Orders.js +++ b/src/components/Orders/Orders.js @@ -138,7 +138,7 @@ class Orders extends PureComponent { showContent = } else { showContent = ( - <> +
- +
) } diff --git a/src/components/Positions/Positions.columns.js b/src/components/Positions/Positions.columns.js index b862563b7..b23fa5f76 100644 --- a/src/components/Positions/Positions.columns.js +++ b/src/components/Positions/Positions.columns.js @@ -1,10 +1,7 @@ import React from 'react' import _endsWith from 'lodash/endsWith' -import { - Cell, - TruncatedFormat, -} from '@blueprintjs/table' +import { Cell } from '@blueprintjs/table' import queryConstants from 'state/query/constants' import JSONFormat from 'ui/JSONFormat' @@ -264,9 +261,7 @@ export default function getColumns(props) { const timestamp = getFullTime(filteredData[rowIndex].mtsUpdate) return ( - - {timestamp} - + {timestamp} ) }, diff --git a/src/components/Positions/Positions.js b/src/components/Positions/Positions.js index d41b06e52..a6bf03594 100644 --- a/src/components/Positions/Positions.js +++ b/src/components/Positions/Positions.js @@ -119,7 +119,7 @@ class Positions extends PureComponent { showContent = } else { showContent = ( - <> +
- +
) } diff --git a/src/components/PositionsAudit/PositionsAudit.js b/src/components/PositionsAudit/PositionsAudit.js index 23ad4e64a..8088c1130 100644 --- a/src/components/PositionsAudit/PositionsAudit.js +++ b/src/components/PositionsAudit/PositionsAudit.js @@ -82,7 +82,7 @@ class PositionsAudit extends PureComponent { showContent = } else { showContent = ( - <> +
- +
) } diff --git a/src/components/PublicFunding/PublicFunding.columns.js b/src/components/PublicFunding/PublicFunding.columns.js index 07171c9d3..ef22d5b50 100644 --- a/src/components/PublicFunding/PublicFunding.columns.js +++ b/src/components/PublicFunding/PublicFunding.columns.js @@ -1,8 +1,5 @@ import React from 'react' -import { - Cell, - TruncatedFormat, -} from '@blueprintjs/table' +import { Cell } from '@blueprintjs/table' import { fixedFloat, formatAmount } from 'ui/utils' import { getColumnWidth } from 'utils/columns' @@ -40,9 +37,7 @@ export default function getColumns(props) { const timestamp = getFullTime(filteredData[rowIndex].mts) return ( - - {timestamp} - + {timestamp} ) }, diff --git a/src/components/PublicFunding/PublicFunding.js b/src/components/PublicFunding/PublicFunding.js index a6a22969e..ff6a342b9 100644 --- a/src/components/PublicFunding/PublicFunding.js +++ b/src/components/PublicFunding/PublicFunding.js @@ -1,4 +1,4 @@ -import React, { Fragment, PureComponent } from 'react' +import React, { PureComponent } from 'react' import { withTranslation } from 'react-i18next' import { Card, Elevation } from '@blueprintjs/core' @@ -75,14 +75,14 @@ class PublicFunding extends PureComponent { showContent = } else { showContent = ( - +
- +
) } diff --git a/src/components/PublicTrades/PublicTrades.columns.js b/src/components/PublicTrades/PublicTrades.columns.js index 2f4b22314..da5acc76a 100644 --- a/src/components/PublicTrades/PublicTrades.columns.js +++ b/src/components/PublicTrades/PublicTrades.columns.js @@ -1,8 +1,5 @@ import React from 'react' -import { - Cell, - TruncatedFormat, -} from '@blueprintjs/table' +import { Cell } from '@blueprintjs/table' import { formatAmount, fixedFloat, amountStyle } from 'ui/utils' import { formatPair } from 'state/symbols/utils' @@ -41,9 +38,7 @@ export default function getColumns(props) { const timestamp = getFullTime(filteredData[rowIndex].mts) return ( - - {timestamp} - + {timestamp} ) }, diff --git a/src/components/PublicTrades/PublicTrades.js b/src/components/PublicTrades/PublicTrades.js index d3523082c..91ffb4f50 100644 --- a/src/components/PublicTrades/PublicTrades.js +++ b/src/components/PublicTrades/PublicTrades.js @@ -1,4 +1,4 @@ -import React, { Fragment, PureComponent } from 'react' +import React, { PureComponent } from 'react' import { withTranslation } from 'react-i18next' import { Card, Elevation } from '@blueprintjs/core' @@ -67,14 +67,14 @@ class PublicTrades extends PureComponent { showContent = } else { showContent = ( - +
- +
) } diff --git a/src/components/StakingPayments/StakingPayments.js b/src/components/StakingPayments/StakingPayments.js index a7f53ae42..5271781d3 100644 --- a/src/components/StakingPayments/StakingPayments.js +++ b/src/components/StakingPayments/StakingPayments.js @@ -111,7 +111,7 @@ class StakingPayments extends PureComponent { showContent = } else { showContent = ( - <> +
- +
) } return ( diff --git a/src/components/Tickers/Tickers.columns.js b/src/components/Tickers/Tickers.columns.js index 600a19cc9..503693b67 100644 --- a/src/components/Tickers/Tickers.columns.js +++ b/src/components/Tickers/Tickers.columns.js @@ -1,8 +1,5 @@ import React from 'react' -import { - Cell, - TruncatedFormat, -} from '@blueprintjs/table' +import { Cell } from '@blueprintjs/table' import { fixedFloat } from 'ui/utils' import { getColumnWidth } from 'utils/columns' @@ -77,9 +74,7 @@ export default function getColumns(props) { const timestamp = getFullTime(filteredData[rowIndex].mtsUpdate) return ( - - {timestamp} - + {timestamp} ) }, diff --git a/src/components/Tickers/Tickers.js b/src/components/Tickers/Tickers.js index 1be5b1be9..879f8cb2d 100644 --- a/src/components/Tickers/Tickers.js +++ b/src/components/Tickers/Tickers.js @@ -1,4 +1,4 @@ -import React, { Fragment, PureComponent } from 'react' +import React, { PureComponent } from 'react' import { withTranslation } from 'react-i18next' import { Card, Elevation } from '@blueprintjs/core' @@ -82,14 +82,14 @@ class Tickers extends PureComponent { showContent = } else { showContent = ( - +
- +
) } diff --git a/src/components/Trades/Trades.columns.js b/src/components/Trades/Trades.columns.js index eacfa75fe..bfcf17211 100644 --- a/src/components/Trades/Trades.columns.js +++ b/src/components/Trades/Trades.columns.js @@ -1,5 +1,5 @@ import React, { Fragment } from 'react' -import { Cell, TruncatedFormat } from '@blueprintjs/table' +import { Cell } from '@blueprintjs/table' import { formatAmount, fixedFloat } from 'ui/utils' import { demapPairs, demapSymbols } from 'state/symbols/utils' @@ -170,9 +170,7 @@ export default function getColumns(props) { const timestamp = getFullTime(filteredData[rowIndex].mtsCreate) return ( - - {timestamp} - + {timestamp} ) }, diff --git a/src/components/Trades/Trades.js b/src/components/Trades/Trades.js index 1906daaac..5d612454a 100644 --- a/src/components/Trades/Trades.js +++ b/src/components/Trades/Trades.js @@ -1,4 +1,4 @@ -import React, { Fragment, PureComponent } from 'react' +import React, { PureComponent } from 'react' import { withTranslation } from 'react-i18next' import { Card, Elevation } from '@blueprintjs/core' @@ -63,7 +63,7 @@ class Trades extends PureComponent { showContent = } else { showContent = ( - +
- +
) } diff --git a/src/styles/themes/_dark.scss b/src/styles/themes/_dark.scss index 0b99c4cdd..06198d44a 100644 --- a/src/styles/themes/_dark.scss +++ b/src/styles/themes/_dark.scss @@ -50,14 +50,14 @@ // tables --thColor: #82baf6; - --thBg: #172d3e; + --thBg: #0B1923; --thBgHover: #19354a; --tableColor: #f5f8fa; - --tableBorder: #19354a; - --tableOddBg: #172d3e; - --tableEvenBg: #102331; + --tableBorder: #334A59; + --tableOddBg: #0B1923; + --tableEvenBg: #0B1923; --tableScrollBg: #0c1a25; - --tableScrollThumbBg: #5ebefa; + --tableScrollThumbBg: #2A3F4D; --tableAmountPosColor: #00a27c; --tableAmountNegColor: #f05359; --tableAmountFractionPosColor: #03ca9b; diff --git a/src/ui/CollapsedTable/_CollapsedTable.scss b/src/ui/CollapsedTable/_CollapsedTable.scss index 7cf1dc73e..9a6dc3a56 100644 --- a/src/ui/CollapsedTable/_CollapsedTable.scss +++ b/src/ui/CollapsedTable/_CollapsedTable.scss @@ -4,35 +4,32 @@ &-item { display: table; width: 100%; + padding: 16px; + border-radius: 6px; margin-bottom: 10px; - border: 1px solid var(--borderColor); - border-radius: 2px; - - &:last-child { - margin-bottom: 0; - } + background-color: var(--bgColor); + border: 1px solid var(--bgColor); & > div { display: table-row; &:nth-child(odd) { - background-color: var(--tableOddBg); + background-color: var(--bgColor); } &:nth-child(even) { - background-color: var(--tableEvenBg); + background-color: var(--bgColor); } & > div { display: table-cell; min-height: 24px; - padding: 4px 11px; + padding: 12px 11px; vertical-align: middle; + border-bottom: 1px solid var(--tableBorder); &:first-child { width: 45%; - color: var(--activeColor); - border-right: 1px solid var(--borderColor); } &:last-child { @@ -40,6 +37,12 @@ word-break: break-word; } } + + &:last-child { + & > div { + border-bottom: none; + } + } } } diff --git a/src/ui/DataTable/DataTable.js b/src/ui/DataTable/DataTable.js index d256c6190..f0d1d5165 100644 --- a/src/ui/DataTable/DataTable.js +++ b/src/ui/DataTable/DataTable.js @@ -179,6 +179,7 @@ class DataTable extends PureComponent { getCellClipboardData={this.getCellClipboardData} onCopy={this.onCopy} bodyContextMenuRenderer={this.renderBodyContextMenu} + defaultRowHeight={50} > {tableColumns.map(column => (
- - + + + + + + {t('pagination.page')} - - + + + + + + {renderLoading}
diff --git a/src/ui/Pagination/_Pagination.scss b/src/ui/Pagination/_Pagination.scss index 5bf8df9d3..d2a4d8daa 100644 --- a/src/ui/Pagination/_Pagination.scss +++ b/src/ui/Pagination/_Pagination.scss @@ -1,16 +1,37 @@ .pagination { margin: 25px 0; + display: flex; + align-items: center; + justify-content: center; - &-icon { - margin: 0 2px; - vertical-align: middle; - cursor: pointer; + &-group { + display: flex; + align-items: center; + justify-content: center; + } + + &-icon-wrapper { + width: 39px; + height: 39px; + margin: 0 5px; + display: inline-flex; + align-items: center; + justify-content: center; + border: 1px solid var(--color2); + border-radius: 4px; - &--disabled { - pointer-events: none; + .pagination-icon { + margin: 0 2px; + cursor: pointer; + vertical-align: middle; + transform: scale(1.3); path { - fill: var(--timeRangeColor); + fill: var(--color2); + } + + &--disabled { + pointer-events: none; } } } @@ -20,13 +41,18 @@ } &-input { - width: 45px; - height: 22px; - margin: 0 3px; + width: 40px; + height: 40px; + margin: 0 7px; text-align: center; background-color: var(--bgColor); - border: 1px solid var(--borderColor); color: var(--color); + border: none; + border-radius: 4px; + + &::placeholder { + color: var(--color); + } } &-loading { diff --git a/src/ui/SectionHeader/_SectionHeader.scss b/src/ui/SectionHeader/_SectionHeader.scss index 682cdf304..a5bda08f3 100644 --- a/src/ui/SectionHeader/_SectionHeader.scss +++ b/src/ui/SectionHeader/_SectionHeader.scss @@ -4,7 +4,7 @@ &-title { font-size: 30px; margin-bottom: 20px; - color: var(--activeColor); + color: var(--color); position: relative; .bp3-popover-wrapper { diff --git a/src/ui/utils.js b/src/ui/utils.js index 8be215b68..87714d54d 100644 --- a/src/ui/utils.js +++ b/src/ui/utils.js @@ -52,7 +52,6 @@ export const formatAmount = (val, options = {}) => { ) } const { - color, digits = 8, minDigits = false, fixFraction = true, @@ -61,11 +60,6 @@ export const formatAmount = (val, options = {}) => { } = options let roundedValue = _round(val, 8) - const classes = classNames('bitfinex-amount', { - 'bitfinex-green-text': color ? color === 'green' : roundedValue > 0, - 'bitfinex-red-text': color ? color === 'red' : roundedValue < 0, - }) - if (fixFraction) { roundedValue = formatFraction(roundedValue, { digits, minDigits }) } @@ -78,7 +72,7 @@ export const formatAmount = (val, options = {}) => { return ( <> -
+
{dollarSign && '$'} {integer} diff --git a/src/utils/columns.js b/src/utils/columns.js index fd83bff9f..5f1b82235 100644 --- a/src/utils/columns.js +++ b/src/utils/columns.js @@ -6,7 +6,7 @@ import _pick from 'lodash/pick' import _filter from 'lodash/filter' import _isEqual from 'lodash/isEqual' -import { Cell, TruncatedFormat } from '@blueprintjs/table' +import { Cell } from '@blueprintjs/table' import { formatAmount, fixedFloat } from 'ui/utils' @@ -410,9 +410,7 @@ export const getFrameworkPositionsColumns = (props) => { const timestamp = getFullTime(filteredData[rowIndex].mtsUpdate) return ( - - {timestamp} - + {timestamp} ) }, From 82ab5b744cc006f50e4069cfb2f171a7371ef592 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Mon, 26 Jun 2023 11:28:16 +0300 Subject: [PATCH 003/115] Actualize amounts formatting This reverts commit 62ea9e5b49353f8d48dd8d366c80dfc5f4868dd8. --- src/ui/utils.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ui/utils.js b/src/ui/utils.js index 87714d54d..8be215b68 100644 --- a/src/ui/utils.js +++ b/src/ui/utils.js @@ -52,6 +52,7 @@ export const formatAmount = (val, options = {}) => { ) } const { + color, digits = 8, minDigits = false, fixFraction = true, @@ -60,6 +61,11 @@ export const formatAmount = (val, options = {}) => { } = options let roundedValue = _round(val, 8) + const classes = classNames('bitfinex-amount', { + 'bitfinex-green-text': color ? color === 'green' : roundedValue > 0, + 'bitfinex-red-text': color ? color === 'red' : roundedValue < 0, + }) + if (fixFraction) { roundedValue = formatFraction(roundedValue, { digits, minDigits }) } @@ -72,7 +78,7 @@ export const formatAmount = (val, options = {}) => { return ( <> -
+
{dollarSign && '$'} {integer} From fd0ab2d2573c4cbaa23769017d7871b269588378 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Mon, 26 Jun 2023 11:38:12 +0300 Subject: [PATCH 004/115] Actualize table rows heights --- src/ui/DataTable/DataTable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/DataTable/DataTable.js b/src/ui/DataTable/DataTable.js index f0d1d5165..e1b0b56ea 100644 --- a/src/ui/DataTable/DataTable.js +++ b/src/ui/DataTable/DataTable.js @@ -179,7 +179,7 @@ class DataTable extends PureComponent { getCellClipboardData={this.getCellClipboardData} onCopy={this.onCopy} bodyContextMenuRenderer={this.renderBodyContextMenu} - defaultRowHeight={50} + defaultRowHeight={26} > {tableColumns.map(column => ( Date: Mon, 26 Jun 2023 14:23:31 +0300 Subject: [PATCH 005/115] Adjust cells fontsize --- src/ui/DataTable/_DataTable.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/DataTable/_DataTable.scss b/src/ui/DataTable/_DataTable.scss index af277f990..eab5ed7c8 100644 --- a/src/ui/DataTable/_DataTable.scss +++ b/src/ui/DataTable/_DataTable.scss @@ -98,7 +98,7 @@ } &-cell { - font-size: 14px; + font-size: 13px; color: var(--tableColor); display: flex; align-items: center; From bae4b84679e40a7b669610380754c2b24be1e318 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Mon, 26 Jun 2023 14:55:45 +0300 Subject: [PATCH 006/115] Improves table headers styling and positioning --- src/ui/DataTable/_DataTable.scss | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ui/DataTable/_DataTable.scss b/src/ui/DataTable/_DataTable.scss index eab5ed7c8..79a607437 100644 --- a/src/ui/DataTable/_DataTable.scss +++ b/src/ui/DataTable/_DataTable.scss @@ -73,18 +73,24 @@ .bp3-table-header { box-shadow: 0 1px 0 var(--tableBorder); + + &:first-child { + .bp3-table-column-name-text { + justify-content: flex-start; + } + } } } &-name { - font-size: 14px; + font-size: 13px; color: var(--thColor); &-text { min-height: 50px; display: flex; align-items: center; - justify-content: flex-start; + justify-content: flex-end; } } } From 30a207fae8eda33b4e208452ff09f4779d7ba741 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Mon, 26 Jun 2023 15:46:45 +0300 Subject: [PATCH 007/115] Fix tables collapsing on mobiles --- src/ui/DataTable/DataTable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/DataTable/DataTable.js b/src/ui/DataTable/DataTable.js index e1b0b56ea..f21b71ca0 100644 --- a/src/ui/DataTable/DataTable.js +++ b/src/ui/DataTable/DataTable.js @@ -164,7 +164,7 @@ class DataTable extends PureComponent { } = this.props const columnWidths = tableColumns.map(column => column.width) - if (device === DEVICES.PHONE && tableColumns.length > 2) { + if (device === DEVICES.PHONE && tableColumns.length >= 2) { return } From 069ad91188e70aee3762bfb9ce221aedc8de5cf3 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Mon, 26 Jun 2023 15:51:46 +0300 Subject: [PATCH 008/115] Improve account summary items representation on mobiles --- src/components/AccountSummary/_AccountSummary.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/AccountSummary/_AccountSummary.scss b/src/components/AccountSummary/_AccountSummary.scss index ec2107d8f..e93ac5927 100644 --- a/src/components/AccountSummary/_AccountSummary.scss +++ b/src/components/AccountSummary/_AccountSummary.scss @@ -49,6 +49,7 @@ .section-account-summary { &-data { &-item { + width: 100%; margin-right: 0; } } From 8e3827c2a6a757195d277c789fb654ce1ed7d427 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Mon, 26 Jun 2023 16:00:26 +0300 Subject: [PATCH 009/115] Enhance data-table responsiveness --- src/styles/index.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/styles/index.scss b/src/styles/index.scss index d8e613f20..7b1805381 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -106,6 +106,12 @@ html { max-width: fit-content; } +@media screen and (max-width: 770px) { + .data-table-wrapper { + max-width: 100%; + } +} + .color--active { color: var(--activeColor); } From 1cc9535b5ec9bd261a5c65de77d85119c6aa57d7 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 27 Jun 2023 11:17:55 +0300 Subject: [PATCH 010/115] Adjust collapsed table spacing --- src/ui/CollapsedTable/_CollapsedTable.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/CollapsedTable/_CollapsedTable.scss b/src/ui/CollapsedTable/_CollapsedTable.scss index 9a6dc3a56..3d8611964 100644 --- a/src/ui/CollapsedTable/_CollapsedTable.scss +++ b/src/ui/CollapsedTable/_CollapsedTable.scss @@ -4,7 +4,7 @@ &-item { display: table; width: 100%; - padding: 16px; + padding: 4px 16px; border-radius: 6px; margin-bottom: 10px; background-color: var(--bgColor); @@ -24,7 +24,7 @@ & > div { display: table-cell; min-height: 24px; - padding: 12px 11px; + padding: 8px; vertical-align: middle; border-bottom: 1px solid var(--tableBorder); From cdbcbdd2156f1d3dc78402a1bb415e5db340f010 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 27 Jun 2023 11:30:38 +0300 Subject: [PATCH 011/115] Implement columns customizable classes support --- src/ui/DataTable/DataTable.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ui/DataTable/DataTable.js b/src/ui/DataTable/DataTable.js index f21b71ca0..72a22ca49 100644 --- a/src/ui/DataTable/DataTable.js +++ b/src/ui/DataTable/DataTable.js @@ -186,6 +186,7 @@ class DataTable extends PureComponent { key={column.id} id={column.id} name={column.nameStr ? column.nameStr : t(column.name)} + className={column?.className ?? 'align-right'} cellRenderer={column.renderer} /> ))} From 743ea3baf4494902f5da01f23f67ecca68b597ef Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 27 Jun 2023 11:50:56 +0300 Subject: [PATCH 012/115] Implement table headers dynamic aligning --- src/ui/DataTable/_DataTable.scss | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/ui/DataTable/_DataTable.scss b/src/ui/DataTable/_DataTable.scss index 79a607437..77b6bc60a 100644 --- a/src/ui/DataTable/_DataTable.scss +++ b/src/ui/DataTable/_DataTable.scss @@ -73,11 +73,17 @@ .bp3-table-header { box-shadow: 0 1px 0 var(--tableBorder); + } + + .bp3-table-header.align-left { + .bp3-table-column-name-text { + justify-content: flex-start; + } + } - &:first-child { - .bp3-table-column-name-text { - justify-content: flex-start; - } + .bp3-table-header.align-right { + .bp3-table-column-name-text { + justify-content: flex-end; } } } @@ -90,7 +96,6 @@ min-height: 50px; display: flex; align-items: center; - justify-content: flex-end; } } } From 7b4414da9458ec81c5b439fa90afadbc3253e8f1 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 27 Jun 2023 11:57:20 +0300 Subject: [PATCH 013/115] Improve tables data aligning --- src/ui/DataTable/_DataTable.scss | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/ui/DataTable/_DataTable.scss b/src/ui/DataTable/_DataTable.scss index 77b6bc60a..83299ea4e 100644 --- a/src/ui/DataTable/_DataTable.scss +++ b/src/ui/DataTable/_DataTable.scss @@ -73,17 +73,17 @@ .bp3-table-header { box-shadow: 0 1px 0 var(--tableBorder); - } - .bp3-table-header.align-left { - .bp3-table-column-name-text { - justify-content: flex-start; + &.align-left { + .bp3-table-column-name-text { + justify-content: flex-start; + } } - } - .bp3-table-header.align-right { - .bp3-table-column-name-text { - justify-content: flex-end; + &.align-right { + .bp3-table-column-name-text { + justify-content: flex-end; + } } } } @@ -113,8 +113,13 @@ color: var(--tableColor); display: flex; align-items: center; - justify-content: flex-start; box-shadow: inset 0 -1px 0 var(--tableBorder); + &.align-left { + justify-content: flex-start; + } + &.align-right { + justify-content: flex-end; + } &-ledger { &-even { From fbdb9e1576a6c38db47ed0f72ef8ec4c8871d738 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 27 Jun 2023 12:00:01 +0300 Subject: [PATCH 014/115] Actualize ledgers cells aligning --- src/components/Ledgers/Ledgers.columns.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/Ledgers/Ledgers.columns.js b/src/components/Ledgers/Ledgers.columns.js index 8cfd97535..2a955a7ef 100644 --- a/src/components/Ledgers/Ledgers.columns.js +++ b/src/components/Ledgers/Ledgers.columns.js @@ -20,11 +20,12 @@ export default function getColumns(props) { { id: 'id', name: 'column.id', + className: 'align-left', width: getColumnWidth('id', columnsWidth), renderer: (rowIndex) => { const { id } = filteredData[rowIndex] return ( - + {id} ) @@ -35,6 +36,7 @@ export default function getColumns(props) { { id: 'description', name: 'column.description', + className: 'align-left', width: getColumnWidth('description', columnsWidth), renderer: (rowIndex) => { const { description } = filteredData[rowIndex] @@ -50,6 +52,7 @@ export default function getColumns(props) { { id: 'currency', name: 'column.currency', + className: 'align-left', width: getColumnWidth('currency', columnsWidth), renderer: (rowIndex) => { const { currency } = filteredData[rowIndex] @@ -146,6 +149,7 @@ export default function getColumns(props) { { id: 'mts', nameStr: `${t('column.date')} (${timeOffset})`, + className: 'align-left', width: getColumnWidth('mts', columnsWidth), renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].mts) @@ -160,6 +164,7 @@ export default function getColumns(props) { { id: 'wallet', name: 'column.wallet', + className: 'align-left', width: getColumnWidth('wallet', columnsWidth), renderer: (rowIndex) => { const { wallet } = filteredData[rowIndex] From 5fe38352db830cdb0c6ec88ddf560615edc2d394 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 27 Jun 2023 12:06:51 +0300 Subject: [PATCH 015/115] Update trades columns configuration --- src/components/Trades/Trades.columns.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/Trades/Trades.columns.js b/src/components/Trades/Trades.columns.js index bfcf17211..a0caf4905 100644 --- a/src/components/Trades/Trades.columns.js +++ b/src/components/Trades/Trades.columns.js @@ -43,6 +43,7 @@ export default function getColumns(props) { { id: 'id', name: 'column.id', + className: 'align-left', width: getColumnWidth('id', columnsWidth), renderer: (rowIndex) => { const { id } = filteredData[rowIndex] @@ -57,6 +58,7 @@ export default function getColumns(props) { { id: 'orderID', name: 'column.orderid', + className: 'align-left', width: getColumnWidth('orderID', columnsWidth), renderer: (rowIndex) => { const { orderID } = filteredData[rowIndex] @@ -71,6 +73,7 @@ export default function getColumns(props) { { id: 'pair', name: 'column.pair', + className: 'align-left', width: getColumnWidth('pair', columnsWidth), renderer: (rowIndex) => { const { pair } = filteredData[rowIndex] @@ -164,6 +167,7 @@ export default function getColumns(props) { }, { id: 'mtsCreate', + className: 'align-left', nameStr: `${t('column.date')} (${timeOffset})`, width: getColumnWidth('mtsCreate', columnsWidth), renderer: (rowIndex) => { From c45daab38bb0619ba450a009032e003f9d91c028 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 27 Jun 2023 12:07:12 +0300 Subject: [PATCH 016/115] Improve orders data formatting --- src/components/Orders/Orders.columns.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/components/Orders/Orders.columns.js b/src/components/Orders/Orders.columns.js index 9039f8de6..4cbbde488 100644 --- a/src/components/Orders/Orders.columns.js +++ b/src/components/Orders/Orders.columns.js @@ -16,6 +16,7 @@ export const getColumns = ({ { id: 'id', name: 'column.id', + className: 'align-left', width: getColumnWidth('id', columnsWidth), renderer: (rowIndex) => { const { id, pair, amountExecuted } = filteredData[rowIndex] @@ -36,6 +37,7 @@ export const getColumns = ({ { id: 'pair', name: 'column.pair', + className: 'align-left', width: getColumnWidth('pair', columnsWidth), renderer: (rowIndex) => { const { pair } = filteredData[rowIndex] @@ -50,6 +52,7 @@ export const getColumns = ({ { id: 'type', name: 'column.type', + className: 'align-left', width: getColumnWidth('type', columnsWidth), renderer: (rowIndex) => { const { type } = filteredData[rowIndex] @@ -138,6 +141,7 @@ export const getColumns = ({ }, { id: 'mtsCreate', + className: 'align-left', nameStr: `${t('column.created')} (${timeOffset})`, width: getColumnWidth('mtsCreate', columnsWidth), renderer: (rowIndex) => { @@ -152,6 +156,7 @@ export const getColumns = ({ }, { id: 'mtsUpdate', + className: 'align-left', nameStr: `${t('column.updated')} (${timeOffset})`, width: getColumnWidth('mtsUpdate', columnsWidth), renderer: (rowIndex) => { @@ -167,6 +172,7 @@ export const getColumns = ({ { id: 'status', name: 'column.status', + className: 'align-left', width: getColumnWidth('status', columnsWidth), renderer: (rowIndex) => { const { status } = filteredData[rowIndex] @@ -200,6 +206,7 @@ export const getColumns = ({ { id: 'typePrev', name: 'column.typeprev', + className: 'align-left', width: getColumnWidth('typePrev', columnsWidth), renderer: (rowIndex) => { const { typePrev } = filteredData[rowIndex] @@ -214,6 +221,7 @@ export const getColumns = ({ { id: 'meta', name: 'column.meta', + className: 'align-left', width: getColumnWidth('meta', columnsWidth), renderer: (rowIndex) => { const { meta } = filteredData[rowIndex] From 17da81e703bf1b8dfae304981f707132e25d4f09 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 27 Jun 2023 12:13:00 +0300 Subject: [PATCH 017/115] Update positions data aligning --- src/components/Positions/Positions.columns.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/Positions/Positions.columns.js b/src/components/Positions/Positions.columns.js index b23fa5f76..ace0aca75 100644 --- a/src/components/Positions/Positions.columns.js +++ b/src/components/Positions/Positions.columns.js @@ -117,6 +117,7 @@ export default function getColumns(props) { { id: 'meta', name: 'column.meta', + className: 'align-left', width: getColumnWidth('meta', columnsWidth), renderer: (rowIndex) => { const { meta = '' } = filteredData[rowIndex] @@ -139,6 +140,7 @@ export default function getColumns(props) { { id: 'id', name: 'column.id', + className: 'align-left', width: getColumnWidth('id', columnsWidth), renderer: (rowIndex) => { const { id } = filteredData[rowIndex] @@ -157,6 +159,7 @@ export default function getColumns(props) { { id: 'pair', name: 'column.pair', + className: 'align-left', width: getColumnWidth('pair', columnsWidth), renderer: (rowIndex) => { const { pair } = filteredData[rowIndex] @@ -228,6 +231,7 @@ export default function getColumns(props) { { id: 'marginFundingType', name: 'column.fundingType', + className: 'align-left', width: getColumnWidth('marginFundingType', columnsWidth), renderer: (rowIndex) => { const swapType = showType(filteredData[rowIndex]) @@ -242,6 +246,7 @@ export default function getColumns(props) { { id: 'status', name: 'column.status', + className: 'align-left', width: getColumnWidth('status', columnsWidth), renderer: (rowIndex) => { const { status } = filteredData[rowIndex] @@ -255,6 +260,7 @@ export default function getColumns(props) { }, { id: 'mtsUpdate', + className: 'align-left', nameStr: `${t('column.updated')} (${timeOffset})`, width: getColumnWidth('mtsUpdate', columnsWidth), renderer: (rowIndex) => { From 7136d5d4b6e6f5423ab8d4e2ac3a0bc4acc93cf2 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 27 Jun 2023 12:14:29 +0300 Subject: [PATCH 018/115] Cleanup --- src/components/Ledgers/Ledgers.columns.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Ledgers/Ledgers.columns.js b/src/components/Ledgers/Ledgers.columns.js index 2a955a7ef..cfbdc487e 100644 --- a/src/components/Ledgers/Ledgers.columns.js +++ b/src/components/Ledgers/Ledgers.columns.js @@ -25,7 +25,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const { id } = filteredData[rowIndex] return ( - + {id} ) From 18533bcff6ab3cd295334ce6c3aef2eca73f251f Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 27 Jun 2023 13:22:44 +0300 Subject: [PATCH 019/115] Update data table max-height --- src/ui/DataTable/_DataTable.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/DataTable/_DataTable.scss b/src/ui/DataTable/_DataTable.scss index 83299ea4e..22904fd24 100644 --- a/src/ui/DataTable/_DataTable.scss +++ b/src/ui/DataTable/_DataTable.scss @@ -2,7 +2,7 @@ width: fit-content; min-height: unset; height: fit-content; - max-height: 517px; + max-height: 525px; margin-left: 1px; flex: 0 1 auto; border-top: 1px solid var(--tableBorder); From 0104d4d5485d3bf59aa23f7b5ccf0ea160d094c9 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 27 Jun 2023 13:53:43 +0300 Subject: [PATCH 020/115] Update account summary data alignments --- src/components/AccountSummary/AccountSummary.paidFees.js | 1 + src/components/AccountSummary/AccountSummary.volume.js | 1 + 2 files changed, 2 insertions(+) diff --git a/src/components/AccountSummary/AccountSummary.paidFees.js b/src/components/AccountSummary/AccountSummary.paidFees.js index b81e7dd42..a7a679f30 100644 --- a/src/components/AccountSummary/AccountSummary.paidFees.js +++ b/src/components/AccountSummary/AccountSummary.paidFees.js @@ -10,6 +10,7 @@ export const getColumns = ({ data }) => [ { id: 'currency', name: 'column.currency', + className: 'align-left', width: window.innerWidth > 390 ? 250 : COLUMN_WIDTHS.SYMBOL, diff --git a/src/components/AccountSummary/AccountSummary.volume.js b/src/components/AccountSummary/AccountSummary.volume.js index 483a68dda..b8b747c71 100644 --- a/src/components/AccountSummary/AccountSummary.volume.js +++ b/src/components/AccountSummary/AccountSummary.volume.js @@ -10,6 +10,7 @@ const getColumns = ({ data }) => [ { id: 'currency', name: 'column.currency', + className: 'align-left', width: COLUMN_WIDTHS.SYMBOL, renderer: (rowIndex) => { const { curr } = data[rowIndex] From bff63d545a202c55a8dfea399e5a804f8a0022a0 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 27 Jun 2023 13:56:59 +0300 Subject: [PATCH 021/115] Actualize weighted avgs and concentation risk cols configs --- src/components/ConcentrationRisk/ConcentrationRisk.columns.js | 1 + src/components/WeightedAverages/WeightedAverages.columns.js | 1 + 2 files changed, 2 insertions(+) diff --git a/src/components/ConcentrationRisk/ConcentrationRisk.columns.js b/src/components/ConcentrationRisk/ConcentrationRisk.columns.js index 39c37902d..c2c9cb536 100644 --- a/src/components/ConcentrationRisk/ConcentrationRisk.columns.js +++ b/src/components/ConcentrationRisk/ConcentrationRisk.columns.js @@ -7,6 +7,7 @@ export const getColumns = ({ data }) => [ { id: 'currency', name: 'column.currency', + className: 'align-left', width: 100, renderer: (rowIndex) => { const { currency } = data[rowIndex] diff --git a/src/components/WeightedAverages/WeightedAverages.columns.js b/src/components/WeightedAverages/WeightedAverages.columns.js index b3d290013..8733df984 100644 --- a/src/components/WeightedAverages/WeightedAverages.columns.js +++ b/src/components/WeightedAverages/WeightedAverages.columns.js @@ -12,6 +12,7 @@ export const getColumns = ({ { id: 'pair', name: 'column.pair', + className: 'align-left', width: getColumnWidth('pair', columnsWidth), renderer: (rowIndex) => { const { pair } = filteredData[rowIndex] From 44e358b1f9655171888d2efa3426eaccd79c6020 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 27 Jun 2023 14:02:50 +0300 Subject: [PATCH 022/115] Update wallets and snapshots data aligning --- .../Snapshots/WalletsSnapshot/Wallets.columns.js | 1 + src/components/Wallets/Wallets.columns.js | 1 + src/utils/columns.js | 8 ++++++++ 3 files changed, 10 insertions(+) diff --git a/src/components/Snapshots/WalletsSnapshot/Wallets.columns.js b/src/components/Snapshots/WalletsSnapshot/Wallets.columns.js index 3a99764b5..cd7ec6577 100644 --- a/src/components/Snapshots/WalletsSnapshot/Wallets.columns.js +++ b/src/components/Snapshots/WalletsSnapshot/Wallets.columns.js @@ -10,6 +10,7 @@ export default function getColumns(props) { { id: 'currency', name: 'column.currency', + className: 'align-left', width: 100, renderer: (rowIndex) => { const { currency } = filteredData[rowIndex] diff --git a/src/components/Wallets/Wallets.columns.js b/src/components/Wallets/Wallets.columns.js index c2a9e4931..747aa396b 100644 --- a/src/components/Wallets/Wallets.columns.js +++ b/src/components/Wallets/Wallets.columns.js @@ -12,6 +12,7 @@ export default function getColumns(props) { { id: 'currency', name: 'column.currency', + className: 'align-left', width: 100, renderer: (rowIndex) => { const { currency } = filteredData[rowIndex] diff --git a/src/utils/columns.js b/src/utils/columns.js index 5f1b82235..e2ed5ecf7 100644 --- a/src/utils/columns.js +++ b/src/utils/columns.js @@ -209,6 +209,7 @@ export const getFrameworkPositionsColumns = (props) => { { id: 'id', name: 'column.id', + className: 'align-left', width: 100, renderer: (rowIndex) => { const { id } = filteredData[rowIndex] @@ -223,6 +224,7 @@ export const getFrameworkPositionsColumns = (props) => { { id: 'pair', name: 'column.pair', + className: 'align-left', width: COLUMN_WIDTHS.pair, renderer: (rowIndex) => { const { pair } = filteredData[rowIndex] @@ -377,6 +379,7 @@ export const getFrameworkPositionsColumns = (props) => { { id: 'swapType', name: 'column.fundingType', + className: 'align-left', width: 120, renderer: (rowIndex) => { const swapType = showType(filteredData[rowIndex].marginFundingType) @@ -391,6 +394,7 @@ export const getFrameworkPositionsColumns = (props) => { { id: 'status', name: 'column.status', + className: 'align-left', width: 100, renderer: (rowIndex) => { const { status } = filteredData[rowIndex] @@ -404,6 +408,7 @@ export const getFrameworkPositionsColumns = (props) => { }, { id: 'mtsUpdate', + className: 'align-left', nameStr: `${t('column.updated')} (${timeOffset})`, width: COLUMN_WIDTHS.mtsUpdate, renderer: (rowIndex) => { @@ -426,6 +431,7 @@ export const getPositionsTickersColumns = (props) => { { id: 'pair', name: 'column.pair', + className: 'align-left', width: COLUMN_WIDTHS.pair, renderer: (rowIndex) => { const { pair } = filteredData[rowIndex] @@ -465,6 +471,7 @@ export const getWalletsTickersColumns = (props) => { { id: 'type', name: 'column.type', + className: 'align-left', width: 80, renderer: (rowIndex) => { const { walletType } = filteredData[rowIndex] @@ -483,6 +490,7 @@ export const getWalletsTickersColumns = (props) => { { id: 'pair', name: 'column.pair', + className: 'align-left', width: 100, renderer: (rowIndex) => { const { pair } = filteredData[rowIndex] From 367ece23fd4e8c0ea44170f557b8146cdb37effc Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 27 Jun 2023 14:16:32 +0300 Subject: [PATCH 023/115] Actualize funding sections cells aligning --- .../FundingCreditHistory.columns.js | 10 ++++++++++ .../FundingLoanHistory/FundingLoanHistory.columns.js | 9 +++++++++ .../FundingOfferHistory/FundingOfferHistory.columns.js | 6 ++++++ 3 files changed, 25 insertions(+) diff --git a/src/components/FundingCreditHistory/FundingCreditHistory.columns.js b/src/components/FundingCreditHistory/FundingCreditHistory.columns.js index 86f5a79d3..74bf08404 100644 --- a/src/components/FundingCreditHistory/FundingCreditHistory.columns.js +++ b/src/components/FundingCreditHistory/FundingCreditHistory.columns.js @@ -15,6 +15,7 @@ export const getColumns = ({ { id: 'id', name: 'column.id', + className: 'align-left', width: getColumnWidth('id', columnsWidth), renderer: (rowIndex) => { const { id } = filteredData[rowIndex] @@ -29,6 +30,7 @@ export const getColumns = ({ { id: 'symbol', name: 'column.currency', + className: 'align-left', width: getColumnWidth('symbol', columnsWidth), renderer: (rowIndex) => { const { symbol } = filteredData[rowIndex] @@ -43,6 +45,7 @@ export const getColumns = ({ { id: 'side', name: 'column.side', + className: 'align-left', width: getColumnWidth('side', columnsWidth), renderer: (rowIndex) => { const { side } = filteredData[rowIndex] @@ -76,6 +79,7 @@ export const getColumns = ({ { id: 'status', name: 'column.status', + className: 'align-left', width: getColumnWidth('status', columnsWidth), renderer: (rowIndex) => { const { status } = filteredData[rowIndex] @@ -90,6 +94,7 @@ export const getColumns = ({ { id: 'type', name: 'column.type', + className: 'align-left', width: getColumnWidth('type', columnsWidth), renderer: (rowIndex) => { const { type } = filteredData[rowIndex] @@ -122,6 +127,7 @@ export const getColumns = ({ { id: 'period', name: 'column.period', + className: 'align-left', width: getColumnWidth('period', columnsWidth), renderer: (rowIndex) => { const period = `${filteredData[rowIndex].period} ${t('column.days')}` @@ -141,6 +147,7 @@ export const getColumns = ({ }, { id: 'mtsOpening', + className: 'align-left', nameStr: `${t('column.opened')} (${timeOffset})`, width: getColumnWidth('mtsOpening', columnsWidth), renderer: (rowIndex) => { @@ -155,6 +162,7 @@ export const getColumns = ({ }, { id: 'mtsLastPayout', + className: 'align-left', nameStr: `${t('column.lastpayout')} (${timeOffset})`, width: getColumnWidth('mtsLastPayout', columnsWidth), renderer: (rowIndex) => { @@ -170,6 +178,7 @@ export const getColumns = ({ { id: 'positionPair', name: 'column.positionpair', + className: 'align-left', width: getColumnWidth('positionPair', columnsWidth), renderer: (rowIndex) => { const { positionPair } = filteredData[rowIndex] @@ -183,6 +192,7 @@ export const getColumns = ({ }, { id: 'mtsUpdate', + className: 'align-left', nameStr: `${t('column.date')} (${timeOffset})`, width: getColumnWidth('mtsUpdate', columnsWidth), renderer: (rowIndex) => { diff --git a/src/components/FundingLoanHistory/FundingLoanHistory.columns.js b/src/components/FundingLoanHistory/FundingLoanHistory.columns.js index 06e7ed7fd..9d846048c 100644 --- a/src/components/FundingLoanHistory/FundingLoanHistory.columns.js +++ b/src/components/FundingLoanHistory/FundingLoanHistory.columns.js @@ -15,6 +15,7 @@ export const getColumns = ({ { id: 'id', name: 'column.id', + className: 'align-left', width: getColumnWidth('id', columnsWidth), renderer: (rowIndex) => { const { id } = filteredData[rowIndex] @@ -29,6 +30,7 @@ export const getColumns = ({ { id: 'symbol', name: 'column.currency', + className: 'align-left', width: getColumnWidth('symbol', columnsWidth), renderer: (rowIndex) => { const { symbol } = filteredData[rowIndex] @@ -43,6 +45,7 @@ export const getColumns = ({ { id: 'side', name: 'column.side', + className: 'align-left', width: getColumnWidth('side', columnsWidth), renderer: (rowIndex) => { const { side } = filteredData[rowIndex] @@ -76,6 +79,7 @@ export const getColumns = ({ { id: 'status', name: 'column.status', + className: 'align-left', width: getColumnWidth('status', columnsWidth), renderer: (rowIndex) => { const { status } = filteredData[rowIndex] @@ -90,6 +94,7 @@ export const getColumns = ({ { id: 'type', name: 'column.type', + className: 'align-left', width: getColumnWidth('type', columnsWidth), renderer: (rowIndex) => { const { type } = filteredData[rowIndex] @@ -123,6 +128,7 @@ export const getColumns = ({ { id: 'period', name: 'column.period', + className: 'align-left', width: getColumnWidth('period', columnsWidth), renderer: (rowIndex) => { const period = `${filteredData[rowIndex].period} ${t('column.days')}` @@ -139,6 +145,7 @@ export const getColumns = ({ }, { id: 'mtsOpening', + className: 'align-left', nameStr: `${t('column.opened')} (${timeOffset})`, width: getColumnWidth('mtsOpening', columnsWidth), renderer: (rowIndex) => { @@ -153,6 +160,7 @@ export const getColumns = ({ }, { id: 'mtsLastPayout', + className: 'align-left', nameStr: `${t('column.closed')} (${timeOffset})`, width: getColumnWidth('mtsLastPayout', columnsWidth), renderer: (rowIndex) => { @@ -167,6 +175,7 @@ export const getColumns = ({ }, { id: 'mtsUpdate', + className: 'align-left', nameStr: `${t('column.date')} (${timeOffset})`, width: getColumnWidth('mtsUpdate', columnsWidth), renderer: (rowIndex) => { diff --git a/src/components/FundingOfferHistory/FundingOfferHistory.columns.js b/src/components/FundingOfferHistory/FundingOfferHistory.columns.js index 46ccbfaee..67bf6b5e7 100644 --- a/src/components/FundingOfferHistory/FundingOfferHistory.columns.js +++ b/src/components/FundingOfferHistory/FundingOfferHistory.columns.js @@ -14,6 +14,7 @@ export const getColumns = ({ { id: 'id', name: 'column.id', + className: 'align-left', width: getColumnWidth('id', columnsWidth), renderer: (rowIndex) => { const { id } = filteredData[rowIndex] @@ -28,6 +29,7 @@ export const getColumns = ({ { id: 'symbol', name: 'column.currency', + className: 'align-left', width: getColumnWidth('symbol', columnsWidth), renderer: (rowIndex) => { const { symbol } = filteredData[rowIndex] @@ -79,6 +81,7 @@ export const getColumns = ({ { id: 'type', name: 'column.type', + className: 'align-left', width: getColumnWidth('type', columnsWidth), renderer: (rowIndex) => { const { type } = filteredData[rowIndex] @@ -93,6 +96,7 @@ export const getColumns = ({ { id: 'status', name: 'column.status', + className: 'align-left', width: getColumnWidth('status', columnsWidth), renderer: (rowIndex) => { const { status } = filteredData[rowIndex] @@ -126,6 +130,7 @@ export const getColumns = ({ { id: 'period', name: 'column.period', + className: 'align-left', width: getColumnWidth('period', columnsWidth), renderer: (rowIndex) => { const period = `${filteredData[rowIndex].period} ${t('column.days')}` @@ -145,6 +150,7 @@ export const getColumns = ({ }, { id: 'mtsUpdate', + className: 'align-left', nameStr: `${t('column.date')} (${timeOffset})`, width: getColumnWidth('mtsUpdate', columnsWidth), renderer: (rowIndex) => { From 76380af1144a82d152941ab0e7b9ddd9bd8a4dfe Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 27 Jun 2023 14:21:18 +0300 Subject: [PATCH 024/115] Improve derivatives and invoices cols configs --- src/components/Derivatives/Derivatives.columns.js | 2 ++ src/components/Invoices/Invoices.columns.js | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/components/Derivatives/Derivatives.columns.js b/src/components/Derivatives/Derivatives.columns.js index dc6fe78f4..9fc93d4f3 100644 --- a/src/components/Derivatives/Derivatives.columns.js +++ b/src/components/Derivatives/Derivatives.columns.js @@ -14,6 +14,7 @@ export const getColumns = ({ { id: 'pair', name: 'column.pair', + className: 'align-left', width: getColumnWidth('pair', columnsWidth), renderer: (rowIndex) => { const { pair } = filteredData[rowIndex] @@ -120,6 +121,7 @@ export const getColumns = ({ }, { id: 'timestamp', + className: 'align-left', nameStr: `${t('column.updated')} (${timeOffset})`, width: getColumnWidth('timestamp', columnsWidth), renderer: (rowIndex) => { diff --git a/src/components/Invoices/Invoices.columns.js b/src/components/Invoices/Invoices.columns.js index 6e2c973f2..2ecb98f5b 100644 --- a/src/components/Invoices/Invoices.columns.js +++ b/src/components/Invoices/Invoices.columns.js @@ -15,6 +15,7 @@ export const getColumns = ({ { id: 'id', name: 'column.id', + className: 'align-left', width: getColumnWidth('id', columnsWidth), renderer: (rowIndex) => { const { id } = filteredData[rowIndex] @@ -48,6 +49,7 @@ export const getColumns = ({ { id: 'currency', name: 'column.currency', + className: 'align-left', width: getColumnWidth('currency', columnsWidth), renderer: (rowIndex) => { const { currency } = filteredData[rowIndex] @@ -62,6 +64,7 @@ export const getColumns = ({ { id: 'orderId', name: 'column.orderid', + className: 'align-left', width: getColumnWidth('orderId', columnsWidth), renderer: (rowIndex) => { const { orderId } = filteredData[rowIndex] @@ -93,6 +96,7 @@ export const getColumns = ({ { id: 'status', name: 'column.status', + className: 'align-left', width: getColumnWidth('status', columnsWidth), renderer: (rowIndex) => { const { status } = filteredData[rowIndex] @@ -107,6 +111,7 @@ export const getColumns = ({ { id: 'customerInfo', name: 'column.customerInfo', + className: 'align-left', width: getColumnWidth('customerInfo', columnsWidth), renderer: (rowIndex) => { const { customerInfo } = filteredData[rowIndex] @@ -124,6 +129,7 @@ export const getColumns = ({ { id: 'invoices', name: 'column.invoices', + className: 'align-left', width: getColumnWidth('invoices', columnsWidth), renderer: (rowIndex) => { const { invoices } = filteredData[rowIndex] @@ -141,6 +147,7 @@ export const getColumns = ({ { id: 'payment', name: 'column.payment', + className: 'align-left', width: getColumnWidth('payment', columnsWidth), renderer: (rowIndex) => { const { payment } = filteredData[rowIndex] @@ -158,6 +165,7 @@ export const getColumns = ({ { id: 'duration', name: 'column.duration', + className: 'align-left', width: getColumnWidth('duration', columnsWidth), renderer: (rowIndex) => { const { duration } = filteredData[rowIndex] @@ -172,6 +180,7 @@ export const getColumns = ({ { id: 'merchantName', name: 'column.merchantName', + className: 'align-left', width: getColumnWidth('merchantName', columnsWidth), renderer: (rowIndex) => { const { merchantName } = filteredData[rowIndex] @@ -186,6 +195,7 @@ export const getColumns = ({ { id: 'redirectUrl', name: 'column.redirectUrl', + className: 'align-left', width: getColumnWidth('redirectUrl', columnsWidth), renderer: (rowIndex) => { const { redirectUrl } = filteredData[rowIndex] @@ -207,6 +217,7 @@ export const getColumns = ({ }, { id: 'mts', + className: 'align-left', nameStr: `${t('column.date')} (${timeOffset})`, width: getColumnWidth('mts', columnsWidth), renderer: (rowIndex) => { @@ -222,6 +233,7 @@ export const getColumns = ({ { id: 'webhook', name: 'column.webhook', + className: 'align-left', width: getColumnWidth('webhook', columnsWidth), renderer: (rowIndex) => { const { webhook } = filteredData[rowIndex] From 8739483466e4cf6f9f8e50e65be3c8ab78495873 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 27 Jun 2023 14:22:38 +0300 Subject: [PATCH 025/115] Update logins config --- src/components/Logins/Logins.columns.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/components/Logins/Logins.columns.js b/src/components/Logins/Logins.columns.js index f96d2d6e9..74a783102 100644 --- a/src/components/Logins/Logins.columns.js +++ b/src/components/Logins/Logins.columns.js @@ -14,6 +14,7 @@ export const getColumns = ({ { id: 'id', name: 'column.id', + className: 'align-left', width: getColumnWidth('id', columnsWidth), renderer: (rowIndex) => { const { id } = filteredData[rowIndex] @@ -27,6 +28,7 @@ export const getColumns = ({ }, { id: 'time', + className: 'align-left', nameStr: `${t('column.date')} (${timeOffset})`, width: getColumnWidth('time', columnsWidth), renderer: (rowIndex) => { @@ -42,6 +44,7 @@ export const getColumns = ({ { id: 'ip', name: 'column.ip', + className: 'align-left', width: getColumnWidth('ip', columnsWidth), renderer: (rowIndex) => { const { ip } = filteredData[rowIndex] @@ -56,6 +59,7 @@ export const getColumns = ({ { id: 'browser', name: 'column.browser', + className: 'align-left', width: getColumnWidth('browser', columnsWidth), renderer: (rowIndex) => { const { browser } = filteredData[rowIndex] @@ -70,6 +74,7 @@ export const getColumns = ({ { id: 'version', name: 'column.version', + className: 'align-left', width: getColumnWidth('version', columnsWidth), renderer: (rowIndex) => { const { version } = filteredData[rowIndex] @@ -84,6 +89,7 @@ export const getColumns = ({ { id: 'mobile', name: 'column.mobile', + className: 'align-left', width: getColumnWidth('mobile', columnsWidth), renderer: (rowIndex) => { const { mobile } = filteredData[rowIndex] @@ -98,6 +104,7 @@ export const getColumns = ({ { id: 'extra', name: 'column.meta', + className: 'align-left', width: getColumnWidth('extra', columnsWidth), renderer: (rowIndex) => { const { extra } = filteredData[rowIndex] From 2a76a4398dbbdcd17952633a64a5b6fbe0dcf41d Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 27 Jun 2023 14:28:33 +0300 Subject: [PATCH 026/115] Improve market history sections data representation --- src/components/Movements/Movements.columns.js | 7 +++++++ src/components/PublicFunding/PublicFunding.columns.js | 4 ++++ src/components/PublicTrades/PublicTrades.columns.js | 4 ++++ src/components/Tickers/Tickers.columns.js | 2 ++ 4 files changed, 17 insertions(+) diff --git a/src/components/Movements/Movements.columns.js b/src/components/Movements/Movements.columns.js index eae793ae3..5ba60c8b2 100644 --- a/src/components/Movements/Movements.columns.js +++ b/src/components/Movements/Movements.columns.js @@ -16,6 +16,7 @@ const getColumns = ({ { id: 'id', name: 'column.id', + className: 'align-left', width: getColumnWidth('id', columnsWidth), renderer: (rowIndex) => { const { id } = filteredData[rowIndex] @@ -29,6 +30,7 @@ const getColumns = ({ }, { id: 'mtsUpdated', + className: 'align-left', nameStr: `${t('column.date')} (${timeOffset})`, width: getColumnWidth('mtsUpdated', columnsWidth), renderer: (rowIndex) => { @@ -44,6 +46,7 @@ const getColumns = ({ { id: 'currency', name: 'column.currency', + className: 'align-left', width: getColumnWidth('currency', columnsWidth), renderer: (rowIndex) => { const { currency } = filteredData[rowIndex] @@ -58,6 +61,7 @@ const getColumns = ({ { id: 'status', name: 'column.status', + className: 'align-left', width: getColumnWidth('status', columnsWidth), renderer: (rowIndex) => { const { status } = filteredData[rowIndex] @@ -137,6 +141,7 @@ const getColumns = ({ { id: 'destinationAddress', name: 'column.destination', + className: 'align-left', width: getColumnWidth('destinationAddress', columnsWidth), renderer: (rowIndex) => { const { currency, destinationAddress } = filteredData[rowIndex] @@ -155,6 +160,7 @@ const getColumns = ({ { id: 'transactionId', name: 'column.transactionId', + className: 'align-left', width: getColumnWidth('transactionId', columnsWidth), renderer: (rowIndex) => { const { transactionId } = filteredData[rowIndex] @@ -169,6 +175,7 @@ const getColumns = ({ { id: 'note', name: 'column.note', + className: 'align-left', width: getColumnWidth('note', columnsWidth), renderer: (rowIndex) => { const { note } = filteredData[rowIndex] diff --git a/src/components/PublicFunding/PublicFunding.columns.js b/src/components/PublicFunding/PublicFunding.columns.js index ef22d5b50..54e77614f 100644 --- a/src/components/PublicFunding/PublicFunding.columns.js +++ b/src/components/PublicFunding/PublicFunding.columns.js @@ -18,6 +18,7 @@ export default function getColumns(props) { { id: 'id', name: 'column.id', + className: 'align-left', width: getColumnWidth('id', columnsWidth), renderer: (rowIndex) => { const { id } = filteredData[rowIndex] @@ -31,6 +32,7 @@ export default function getColumns(props) { }, { id: 'mts', + className: 'align-left', nameStr: `${t('column.time')} (${timeOffset})`, width: getColumnWidth('mts', columnsWidth), renderer: (rowIndex) => { @@ -83,6 +85,7 @@ export default function getColumns(props) { { id: 'period', name: 'column.period', + className: 'align-left', width: getColumnWidth('period', columnsWidth), renderer: (rowIndex) => { const period = `${filteredData[rowIndex].period} ${t('column.days')}` @@ -103,6 +106,7 @@ export default function getColumns(props) { { id: 'currency', name: 'column.currency', + className: 'align-left', width: getColumnWidth('currency', columnsWidth), renderer: () => ( diff --git a/src/components/PublicTrades/PublicTrades.columns.js b/src/components/PublicTrades/PublicTrades.columns.js index da5acc76a..a65e1ceef 100644 --- a/src/components/PublicTrades/PublicTrades.columns.js +++ b/src/components/PublicTrades/PublicTrades.columns.js @@ -19,6 +19,7 @@ export default function getColumns(props) { { id: 'id', name: 'column.id', + className: 'align-left', width: getColumnWidth('id', columnsWidth), renderer: (rowIndex) => { const { id } = filteredData[rowIndex] @@ -32,6 +33,7 @@ export default function getColumns(props) { }, { id: 'mts', + className: 'align-left', nameStr: `${t('column.time')} (${timeOffset})`, width: getColumnWidth('mts', columnsWidth), renderer: (rowIndex) => { @@ -47,6 +49,7 @@ export default function getColumns(props) { { id: 'type', name: 'column.type', + className: 'align-left', width: getColumnWidth('type', columnsWidth), renderer: (rowIndex) => { const { type, amount } = filteredData[rowIndex] @@ -105,6 +108,7 @@ export default function getColumns(props) { { id: 'pair', name: 'column.pair', + className: 'align-left', width: getColumnWidth('pair', columnsWidth), renderer: () => { const formattedCurrentPair = formatPair(targetPair) diff --git a/src/components/Tickers/Tickers.columns.js b/src/components/Tickers/Tickers.columns.js index 503693b67..7aad951be 100644 --- a/src/components/Tickers/Tickers.columns.js +++ b/src/components/Tickers/Tickers.columns.js @@ -17,6 +17,7 @@ export default function getColumns(props) { { id: 'symbol', name: 'column.pair', + className: 'align-left', width: getColumnWidth('symbol', columnsWidth), renderer: (rowIndex) => { const { pair } = filteredData[rowIndex] @@ -68,6 +69,7 @@ export default function getColumns(props) { }, { id: 'mtsUpdate', + className: 'align-left', nameStr: `${t('column.time')} (${timeOffset})`, width: getColumnWidth('mtsUpdate', columnsWidth), renderer: (rowIndex) => { From a42162daa36e099e6844a0628a0d52274ae720d4 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Thu, 29 Jun 2023 13:21:32 +0300 Subject: [PATCH 027/115] Implement getTooltipContent helper --- src/components/Ledgers/Ledgers.columns.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/Ledgers/Ledgers.columns.js b/src/components/Ledgers/Ledgers.columns.js index cfbdc487e..7b2c110ac 100644 --- a/src/components/Ledgers/Ledgers.columns.js +++ b/src/components/Ledgers/Ledgers.columns.js @@ -6,6 +6,11 @@ import queryConstants from 'state/query/constants' import config from 'config' import { getColumnWidth } from 'utils/columns' +const getTooltipContent = value => ( + `${value} +Cmd/Ctrl + click to deselect` +) + export default function getColumns(props) { const { columnsWidth, @@ -25,7 +30,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const { id } = filteredData[rowIndex] return ( - + {id} ) @@ -90,7 +95,7 @@ export default function getColumns(props) { width: getColumnWidth('amountUsd', columnsWidth), renderer: (rowIndex) => { const { amountUsd } = filteredData[rowIndex] - const tooltip = `${fixedFloat(amountUsd)} ${t('column.usd')}` + const tooltip = getTooltipContent(`${fixedFloat(amountUsd)} ${t('column.usd')}`) return ( Date: Thu, 29 Jun 2023 13:26:53 +0300 Subject: [PATCH 028/115] Add deselection hint key/description --- public/locales/en/translations.json | 1 + 1 file changed, 1 insertion(+) diff --git a/public/locales/en/translations.json b/public/locales/en/translations.json index 4b69c4ef1..beb3c3c3e 100644 --- a/public/locales/en/translations.json +++ b/public/locales/en/translations.json @@ -148,6 +148,7 @@ "customerInfo": "Customer Info", "date": "Date", "days": "Days", + "deselectionHint": "Cmd/Ctrl + click to deselect", "description": "Description", "destination": "Destination", "duration": "Duration", From 13ce9a738c3e60615d138ce30773d27f03300c52 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Thu, 29 Jun 2023 13:49:06 +0300 Subject: [PATCH 029/115] Improve get content helper --- src/components/Ledgers/Ledgers.columns.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Ledgers/Ledgers.columns.js b/src/components/Ledgers/Ledgers.columns.js index 7b2c110ac..61ccb6f05 100644 --- a/src/components/Ledgers/Ledgers.columns.js +++ b/src/components/Ledgers/Ledgers.columns.js @@ -6,10 +6,10 @@ import queryConstants from 'state/query/constants' import config from 'config' import { getColumnWidth } from 'utils/columns' -const getTooltipContent = value => ( - `${value} -Cmd/Ctrl + click to deselect` -) +const getTooltipContent = (value, t) => { + if (t) return `${value}\n${t('column.deselectionHint')}` + return `${value}` +} export default function getColumns(props) { const { From a5ed1ff0d534749dfbe7dc5f5194853cfc57e3e2 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Thu, 29 Jun 2023 13:55:21 +0300 Subject: [PATCH 030/115] Update columns utilities --- src/utils/columns.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/utils/columns.js b/src/utils/columns.js index e2ed5ecf7..56c558334 100644 --- a/src/utils/columns.js +++ b/src/utils/columns.js @@ -538,6 +538,11 @@ export const formatSumUpValue = value => { return parseFloat(value).toFixed(8).replace(/\d(?=(\d{3})+\.)/g, '$&,') } +export const getTooltipContent = (value, t) => { + if (t) return `${value}\n${t('column.deselectionHint')}` + return `${value}` +} + export default { COLUMN_WIDTHS, pickColumnsWidth, @@ -548,4 +553,5 @@ export default { singleColumnSelectedCheck, columnHasNumericValueCheck, formatSumUpValue, + getTooltipContent, } From 15f9711fbd93808894657bf3ad4b9a6d132c4efd Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Thu, 29 Jun 2023 14:02:01 +0300 Subject: [PATCH 031/115] Update ledgers cells tooltips --- src/components/Ledgers/Ledgers.columns.js | 24 ++++++++++------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/src/components/Ledgers/Ledgers.columns.js b/src/components/Ledgers/Ledgers.columns.js index 61ccb6f05..380348cc3 100644 --- a/src/components/Ledgers/Ledgers.columns.js +++ b/src/components/Ledgers/Ledgers.columns.js @@ -4,12 +4,8 @@ import { Cell } from '@blueprintjs/table' import { insertIf, fixedFloat, formatAmount } from 'ui/utils' import queryConstants from 'state/query/constants' import config from 'config' -import { getColumnWidth } from 'utils/columns' +import { getColumnWidth, getTooltipContent } from 'utils/columns' -const getTooltipContent = (value, t) => { - if (t) return `${value}\n${t('column.deselectionHint')}` - return `${value}` -} export default function getColumns(props) { const { @@ -30,7 +26,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const { id } = filteredData[rowIndex] return ( - + {id} ) @@ -46,7 +42,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const { description } = filteredData[rowIndex] return ( - + {description} ) @@ -62,7 +58,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const { currency } = filteredData[rowIndex] return ( - + {currency} ) @@ -75,7 +71,7 @@ export default function getColumns(props) { width: getColumnWidth('amount', columnsWidth), renderer: (rowIndex) => { const { amount, currency } = filteredData[rowIndex] - const tooltip = `${fixedFloat(amount)} ${currency}` + const tooltip = getTooltipContent(`${fixedFloat(amount)} ${currency}`, t) return ( { const { amountUsd } = filteredData[rowIndex] - const tooltip = getTooltipContent(`${fixedFloat(amountUsd)} ${t('column.usd')}`) + const tooltip = getTooltipContent(`${fixedFloat(amountUsd)} ${t('column.usd')}`, t) return ( { const { balance, currency } = filteredData[rowIndex] const fixedBalance = fixedFloat(balance) - const tooltip = `${fixedBalance} ${currency}` + const tooltip = getTooltipContent(`${fixedBalance} ${currency}`, t) return ( { const { balanceUsd } = filteredData[rowIndex] const fixedBalanceUsd = fixedFloat(balanceUsd) - const tooltip = `${fixedBalanceUsd} ${t('column.usd')}` + const tooltip = getTooltipContent(`${fixedBalanceUsd} ${t('column.usd')}`, t) return ( { const timestamp = getFullTime(filteredData[rowIndex].mts) return ( - + {timestamp} ) @@ -174,7 +170,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const { wallet } = filteredData[rowIndex] return ( - + {wallet} ) From c37b483030d9c781b65155d7d42cef373e219aaa Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Thu, 29 Jun 2023 16:02:42 +0300 Subject: [PATCH 032/115] Update account summary cells popups --- .../AccountSummary/AccountSummary.derivFees.js | 9 +++++---- .../AccountSummary/AccountSummary.feeTierVolume.js | 2 +- src/components/AccountSummary/AccountSummary.fees.js | 11 +++++++---- src/components/AccountSummary/AccountSummary.leo.js | 12 +++++++----- .../AccountSummary/AccountSummary.paidFees.js | 10 +++++----- .../AccountSummary/AccountSummary.volume.js | 10 +++++----- 6 files changed, 30 insertions(+), 24 deletions(-) diff --git a/src/components/AccountSummary/AccountSummary.derivFees.js b/src/components/AccountSummary/AccountSummary.derivFees.js index be9931c5a..52372d540 100644 --- a/src/components/AccountSummary/AccountSummary.derivFees.js +++ b/src/components/AccountSummary/AccountSummary.derivFees.js @@ -3,11 +3,12 @@ import PropTypes from 'prop-types' import { Cell } from '@blueprintjs/table' import DataTable from 'ui/DataTable' +import { getTooltipContent } from 'utils/columns' import { formatAmount, formatFraction } from 'ui/utils' const getColor = val => (val > 0 ? 'red' : 'green') -const getColumns = ({ makerFee, takerFee }) => { +const getColumns = ({ makerFee, takerFee, t }) => { const formattedMakerFee = `${formatFraction(makerFee * 100, { minDigits: 2 })}%` const formattedTakerFee = `${formatFraction(takerFee * 100, { minDigits: 2 })}%` @@ -17,7 +18,7 @@ const getColumns = ({ makerFee, takerFee }) => { name: makerFee > 0 ? 'column.maker_fees' : 'column.maker_rebate', width: 100, renderer: () => ( - + {formatAmount(makerFee * 100, { color: getColor(makerFee), minDigits: 2 })} % @@ -29,7 +30,7 @@ const getColumns = ({ makerFee, takerFee }) => { name: takerFee > 0 ? 'column.taker_fees' : 'column.taker_rebate', width: 100, renderer: () => ( - + {formatAmount(takerFee * 100, { color: getColor(takerFee), minDigits: 2 })} % @@ -45,7 +46,7 @@ const AccountSummaryDerivFees = ({ makerFee, takerFee, }) => { - const columns = getColumns({ makerFee, takerFee }) + const columns = getColumns({ makerFee, takerFee, t }) return (
diff --git a/src/components/AccountSummary/AccountSummary.feeTierVolume.js b/src/components/AccountSummary/AccountSummary.feeTierVolume.js index 2cc71061f..73fb248ac 100644 --- a/src/components/AccountSummary/AccountSummary.feeTierVolume.js +++ b/src/components/AccountSummary/AccountSummary.feeTierVolume.js @@ -10,7 +10,7 @@ const AccountSummaryFeeTierVolume = ({ data, t }) => { const lastVolumeItem = _get(data, [data.length - 1], {}) const { curr, vol_safe: amount } = lastVolumeItem - const columns = getColumns({ data: [{ curr, amount }] }) + const columns = getColumns({ data: [{ curr, amount }], t }) return (
diff --git a/src/components/AccountSummary/AccountSummary.fees.js b/src/components/AccountSummary/AccountSummary.fees.js index 2b010daf6..f5e2f8f15 100644 --- a/src/components/AccountSummary/AccountSummary.fees.js +++ b/src/components/AccountSummary/AccountSummary.fees.js @@ -3,11 +3,13 @@ import PropTypes from 'prop-types' import { Cell } from '@blueprintjs/table' import DataTable from 'ui/DataTable' +import { getTooltipContent } from 'utils/columns' import { formatAmount, formatFraction } from 'ui/utils' const getColor = val => (val > 0 ? 'red' : 'green') const getColumns = ({ + t, makerFee, takerFeeToFiat, takerFeeToStable, @@ -24,7 +26,7 @@ const getColumns = ({ name: makerFee > 0 ? 'column.maker_fees' : 'column.maker_rebate', width: 100, renderer: () => ( - + {formatAmount(makerFee * 100, { color: getColor(makerFee), minDigits: 2 })} % @@ -36,7 +38,7 @@ const getColumns = ({ name: takerFeeToCrypto > 0 ? 'column.taker_fees_crypto' : 'column.taker_rebate_crypto', width: 140, renderer: () => ( - + {formatAmount(takerFeeToCrypto * 100, { color: getColor(takerFeeToCrypto), minDigits: 2 })} % @@ -48,7 +50,7 @@ const getColumns = ({ name: takerFeeToFiat > 0 ? 'column.taker_fees_fiat' : 'column.taker_rebate_fiat', width: 140, renderer: () => ( - + {formatAmount(takerFeeToFiat * 100, { color: getColor(takerFeeToFiat), minDigits: 2 })} % @@ -60,7 +62,7 @@ const getColumns = ({ name: takerFeeToStable > 0 ? 'column.taker_fees_stable' : 'column.taker_rebate_stable', width: 140, renderer: () => ( - + {formatAmount(takerFeeToStable * 100, { color: getColor(takerFeeToStable), minDigits: 2 })} % @@ -87,6 +89,7 @@ const AccountSummaryFees = ({ } = data const columns = getColumns({ + t, makerFee: makerFee || makerRebate || 0, takerFeeToCrypto: takerFeeToCrypto || takerRebateToCrypto || 0, takerFeeToFiat: takerFeeToFiat || takerRebateToFiat || 0, diff --git a/src/components/AccountSummary/AccountSummary.leo.js b/src/components/AccountSummary/AccountSummary.leo.js index 0a462981a..8f6de4f68 100644 --- a/src/components/AccountSummary/AccountSummary.leo.js +++ b/src/components/AccountSummary/AccountSummary.leo.js @@ -3,9 +3,10 @@ import PropTypes from 'prop-types' import { Cell } from '@blueprintjs/table' import DataTable from 'ui/DataTable' +import { getTooltipContent } from 'utils/columns' import { fixedFloat, formatAmount } from 'ui/utils' -const getColumns = ({ leoLev, leoAmountAvg }) => { +const getColumns = ({ leoLev, leoAmountAvg, t }) => { const formattedLeoAmountAvg = fixedFloat(leoAmountAvg) return [ @@ -14,7 +15,7 @@ const getColumns = ({ leoLev, leoAmountAvg }) => { name: 'accountsummary.leo_level', width: 100, renderer: () => ( - + {leoLev} ), @@ -25,7 +26,7 @@ const getColumns = ({ leoLev, leoAmountAvg }) => { name: 'accountsummary.average_amount', width: 120, renderer: () => ( - + {formatAmount(formattedLeoAmountAvg)} ), @@ -34,10 +35,10 @@ const getColumns = ({ leoLev, leoAmountAvg }) => { ] } -const AccountSummaryLeo = ({ data }) => { +const AccountSummaryLeo = ({ data, t }) => { const { leoLev, leoAmountAvg } = data - const columns = getColumns({ leoLev, leoAmountAvg }) + const columns = getColumns({ leoLev, leoAmountAvg, t }) return (
@@ -54,6 +55,7 @@ AccountSummaryLeo.propTypes = { leoLev: PropTypes.number.isRequired, leoAmountAvg: PropTypes.number.isRequired, }).isRequired, + t: PropTypes.func.isRequired, } export default memo(AccountSummaryLeo) diff --git a/src/components/AccountSummary/AccountSummary.paidFees.js b/src/components/AccountSummary/AccountSummary.paidFees.js index a7a679f30..5ae56cdf4 100644 --- a/src/components/AccountSummary/AccountSummary.paidFees.js +++ b/src/components/AccountSummary/AccountSummary.paidFees.js @@ -3,10 +3,10 @@ import PropTypes from 'prop-types' import { Cell } from '@blueprintjs/table' import DataTable from 'ui/DataTable' -import { COLUMN_WIDTHS } from 'utils/columns' import { fixedFloat, formatAmount } from 'ui/utils' +import { COLUMN_WIDTHS, getTooltipContent } from 'utils/columns' -export const getColumns = ({ data }) => [ +export const getColumns = ({ data, t }) => [ { id: 'currency', name: 'column.currency', @@ -17,7 +17,7 @@ export const getColumns = ({ data }) => [ renderer: (rowIndex) => { const { curr } = data[rowIndex] return ( - + {curr} ) @@ -34,7 +34,7 @@ export const getColumns = ({ data }) => [ return ( {formatAmount(amount, { digits: 2, @@ -63,7 +63,7 @@ const AccountSummaryPaidFees = ({ amount: total, }) - const columns = getColumns({ data: formattedData }) + const columns = getColumns({ data: formattedData, t }) return (
diff --git a/src/components/AccountSummary/AccountSummary.volume.js b/src/components/AccountSummary/AccountSummary.volume.js index b8b747c71..f565a9c0b 100644 --- a/src/components/AccountSummary/AccountSummary.volume.js +++ b/src/components/AccountSummary/AccountSummary.volume.js @@ -4,9 +4,9 @@ import { Cell } from '@blueprintjs/table' import DataTable from 'ui/DataTable' import { fixedFloat, formatAmount } from 'ui/utils' -import { COLUMN_WIDTHS } from 'utils/columns' +import { COLUMN_WIDTHS, getTooltipContent } from 'utils/columns' -const getColumns = ({ data }) => [ +const getColumns = ({ data, t }) => [ { id: 'currency', name: 'column.currency', @@ -15,7 +15,7 @@ const getColumns = ({ data }) => [ renderer: (rowIndex) => { const { curr } = data[rowIndex] return ( - + {curr} ) @@ -32,7 +32,7 @@ const getColumns = ({ data }) => [ return ( {formatAmount(vol, { digits: 2, @@ -51,7 +51,7 @@ const AccountSummaryVolume = ({ data, t }) => { return null } - const columns = getColumns({ data }) + const columns = getColumns({ data, t }) return (
From 14028c3b95ce7e1533d47aaa6b0515733452689b Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Thu, 6 Jul 2023 12:22:29 +0300 Subject: [PATCH 033/115] Fix tickers snapshot params providing --- src/components/Snapshots/TickersSnapshot/TickersSnapshot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Snapshots/TickersSnapshot/TickersSnapshot.js b/src/components/Snapshots/TickersSnapshot/TickersSnapshot.js index 293e09e85..ab6677399 100644 --- a/src/components/Snapshots/TickersSnapshot/TickersSnapshot.js +++ b/src/components/Snapshots/TickersSnapshot/TickersSnapshot.js @@ -17,7 +17,7 @@ class TickersSnapshot extends PureComponent { t, } = this.props - const positionsTickersColumns = getPositionsTickersColumns({ filteredData: positionsTickersEntries }) + const positionsTickersColumns = getPositionsTickersColumns({ filteredData: positionsTickersEntries, t }) const walletsTickersColumns = getWalletsTickersColumns({ filteredData: walletsTickersEntries, t }) return ( From f15366ffaea25fb2d293555a8487b940ee2dc120 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Thu, 6 Jul 2023 12:24:02 +0300 Subject: [PATCH 034/115] Actualize columns configuration fro several sections --- src/utils/columns.js | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/utils/columns.js b/src/utils/columns.js index 56c558334..11758e664 100644 --- a/src/utils/columns.js +++ b/src/utils/columns.js @@ -191,6 +191,11 @@ export const pickColumnsWidth = columns => _map(columns, export const getColumnWidth = (id, columns) => _head(_filter(columns, column => column.id === id))?.width ?? COLUMN_WIDTHS[id] +export const getTooltipContent = (value, t) => { + if (t) return `${value}\n${t('column.deselectionHint')}` + return `${value}` +} + export const getFrameworkPositionsColumns = (props) => { const { filteredData, @@ -214,7 +219,7 @@ export const getFrameworkPositionsColumns = (props) => { renderer: (rowIndex) => { const { id } = filteredData[rowIndex] return ( - + {id} ) @@ -229,7 +234,7 @@ export const getFrameworkPositionsColumns = (props) => { renderer: (rowIndex) => { const { pair } = filteredData[rowIndex] return ( - + {pair} ) @@ -245,7 +250,7 @@ export const getFrameworkPositionsColumns = (props) => { return ( {formatAmount(amount)} @@ -263,7 +268,7 @@ export const getFrameworkPositionsColumns = (props) => { return ( {fixedPrice} @@ -281,7 +286,7 @@ export const getFrameworkPositionsColumns = (props) => { return ( {fixedPrice} @@ -299,7 +304,7 @@ export const getFrameworkPositionsColumns = (props) => { return ( {fixedPrice} @@ -316,7 +321,7 @@ export const getFrameworkPositionsColumns = (props) => { return ( {formatAmount(pl)} @@ -333,7 +338,7 @@ export const getFrameworkPositionsColumns = (props) => { return ( {formatAmount(plUsd)} @@ -350,7 +355,7 @@ export const getFrameworkPositionsColumns = (props) => { return ( {formatAmount(plPerc)} @@ -368,7 +373,7 @@ export const getFrameworkPositionsColumns = (props) => { return ( {fixedSwap} @@ -384,7 +389,7 @@ export const getFrameworkPositionsColumns = (props) => { renderer: (rowIndex) => { const swapType = showType(filteredData[rowIndex].marginFundingType) return ( - + {swapType} ) @@ -399,7 +404,7 @@ export const getFrameworkPositionsColumns = (props) => { renderer: (rowIndex) => { const { status } = filteredData[rowIndex] return ( - + {status} ) @@ -414,7 +419,7 @@ export const getFrameworkPositionsColumns = (props) => { renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].mtsUpdate) return ( - + {timestamp} ) @@ -425,7 +430,7 @@ export const getFrameworkPositionsColumns = (props) => { } export const getPositionsTickersColumns = (props) => { - const { filteredData } = props + const { filteredData, t } = props return [ { @@ -436,7 +441,7 @@ export const getPositionsTickersColumns = (props) => { renderer: (rowIndex) => { const { pair } = filteredData[rowIndex] return ( - + {pair} ) @@ -452,7 +457,7 @@ export const getPositionsTickersColumns = (props) => { return ( {formatAmount(amount)} @@ -477,7 +482,7 @@ export const getWalletsTickersColumns = (props) => { const { walletType } = filteredData[rowIndex] const walletTypeText = t(`wallets.header.${walletType}`) return ( - + {walletTypeText} ) @@ -495,7 +500,7 @@ export const getWalletsTickersColumns = (props) => { renderer: (rowIndex) => { const { pair } = filteredData[rowIndex] return ( - + {pair} ) @@ -511,7 +516,7 @@ export const getWalletsTickersColumns = (props) => { return ( {formatAmount(amount)} @@ -538,11 +543,6 @@ export const formatSumUpValue = value => { return parseFloat(value).toFixed(8).replace(/\d(?=(\d{3})+\.)/g, '$&,') } -export const getTooltipContent = (value, t) => { - if (t) return `${value}\n${t('column.deselectionHint')}` - return `${value}` -} - export default { COLUMN_WIDTHS, pickColumnsWidth, From d9a89015226dbd4c3ea5c6613c62fbdb8aceb7e5 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Thu, 6 Jul 2023 14:12:09 +0300 Subject: [PATCH 035/115] Fix wallets data columns getters usage --- src/components/Wallets/Wallets.data.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Wallets/Wallets.data.js b/src/components/Wallets/Wallets.data.js index ba9ccb0e8..9502b7aea 100644 --- a/src/components/Wallets/Wallets.data.js +++ b/src/components/Wallets/Wallets.data.js @@ -22,10 +22,10 @@ const WalletsData = (props) => { const marginData = entries.filter(entry => entry.type === WALLET_MARGIN) const fundingData = entries.filter(entry => entry.type === WALLET_FUNDING) const contributionData = entries.filter(entry => entry.type === WALLET_CONTRIBUTION) - const exchangeColumns = getColumns({ filteredData: exchangeData }) - const marginColumns = getColumns({ filteredData: marginData }) - const fundingColumns = getColumns({ filteredData: fundingData }) - const contributionColumns = getColumns({ filteredData: contributionData }) + const exchangeColumns = getColumns({ filteredData: exchangeData, t }) + const marginColumns = getColumns({ filteredData: marginData, t }) + const fundingColumns = getColumns({ filteredData: fundingData, t }) + const contributionColumns = getColumns({ filteredData: contributionData, t }) return (
From 8ec20ae83a7628d9c4b64870485157d8a0c8992c Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Thu, 6 Jul 2023 14:12:42 +0300 Subject: [PATCH 036/115] Update wallets and wallets snapshots cols configurations --- .../Snapshots/WalletsSnapshot/Wallets.columns.js | 7 ++++--- src/components/Wallets/Wallets.columns.js | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/components/Snapshots/WalletsSnapshot/Wallets.columns.js b/src/components/Snapshots/WalletsSnapshot/Wallets.columns.js index cd7ec6577..2d6dc432f 100644 --- a/src/components/Snapshots/WalletsSnapshot/Wallets.columns.js +++ b/src/components/Snapshots/WalletsSnapshot/Wallets.columns.js @@ -2,6 +2,7 @@ import React from 'react' import { Cell } from '@blueprintjs/table' import { fixedFloat } from 'ui/utils' +import { getTooltipContent } from 'utils/columns' export default function getColumns(props) { const { filteredData, t } = props @@ -15,7 +16,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const { currency } = filteredData[rowIndex] return ( - + {currency} ) @@ -32,7 +33,7 @@ export default function getColumns(props) { return ( {fixedBalance} @@ -50,7 +51,7 @@ export default function getColumns(props) { return ( {fixedBalanceUsd} diff --git a/src/components/Wallets/Wallets.columns.js b/src/components/Wallets/Wallets.columns.js index 747aa396b..5fb3263f2 100644 --- a/src/components/Wallets/Wallets.columns.js +++ b/src/components/Wallets/Wallets.columns.js @@ -2,11 +2,11 @@ import React from 'react' import { Cell } from '@blueprintjs/table' import { insertIf, fixedFloat } from 'ui/utils' -import { COLUMN_WIDTHS } from 'utils/columns' +import { COLUMN_WIDTHS, getTooltipContent } from 'utils/columns' import config from 'config' export default function getColumns(props) { - const { filteredData } = props + const { filteredData, t } = props return [ { @@ -17,7 +17,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const { currency } = filteredData[rowIndex] return ( - + {currency} ) @@ -34,7 +34,7 @@ export default function getColumns(props) { return ( {fixedBalance} @@ -54,7 +54,7 @@ export default function getColumns(props) { return ( {fixedBalanceUsd} From 1c60d253748f2e4b25770c0011f306803d290a4b Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Thu, 6 Jul 2023 14:18:27 +0300 Subject: [PATCH 037/115] Update balances cells popups --- src/components/TaxReport/Result/Balances.columns.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/components/TaxReport/Result/Balances.columns.js b/src/components/TaxReport/Result/Balances.columns.js index be23dfcce..3cd64d65a 100644 --- a/src/components/TaxReport/Result/Balances.columns.js +++ b/src/components/TaxReport/Result/Balances.columns.js @@ -1,13 +1,15 @@ import React from 'react' import { Cell } from '@blueprintjs/table' +import { getTooltipContent } from 'utils/columns' import { fixedFloat, formatAmount } from 'ui/utils' export default function getColumns(props) { const { - walletsTotalBalanceUsd, - positionsTotalPlUsd, + t, totalResult, + positionsTotalPlUsd, + walletsTotalBalanceUsd, } = props return [ @@ -18,7 +20,7 @@ export default function getColumns(props) { renderer: () => ( {formatAmount(walletsTotalBalanceUsd)} @@ -32,7 +34,7 @@ export default function getColumns(props) { renderer: () => ( {formatAmount(positionsTotalPlUsd)} @@ -46,7 +48,7 @@ export default function getColumns(props) { renderer: () => ( {formatAmount(totalResult)} From 44bde78b8cba3c9dd7a4ad0185625771b55cf786 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Thu, 6 Jul 2023 14:19:01 +0300 Subject: [PATCH 038/115] Actualize getBalances method --- src/components/TaxReport/Result/Result.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/TaxReport/Result/Result.js b/src/components/TaxReport/Result/Result.js index 5d49006e2..91795ac25 100644 --- a/src/components/TaxReport/Result/Result.js +++ b/src/components/TaxReport/Result/Result.js @@ -57,6 +57,7 @@ class Result extends PureComponent { } getBalances = ({ balances, title }) => { + const { t } = this.props if (this.isBalancesEmpty(balances)) { return null } @@ -68,6 +69,7 @@ class Result extends PureComponent { } = balances const balancesColumns = getBalancesColumns({ + t, totalResult, positionsTotalPlUsd, walletsTotalBalanceUsd, From 4e607ab18d226f96462bcb8ad08e461f887bedcb Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Thu, 6 Jul 2023 14:23:40 +0300 Subject: [PATCH 039/115] Update trades cells tooltips --- src/components/Trades/Trades.columns.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/Trades/Trades.columns.js b/src/components/Trades/Trades.columns.js index a0caf4905..2e08d25cc 100644 --- a/src/components/Trades/Trades.columns.js +++ b/src/components/Trades/Trades.columns.js @@ -3,7 +3,7 @@ import { Cell } from '@blueprintjs/table' import { formatAmount, fixedFloat } from 'ui/utils' import { demapPairs, demapSymbols } from 'state/symbols/utils' -import { getColumnWidth } from 'utils/columns' +import { getColumnWidth, getTooltipContent } from 'utils/columns' const getFeePercent = (entry) => { const { @@ -48,7 +48,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const { id } = filteredData[rowIndex] return ( - + {id} ) @@ -63,7 +63,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const { orderID } = filteredData[rowIndex] return ( - + {orderID} ) @@ -78,7 +78,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const { pair } = filteredData[rowIndex] return ( - + {pair} ) @@ -94,7 +94,7 @@ export default function getColumns(props) { return ( {formatAmount(execAmount)} @@ -113,7 +113,7 @@ export default function getColumns(props) { return ( {fixedPrice} @@ -129,7 +129,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const { fee, feeCurrency } = filteredData[rowIndex] const fixedFee = fixedFloat(fee) - const tooltip = `${fixedFee} ${feeCurrency}` + const tooltip = getTooltipContent(`${fixedFee} ${feeCurrency}`, t) return ( {feePercent} @@ -173,7 +173,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].mtsCreate) return ( - + {timestamp} ) From 3ce71a91451293e85e5431b35b6661653778edd6 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Fri, 7 Jul 2023 11:19:55 +0300 Subject: [PATCH 040/115] Add deselecting hints to the orders cells --- src/components/Orders/Orders.columns.js | 28 ++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/components/Orders/Orders.columns.js b/src/components/Orders/Orders.columns.js index 4cbbde488..3f5360c6f 100644 --- a/src/components/Orders/Orders.columns.js +++ b/src/components/Orders/Orders.columns.js @@ -3,7 +3,7 @@ import { Cell } from '@blueprintjs/table' import JSONFormat from 'ui/JSONFormat' import { formatAmount, fixedFloat } from 'ui/utils' -import { getColumnWidth } from 'utils/columns' +import { getColumnWidth, getTooltipContent } from 'utils/columns' export const getColumns = ({ t, @@ -22,7 +22,7 @@ export const getColumns = ({ const { id, pair, amountExecuted } = filteredData[rowIndex] /* eslint-disable jsx-a11y/anchor-is-valid */ return ( - + <> {amountExecuted ? onIdClick(e, { id, pair })}>{id} @@ -42,7 +42,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { pair } = filteredData[rowIndex] return ( - + {pair} ) @@ -57,7 +57,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { type } = filteredData[rowIndex] return ( - + {type} ) @@ -74,7 +74,7 @@ export const getColumns = ({ return ( {fixedAmount} @@ -92,7 +92,7 @@ export const getColumns = ({ return ( {formatAmount(amountExecuted)} @@ -111,7 +111,7 @@ export const getColumns = ({ return ( {fixedPrice} @@ -130,7 +130,7 @@ export const getColumns = ({ return ( {fixedPrice} @@ -147,7 +147,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].mtsCreate) return ( - + {timestamp} ) @@ -162,7 +162,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].mtsUpdate) return ( - + {timestamp} ) @@ -177,7 +177,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { status } = filteredData[rowIndex] return ( - + {status} ) @@ -194,7 +194,7 @@ export const getColumns = ({ return ( {fixedPrice} @@ -211,7 +211,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { typePrev } = filteredData[rowIndex] return ( - + {typePrev} ) @@ -229,7 +229,7 @@ export const getColumns = ({ return ( - + {formattedMeta} From be208fca7dac7089cf9dc45c8bad2c5a0796051c Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Fri, 7 Jul 2023 11:26:04 +0300 Subject: [PATCH 041/115] Update positions sections cells tooltips --- src/components/Positions/Positions.columns.js | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/components/Positions/Positions.columns.js b/src/components/Positions/Positions.columns.js index ace0aca75..a56e9a738 100644 --- a/src/components/Positions/Positions.columns.js +++ b/src/components/Positions/Positions.columns.js @@ -6,7 +6,7 @@ import { Cell } from '@blueprintjs/table' import queryConstants from 'state/query/constants' import JSONFormat from 'ui/JSONFormat' import { formatAmount, fixedFloat } from 'ui/utils' -import { getColumnWidth } from 'utils/columns' +import { getColumnWidth, getTooltipContent } from 'utils/columns' const { MENU_POSITIONS_ACTIVE, MENU_POSITIONS_AUDIT } = queryConstants @@ -45,7 +45,7 @@ export default function getColumns(props) { return ( {fixedPrice} @@ -63,7 +63,7 @@ export default function getColumns(props) { return ( {formatAmount(pl)} @@ -81,7 +81,7 @@ export default function getColumns(props) { return ( {formatAmount(plPerc)} @@ -105,7 +105,7 @@ export default function getColumns(props) { return ( {fixedCollateral} @@ -146,7 +146,7 @@ export default function getColumns(props) { const { id } = filteredData[rowIndex] /* eslint-disable jsx-a11y/anchor-is-valid */ return ( - + <> {id} @@ -164,7 +164,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const { pair } = filteredData[rowIndex] return ( - + {pair} ) @@ -180,7 +180,7 @@ export default function getColumns(props) { return ( {formatAmount(amount)} @@ -199,7 +199,7 @@ export default function getColumns(props) { return ( {fixedPrice} @@ -219,7 +219,7 @@ export default function getColumns(props) { return ( {fixedSwap} @@ -236,7 +236,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const swapType = showType(filteredData[rowIndex]) return ( - + {swapType} ) @@ -251,7 +251,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const { status } = filteredData[rowIndex] return ( - + {status} ) @@ -266,7 +266,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].mtsUpdate) return ( - + {timestamp} ) From 6ee633f5d903e20680fd84f57830150027148276 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Fri, 7 Jul 2023 11:36:54 +0300 Subject: [PATCH 042/115] Improve funding bids/offers cols config --- .../FundingOfferHistory.columns.js | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/FundingOfferHistory/FundingOfferHistory.columns.js b/src/components/FundingOfferHistory/FundingOfferHistory.columns.js index 67bf6b5e7..044489f7d 100644 --- a/src/components/FundingOfferHistory/FundingOfferHistory.columns.js +++ b/src/components/FundingOfferHistory/FundingOfferHistory.columns.js @@ -1,8 +1,8 @@ import React from 'react' import { Cell } from '@blueprintjs/table' -import { getColumnWidth } from 'utils/columns' import { formatAmount, fixedFloat } from 'ui/utils' +import { getColumnWidth, getTooltipContent } from 'utils/columns' export const getColumns = ({ t, @@ -19,7 +19,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { id } = filteredData[rowIndex] return ( - + {id} ) @@ -34,7 +34,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { symbol } = filteredData[rowIndex] return ( - + {symbol} ) @@ -51,7 +51,7 @@ export const getColumns = ({ return ( {fixedAmount} @@ -69,7 +69,7 @@ export const getColumns = ({ return ( {formatAmount(amountExecuted)} @@ -86,7 +86,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { type } = filteredData[rowIndex] return ( - + {type} ) @@ -101,7 +101,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { status } = filteredData[rowIndex] return ( - + {status} ) @@ -118,7 +118,7 @@ export const getColumns = ({ return ( {fixedRate} @@ -137,7 +137,7 @@ export const getColumns = ({ return ( {period} @@ -156,7 +156,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].mtsUpdate) return ( - + {timestamp} ) From 15d0f80fd224fd8db6d49b450a7c47a8cebd743f Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Fri, 7 Jul 2023 11:41:15 +0300 Subject: [PATCH 043/115] Improve loan history cols configs --- .../FundingLoanHistory.columns.js | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/FundingLoanHistory/FundingLoanHistory.columns.js b/src/components/FundingLoanHistory/FundingLoanHistory.columns.js index 9d846048c..e2638a65f 100644 --- a/src/components/FundingLoanHistory/FundingLoanHistory.columns.js +++ b/src/components/FundingLoanHistory/FundingLoanHistory.columns.js @@ -3,7 +3,7 @@ import { Cell } from '@blueprintjs/table' import { getSideMsg, getSideColor } from 'state/utils' import { formatAmount, formatColor, fixedFloat } from 'ui/utils' -import { getColumnWidth } from 'utils/columns' +import { getColumnWidth, getTooltipContent } from 'utils/columns' export const getColumns = ({ t, @@ -20,7 +20,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { id } = filteredData[rowIndex] return ( - + {id} ) @@ -35,7 +35,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { symbol } = filteredData[rowIndex] return ( - + {symbol} ) @@ -51,7 +51,7 @@ export const getColumns = ({ const { side } = filteredData[rowIndex] const formattedSide = t(`floan.side.${getSideMsg(side)}`) return ( - + {formatColor(formattedSide, getSideColor(side))} ) @@ -67,7 +67,7 @@ export const getColumns = ({ return ( {formatAmount(amount)} @@ -84,7 +84,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { status } = filteredData[rowIndex] return ( - + {status} ) @@ -99,7 +99,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { type } = filteredData[rowIndex] return ( - + {type} ) @@ -116,7 +116,7 @@ export const getColumns = ({ return ( {fixedRate} @@ -135,7 +135,7 @@ export const getColumns = ({ return ( {period} @@ -151,7 +151,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].mtsOpening) return ( - + {timestamp} ) @@ -166,7 +166,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].mtsLastPayout) return ( - + {timestamp} ) @@ -181,7 +181,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].mtsUpdate) return ( - + {timestamp} ) From 82596c3e96d953295ca41146b40500baf41fcf45 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Fri, 7 Jul 2023 11:45:38 +0300 Subject: [PATCH 044/115] Improve funding credits cells popups content handling --- .../FundingCreditHistory.columns.js | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/components/FundingCreditHistory/FundingCreditHistory.columns.js b/src/components/FundingCreditHistory/FundingCreditHistory.columns.js index 74bf08404..b7a6fe6f3 100644 --- a/src/components/FundingCreditHistory/FundingCreditHistory.columns.js +++ b/src/components/FundingCreditHistory/FundingCreditHistory.columns.js @@ -1,9 +1,9 @@ import React from 'react' import { Cell } from '@blueprintjs/table' -import { getColumnWidth } from 'utils/columns' import { getSideMsg, getSideColor } from 'state/utils' import { formatAmount, formatColor, fixedFloat } from 'ui/utils' +import { getColumnWidth, getTooltipContent } from 'utils/columns' export const getColumns = ({ t, @@ -20,7 +20,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { id } = filteredData[rowIndex] return ( - + {id} ) @@ -35,7 +35,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { symbol } = filteredData[rowIndex] return ( - + {symbol} ) @@ -51,7 +51,7 @@ export const getColumns = ({ const { side } = filteredData[rowIndex] const formattedSide = t(`fcredit.side.${getSideMsg(side)}`) return ( - + {formatColor(formattedSide, getSideColor(side))} ) @@ -67,7 +67,7 @@ export const getColumns = ({ return ( {formatAmount(amount)} @@ -84,7 +84,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { status } = filteredData[rowIndex] return ( - + {status} ) @@ -99,7 +99,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { type } = filteredData[rowIndex] return ( - + {type} ) @@ -115,7 +115,7 @@ export const getColumns = ({ return ( {fixedFloat(rate)} @@ -134,7 +134,7 @@ export const getColumns = ({ return ( {period} @@ -153,7 +153,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].mtsOpening) return ( - + {timestamp} ) @@ -168,7 +168,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].mtsLastPayout) return ( - + {timestamp} ) @@ -183,7 +183,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { positionPair } = filteredData[rowIndex] return ( - + {positionPair} ) @@ -198,7 +198,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].mtsUpdate) return ( - + {timestamp} ) From 1c3a1735eb781b365946abb0c6dc22a9da5e43a6 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Fri, 7 Jul 2023 12:34:22 +0300 Subject: [PATCH 045/115] Update invoices columns getters configs --- src/components/Invoices/Invoices.columns.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/Invoices/Invoices.columns.js b/src/components/Invoices/Invoices.columns.js index 2ecb98f5b..c1600c3c1 100644 --- a/src/components/Invoices/Invoices.columns.js +++ b/src/components/Invoices/Invoices.columns.js @@ -2,8 +2,8 @@ import React from 'react' import { Cell } from '@blueprintjs/table' import JSONFormat from 'ui/JSONFormat' -import { getColumnWidth } from 'utils/columns' import { fixedFloat, formatAmount } from 'ui/utils' +import { getColumnWidth, getTooltipContent } from 'utils/columns' export const getColumns = ({ t, @@ -20,7 +20,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { id } = filteredData[rowIndex] return ( - + {id} ) @@ -37,7 +37,7 @@ export const getColumns = ({ return ( {formatAmount(amount)} @@ -54,7 +54,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { currency } = filteredData[rowIndex] return ( - + {currency} ) @@ -69,7 +69,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { orderId } = filteredData[rowIndex] return ( - + {orderId} ) @@ -101,7 +101,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { status } = filteredData[rowIndex] return ( - + {status} ) @@ -223,7 +223,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].mts) return ( - + {timestamp} ) From ffa2c7f53cbb42380ceffdd4b0045c1335f3b1e0 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Fri, 7 Jul 2023 12:39:50 +0300 Subject: [PATCH 046/115] Add deselecting hints to the public trades cells --- .../PublicTrades/PublicTrades.columns.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/PublicTrades/PublicTrades.columns.js b/src/components/PublicTrades/PublicTrades.columns.js index a65e1ceef..3a8af451e 100644 --- a/src/components/PublicTrades/PublicTrades.columns.js +++ b/src/components/PublicTrades/PublicTrades.columns.js @@ -3,7 +3,7 @@ import { Cell } from '@blueprintjs/table' import { formatAmount, fixedFloat, amountStyle } from 'ui/utils' import { formatPair } from 'state/symbols/utils' -import { getColumnWidth } from 'utils/columns' +import { getColumnWidth, getTooltipContent } from 'utils/columns' export default function getColumns(props) { const { @@ -24,7 +24,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const { id } = filteredData[rowIndex] return ( - + {id} ) @@ -39,7 +39,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].mts) return ( - + {timestamp} ) @@ -57,7 +57,7 @@ export default function getColumns(props) { return ( {type} @@ -77,7 +77,7 @@ export default function getColumns(props) { return ( {formatAmount(price, { color })} @@ -96,7 +96,7 @@ export default function getColumns(props) { return ( {formatAmount(amount)} @@ -113,7 +113,7 @@ export default function getColumns(props) { renderer: () => { const formattedCurrentPair = formatPair(targetPair) return ( - + {formattedCurrentPair} ) From 045d9a3622c2b8da3d724966ef7de83e9dd44e66 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Fri, 7 Jul 2023 12:43:37 +0300 Subject: [PATCH 047/115] Update public funding columns getters --- .../PublicFunding/PublicFunding.columns.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/PublicFunding/PublicFunding.columns.js b/src/components/PublicFunding/PublicFunding.columns.js index 54e77614f..69c08f763 100644 --- a/src/components/PublicFunding/PublicFunding.columns.js +++ b/src/components/PublicFunding/PublicFunding.columns.js @@ -2,7 +2,7 @@ import React from 'react' import { Cell } from '@blueprintjs/table' import { fixedFloat, formatAmount } from 'ui/utils' -import { getColumnWidth } from 'utils/columns' +import { getColumnWidth, getTooltipContent } from 'utils/columns' export default function getColumns(props) { const { @@ -23,7 +23,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const { id } = filteredData[rowIndex] return ( - + {id} ) @@ -38,7 +38,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].mts) return ( - + {timestamp} ) @@ -55,7 +55,7 @@ export default function getColumns(props) { return ( {formatAmount(amount)} @@ -73,7 +73,7 @@ export default function getColumns(props) { return ( {formatAmount(rate, { color: 'red' })} @@ -92,7 +92,7 @@ export default function getColumns(props) { return ( {period} @@ -109,7 +109,7 @@ export default function getColumns(props) { className: 'align-left', width: getColumnWidth('currency', columnsWidth), renderer: () => ( - + {targetSymbol} ), From eb4b0c60a33428958defe33750ea3249b90c8bd7 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Fri, 7 Jul 2023 12:48:02 +0300 Subject: [PATCH 048/115] Update tickers cells tooltips content handling --- src/components/Tickers/Tickers.columns.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/Tickers/Tickers.columns.js b/src/components/Tickers/Tickers.columns.js index 7aad951be..1e9415b58 100644 --- a/src/components/Tickers/Tickers.columns.js +++ b/src/components/Tickers/Tickers.columns.js @@ -2,7 +2,7 @@ import React from 'react' import { Cell } from '@blueprintjs/table' import { fixedFloat } from 'ui/utils' -import { getColumnWidth } from 'utils/columns' +import { getColumnWidth, getTooltipContent } from 'utils/columns' export default function getColumns(props) { const { @@ -22,7 +22,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const { pair } = filteredData[rowIndex] return ( - + {pair} ) @@ -39,7 +39,7 @@ export default function getColumns(props) { return ( {fixedBid} @@ -58,7 +58,7 @@ export default function getColumns(props) { return ( {fixedAsk} @@ -75,7 +75,7 @@ export default function getColumns(props) { renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].mtsUpdate) return ( - + {timestamp} ) From bf3de5afc982966cb2cf04cfd1bebc6a7a0b3d3c Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Fri, 7 Jul 2023 12:58:03 +0300 Subject: [PATCH 049/115] Actualize columns configuration for derivatives report --- .../Derivatives/Derivatives.columns.js | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/Derivatives/Derivatives.columns.js b/src/components/Derivatives/Derivatives.columns.js index 9fc93d4f3..f748f514b 100644 --- a/src/components/Derivatives/Derivatives.columns.js +++ b/src/components/Derivatives/Derivatives.columns.js @@ -2,7 +2,7 @@ import React from 'react' import { Cell } from '@blueprintjs/table' import { formatAmount, fixedFloat } from 'ui/utils' -import { getColumnWidth } from 'utils/columns' +import { getColumnWidth, getTooltipContent } from 'utils/columns' export const getColumns = ({ t, @@ -19,7 +19,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { pair } = filteredData[rowIndex] return ( - + {pair} ) @@ -36,7 +36,7 @@ export const getColumns = ({ return ( {fixedPrice} @@ -55,7 +55,7 @@ export const getColumns = ({ return ( {fixedPrice} @@ -74,7 +74,7 @@ export const getColumns = ({ return ( {fixedBalance} @@ -93,7 +93,7 @@ export const getColumns = ({ return ( {formatAmount(fundingAccrued)} @@ -111,7 +111,7 @@ export const getColumns = ({ return ( {fundingStep} @@ -127,7 +127,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].timestamp) return ( - + {timestamp} ) @@ -143,7 +143,7 @@ export const getColumns = ({ return ( {clampMin} @@ -160,7 +160,7 @@ export const getColumns = ({ return ( {clampMax} From 27ac7cc4fd9327f8800ab463ad9284c9fe7d551e Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Fri, 7 Jul 2023 13:01:46 +0300 Subject: [PATCH 050/115] Update logins columns config --- src/components/Logins/Logins.columns.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/Logins/Logins.columns.js b/src/components/Logins/Logins.columns.js index 74a783102..1f4e8a7cb 100644 --- a/src/components/Logins/Logins.columns.js +++ b/src/components/Logins/Logins.columns.js @@ -2,7 +2,7 @@ import React from 'react' import { Cell } from '@blueprintjs/table' import JSONFormat from 'ui/JSONFormat' -import { getColumnWidth } from 'utils/columns' +import { getColumnWidth, getTooltipContent } from 'utils/columns' export const getColumns = ({ t, @@ -19,7 +19,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { id } = filteredData[rowIndex] return ( - + {id} ) @@ -34,7 +34,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].time) return ( - + {timestamp} ) @@ -49,7 +49,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { ip } = filteredData[rowIndex] return ( - + {ip} ) @@ -64,7 +64,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { browser } = filteredData[rowIndex] return ( - + {browser} ) @@ -79,7 +79,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { version } = filteredData[rowIndex] return ( - + {version} ) @@ -94,7 +94,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { mobile } = filteredData[rowIndex] return ( - + {mobile} ) From 1b38976084a83de9dad47ab975765566e878a440 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Fri, 7 Jul 2023 13:04:39 +0300 Subject: [PATCH 051/115] Add cells deselecting hints to the change logs report --- src/components/ChangeLogs/ChangeLogs.columns.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/ChangeLogs/ChangeLogs.columns.js b/src/components/ChangeLogs/ChangeLogs.columns.js index 63c0657c3..e2decf220 100644 --- a/src/components/ChangeLogs/ChangeLogs.columns.js +++ b/src/components/ChangeLogs/ChangeLogs.columns.js @@ -2,7 +2,7 @@ import React from 'react' import { Cell } from '@blueprintjs/table' import JSONFormat from 'ui/JSONFormat' -import { getColumnWidth } from 'utils/columns' +import { getColumnWidth, getTooltipContent } from 'utils/columns' export const getColumns = ({ t, @@ -18,7 +18,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].mtsCreate) return ( - + {timestamp} ) @@ -32,7 +32,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { log } = filteredData[rowIndex] return ( - + {log} ) @@ -46,7 +46,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { ip } = filteredData[rowIndex] return ( - + {ip} ) From 16d498ff5684522d738ef51a00b5f904f78110f9 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Thu, 27 Jul 2023 12:18:47 +0300 Subject: [PATCH 052/115] Improve summary sub-sections aligning --- .../AccountSummary/AccountSummary.leo.js | 1 + .../AccountSummary/_AccountSummary.scss | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/components/AccountSummary/AccountSummary.leo.js b/src/components/AccountSummary/AccountSummary.leo.js index 8f6de4f68..ddc551fce 100644 --- a/src/components/AccountSummary/AccountSummary.leo.js +++ b/src/components/AccountSummary/AccountSummary.leo.js @@ -42,6 +42,7 @@ const AccountSummaryLeo = ({ data, t }) => { return (
+
Date: Thu, 27 Jul 2023 13:22:53 +0300 Subject: [PATCH 053/115] Actualize columns configuration for weighted averages --- .../WeightedAverages.columns.js | 23 ++++++++++--------- .../WeightedAverages/WeightedAverages.js | 1 + 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/components/WeightedAverages/WeightedAverages.columns.js b/src/components/WeightedAverages/WeightedAverages.columns.js index 8733df984..de979be30 100644 --- a/src/components/WeightedAverages/WeightedAverages.columns.js +++ b/src/components/WeightedAverages/WeightedAverages.columns.js @@ -1,10 +1,11 @@ import React from 'react' import { Cell } from '@blueprintjs/table' -import { getColumnWidth } from 'utils/columns' import { formatAmount, fixedFloat } from 'ui/utils' +import { getColumnWidth, getTooltipContent } from 'utils/columns' export const getColumns = ({ + t, getFullTime, filteredData, columnsWidth, @@ -17,7 +18,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const { pair } = filteredData[rowIndex] return ( - + {pair} ) @@ -34,7 +35,7 @@ export const getColumns = ({ return ( {fixedPrice} @@ -53,7 +54,7 @@ export const getColumns = ({ return ( {formatAmount(buyingAmount)} @@ -72,7 +73,7 @@ export const getColumns = ({ return ( {formatAmount(cost)} @@ -91,7 +92,7 @@ export const getColumns = ({ return ( {fixedPrice} @@ -110,7 +111,7 @@ export const getColumns = ({ return ( {formatAmount(sellingAmount)} @@ -129,7 +130,7 @@ export const getColumns = ({ return ( {formatAmount(sale)} @@ -148,7 +149,7 @@ export const getColumns = ({ return ( {formatAmount(cumulativeAmount)} @@ -164,7 +165,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].firstTradeMts) return ( - + {timestamp} ) @@ -178,7 +179,7 @@ export const getColumns = ({ renderer: (rowIndex) => { const timestamp = getFullTime(filteredData[rowIndex].lastTradeMts) return ( - + {timestamp} ) diff --git a/src/components/WeightedAverages/WeightedAverages.js b/src/components/WeightedAverages/WeightedAverages.js index 72637f124..e668d1ad2 100644 --- a/src/components/WeightedAverages/WeightedAverages.js +++ b/src/components/WeightedAverages/WeightedAverages.js @@ -99,6 +99,7 @@ class WeightedAverages extends PureComponent { const numRows = _size(entries) const tableColumns = getColumns({ + t, columnsWidth, getFullTime, filteredData: entries, From a4c1a3634a1d4fa0fb9c6a420f66fee5368c7d9d Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Thu, 27 Jul 2023 13:52:16 +0300 Subject: [PATCH 054/115] Fix toasts positioning on scroll --- src/components/Status/_Status.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/Status/_Status.scss b/src/components/Status/_Status.scss index 0e7f5640d..c582de533 100644 --- a/src/components/Status/_Status.scss +++ b/src/components/Status/_Status.scss @@ -1,3 +1,7 @@ +.bp3-toast-container { + position: fixed !important; +} + .bp3-toast { min-height: 40px; padding: 5px; From 5ad1d73e5d68191aed3aede5cb0557496a884f2d Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Mon, 7 Aug 2023 12:11:08 +0300 Subject: [PATCH 055/115] Add marginCurrencyList handling in the symbols reducer --- src/state/symbols/reducer.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/state/symbols/reducer.js b/src/state/symbols/reducer.js index c745a7765..767d23a25 100644 --- a/src/state/symbols/reducer.js +++ b/src/state/symbols/reducer.js @@ -20,6 +20,7 @@ const initialState = { inactivePairs: [], isFetched: false, pairs: [], // pair + marginCurrencyList: [], } export function symbolsReducer(state = initialState, action) { @@ -32,6 +33,7 @@ export function symbolsReducer(state = initialState, action) { inactiveSymbols = [], mapSymbols = [], pairs = [], + marginCurrencyList = [], } = payload const coins = [] @@ -106,6 +108,7 @@ export function symbolsReducer(state = initialState, action) { inactivePairs: formattedInactivePairs, isFetched: true, pairs: preparedPairs, + fundingCoins: marginCurrencyList, } } case authTypes.LOGOUT: From 3af7e19cf59996506f165ee8fc0e6178e2ebe286 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Mon, 7 Aug 2023 12:12:39 +0300 Subject: [PATCH 056/115] Fix initial state entries --- src/state/symbols/reducer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/state/symbols/reducer.js b/src/state/symbols/reducer.js index 767d23a25..0a0c29e86 100644 --- a/src/state/symbols/reducer.js +++ b/src/state/symbols/reducer.js @@ -20,7 +20,7 @@ const initialState = { inactivePairs: [], isFetched: false, pairs: [], // pair - marginCurrencyList: [], + fundingCoins: [], } export function symbolsReducer(state = initialState, action) { From 1f54e24128372b6c193e1d5bb75fc93f930506bd Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Mon, 7 Aug 2023 12:14:34 +0300 Subject: [PATCH 057/115] Implement getFundingCoins selector --- src/state/symbols/selectors.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/state/symbols/selectors.js b/src/state/symbols/selectors.js index 2666f7279..a1731e08b 100644 --- a/src/state/symbols/selectors.js +++ b/src/state/symbols/selectors.js @@ -7,6 +7,7 @@ export const getInactiveCurrencies = state => getSymbols(state).inactiveCurrenci export const getInactivePairs = state => getSymbols(state).inactivePairs export const getPairs = state => getSymbols(state).pairs export const getSymbolsFetchStatus = state => getSymbols(state).isFetched +export const getFundingCoins = state => getSymbols(state)?.fundingCoins ?? [] export default { getCoins, @@ -16,4 +17,5 @@ export default { getInactivePairs, getPairs, getSymbolsFetchStatus, + getFundingCoins, } From c40903921c5fb7802a062b7ec2ec96fb082689d5 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Mon, 7 Aug 2023 13:16:38 +0300 Subject: [PATCH 058/115] Filter out currencies not present in pairs --- src/state/symbols/reducer.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/state/symbols/reducer.js b/src/state/symbols/reducer.js index 0a0c29e86..dd7ca46c4 100644 --- a/src/state/symbols/reducer.js +++ b/src/state/symbols/reducer.js @@ -42,7 +42,10 @@ export function symbolsReducer(state = initialState, action) { const symbolMapping = {} currencies.forEach((currency) => { - const { id, explorer, name } = currency + const { + id, explorer, name, isInPair, + } = currency + if (!isInPair) return let { symbol } = currency if (symbol && id !== symbol) { From c09c1848943d054177d1a03bf40cfd0057331950 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Mon, 7 Aug 2023 13:20:48 +0300 Subject: [PATCH 059/115] [wip] Separate funding coins handling --- src/state/symbols/reducer.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/state/symbols/reducer.js b/src/state/symbols/reducer.js index dd7ca46c4..347f4fa39 100644 --- a/src/state/symbols/reducer.js +++ b/src/state/symbols/reducer.js @@ -37,15 +37,19 @@ export function symbolsReducer(state = initialState, action) { } = payload const coins = [] + const fundingCoins = [] const dict = {} const explorersDict = {} const symbolMapping = {} + console.log('+++currencies', currencies) + currencies.forEach((currency) => { const { - id, explorer, name, isInPair, + id, explorer, name, isInPair, isFunding } = currency if (!isInPair) return + let { symbol } = currency if (symbol && id !== symbol) { @@ -54,9 +58,9 @@ export function symbolsReducer(state = initialState, action) { } if (id.includes('F0')) { symbol = `${symbol} (deriv)` - } - if (symbol === 'USDt') { - symbolMapping.UST = symbol + // } + // if (symbol === 'USDt') { + // symbolMapping.UST = symbol } else { symbolMapping[id] = symbol } @@ -64,16 +68,24 @@ export function symbolsReducer(state = initialState, action) { explorersDict[symbol] = explorer dict[symbol] = name coins.push(symbol) + if (isFunding) fundingCoins.push(symbol) return } explorersDict[id] = explorer dict[id] = name coins.push(id) + if (isFunding) fundingCoins.push(id) }) + // console.log('+++symbolMapping', symbolMapping) + // console.log('+++fundingCoins', fundingCoins) + const preparedCoins = [...new Set(coins)].sort() + console.log('+++coins', coins) + console.log('+++preparedCoins', preparedCoins) + const preparedMapSymbols = _map(mapSymbols, item => { const [itemId, itemName] = item if (_includes(itemId, 'TEST')) return [itemId, `${itemName} (Test)`] From 2f6e2f4a25e9a1a98ffe4c0d2e13f35c1dcf7bff Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Mon, 7 Aug 2023 13:23:40 +0300 Subject: [PATCH 060/115] Actualize symbol selector mapped props --- src/ui/SymbolSelector/SymbolSelector.container.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/SymbolSelector/SymbolSelector.container.js b/src/ui/SymbolSelector/SymbolSelector.container.js index 88de10138..0c46745b6 100644 --- a/src/ui/SymbolSelector/SymbolSelector.container.js +++ b/src/ui/SymbolSelector/SymbolSelector.container.js @@ -1,11 +1,11 @@ import { connect } from 'react-redux' -import { getCoins, getCurrencies, getInactiveCurrencies } from 'state/symbols/selectors' +import { getFundingCoins, getCurrencies, getInactiveCurrencies } from 'state/symbols/selectors' import SymbolSelector from './SymbolSelector' const mapStateToProps = state => ({ - coins: getCoins(state), + coins: getFundingCoins(state), currencies: getCurrencies(state), inactiveCurrencies: getInactiveCurrencies(state), }) From a76c4f4fc5b3bd150a135665a5868e5e817effd1 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Mon, 7 Aug 2023 13:42:25 +0300 Subject: [PATCH 061/115] Remove outdated usdt case handling, actualize funding coins providing --- src/state/symbols/reducer.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/state/symbols/reducer.js b/src/state/symbols/reducer.js index 347f4fa39..211d80d97 100644 --- a/src/state/symbols/reducer.js +++ b/src/state/symbols/reducer.js @@ -46,7 +46,7 @@ export function symbolsReducer(state = initialState, action) { currencies.forEach((currency) => { const { - id, explorer, name, isInPair, isFunding + id, explorer, name, isInPair, isFunding, } = currency if (!isInPair) return @@ -58,13 +58,9 @@ export function symbolsReducer(state = initialState, action) { } if (id.includes('F0')) { symbol = `${symbol} (deriv)` - // } - // if (symbol === 'USDt') { - // symbolMapping.UST = symbol - } else { - symbolMapping[id] = symbol } + symbolMapping[id] = symbol explorersDict[symbol] = explorer dict[symbol] = name coins.push(symbol) @@ -123,7 +119,7 @@ export function symbolsReducer(state = initialState, action) { inactivePairs: formattedInactivePairs, isFetched: true, pairs: preparedPairs, - fundingCoins: marginCurrencyList, + fundingCoins, } } case authTypes.LOGOUT: From 030b9481a62b68ac246f293dbc21c6232e6b8b39 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Mon, 7 Aug 2023 13:45:40 +0300 Subject: [PATCH 062/115] Lint fix --- src/state/symbols/reducer.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/state/symbols/reducer.js b/src/state/symbols/reducer.js index 211d80d97..c7c8c2554 100644 --- a/src/state/symbols/reducer.js +++ b/src/state/symbols/reducer.js @@ -33,7 +33,6 @@ export function symbolsReducer(state = initialState, action) { inactiveSymbols = [], mapSymbols = [], pairs = [], - marginCurrencyList = [], } = payload const coins = [] From 7acc1dbdd756571db137bb7acfa0f9c37d489637 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Mon, 7 Aug 2023 13:56:55 +0300 Subject: [PATCH 063/115] Cleanup --- src/state/symbols/reducer.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/state/symbols/reducer.js b/src/state/symbols/reducer.js index c7c8c2554..74da4c034 100644 --- a/src/state/symbols/reducer.js +++ b/src/state/symbols/reducer.js @@ -41,8 +41,6 @@ export function symbolsReducer(state = initialState, action) { const explorersDict = {} const symbolMapping = {} - console.log('+++currencies', currencies) - currencies.forEach((currency) => { const { id, explorer, name, isInPair, isFunding, @@ -73,14 +71,8 @@ export function symbolsReducer(state = initialState, action) { if (isFunding) fundingCoins.push(id) }) - // console.log('+++symbolMapping', symbolMapping) - // console.log('+++fundingCoins', fundingCoins) - const preparedCoins = [...new Set(coins)].sort() - console.log('+++coins', coins) - console.log('+++preparedCoins', preparedCoins) - const preparedMapSymbols = _map(mapSymbols, item => { const [itemId, itemName] = item if (_includes(itemId, 'TEST')) return [itemId, `${itemName} (Test)`] @@ -100,7 +92,6 @@ export function symbolsReducer(state = initialState, action) { const formattedPairs = pairs.map(formatPair).map(mapPair).sort() const formattedInactivePairs = inactiveSymbols.map(formatPair).map(mapPair).sort() - const preparedPairs = _map(formattedPairs, pair => { const [firstSymbol, secondSymbol] = _split(pair, ':') if (isTestSymbol(firstSymbol) && isTestSymbol(secondSymbol)) { From e98375074412c6ecbaf1cd47b209ce7504fea7b6 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 8 Aug 2023 14:25:57 +0300 Subject: [PATCH 064/115] Actualize mapped props --- src/ui/SymbolSelector/SymbolSelector.container.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ui/SymbolSelector/SymbolSelector.container.js b/src/ui/SymbolSelector/SymbolSelector.container.js index 0c46745b6..ad72febb1 100644 --- a/src/ui/SymbolSelector/SymbolSelector.container.js +++ b/src/ui/SymbolSelector/SymbolSelector.container.js @@ -1,12 +1,18 @@ import { connect } from 'react-redux' -import { getFundingCoins, getCurrencies, getInactiveCurrencies } from 'state/symbols/selectors' +import { + getCoins, + getCurrencies, + getFundingCoins, + getInactiveCurrencies, +} from 'state/symbols/selectors' import SymbolSelector from './SymbolSelector' const mapStateToProps = state => ({ - coins: getFundingCoins(state), + coins: getCoins(state), currencies: getCurrencies(state), + fundingCoins: getFundingCoins(state), inactiveCurrencies: getInactiveCurrencies(state), }) From b5eb564d083be353c7beca2c678209acab6920a9 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 8 Aug 2023 14:28:44 +0300 Subject: [PATCH 065/115] Update public funding symbol selector config --- src/components/PublicFunding/PublicFunding.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/PublicFunding/PublicFunding.js b/src/components/PublicFunding/PublicFunding.js index a6a22969e..484896b90 100644 --- a/src/components/PublicFunding/PublicFunding.js +++ b/src/components/PublicFunding/PublicFunding.js @@ -97,6 +97,7 @@ class PublicFunding extends PureComponent { {t('selector.filter.symbol')} From 4946cd952d86ed29726fee54aa2d1e75dd6abbf3 Mon Sep 17 00:00:00 2001 From: alexstotsky Date: Tue, 8 Aug 2023 14:29:38 +0300 Subject: [PATCH 066/115] Implement separate handling flow for main amd funding coins, update prop-types --- src/ui/SymbolSelector/SymbolSelector.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/ui/SymbolSelector/SymbolSelector.js b/src/ui/SymbolSelector/SymbolSelector.js index 3600c78f4..24b9dd359 100644 --- a/src/ui/SymbolSelector/SymbolSelector.js +++ b/src/ui/SymbolSelector/SymbolSelector.js @@ -46,15 +46,21 @@ class SymbolSelector extends PureComponent { currentCoin, inactiveCurrencies, onSymbolSelect, + isFunding, + fundingCoins, } = this.props + const preparedCoins = isFunding + ? fundingCoins + : coins + const items = inactiveCurrencies.length ? [ - ...coins, + ...preparedCoins, 'inactive', ...inactiveCurrencies, ] - : coins + : preparedCoins return (