From 69cc4053c352133e52e8bc3c881b817a34d4573f Mon Sep 17 00:00:00 2001 From: Alexandr Date: Wed, 9 Feb 2022 10:24:04 +0200 Subject: [PATCH 1/9] update font settings --- package-lock.json | 87 ++- package.json | 2 + src/components/alert/index.tsx | 4 +- src/components/alert/s.module.scss | 2 +- src/components/antd/alert/s.module.scss | 2 +- src/components/antd/button/s.module.scss | 6 +- src/components/antd/datepicker/s.module.scss | 2 +- src/components/antd/field-label/index.tsx | 2 +- src/components/antd/form/s.module.scss | 2 +- src/components/antd/input/s.module.scss | 2 +- src/components/antd/modal/index.tsx | 2 +- src/components/antd/modal/s.module.scss | 2 +- .../antd/popover-menu/s.module.scss | 2 +- src/components/antd/popover/s.module.scss | 2 +- src/components/antd/select/index.tsx | 4 +- src/components/antd/select/s.module.scss | 4 +- src/components/antd/table/s.module.scss | 4 +- src/components/antd/tabs/s.module.scss | 2 +- src/components/antd/textarea/s.module.scss | 2 +- src/components/antd/tooltip/s.module.scss | 2 +- .../antd/yes-no-selector/s.module.scss | 2 +- src/components/button/index.tsx | 9 +- src/components/button/s.module.scss | 97 +++- src/components/chart/index.tsx | 2 +- src/components/chart/s.module.scss | 8 +- src/components/checkbox/index.tsx | 2 +- src/components/custom/badge/s.module.scss | 8 +- src/components/custom/dropdown/s.module.scss | 2 +- .../custom/error-boundary/index.tsx | 2 +- src/components/custom/form/index.tsx | 4 +- src/components/custom/gas-fee-list/index.tsx | 6 +- src/components/custom/label/s.module.scss | 4 +- src/components/custom/notification/index.tsx | 42 +- .../custom/notification/s.module.scss | 2 +- src/components/custom/status-tag/index.tsx | 2 +- src/components/custom/table/index.tsx | 2 +- src/components/custom/tabs/s.module.scss | 4 +- .../custom/token-amount-new/index.tsx | 4 +- .../custom/token-amount-new/s.module.scss | 2 +- .../custom/transaction-details/index.tsx | 12 +- .../custom/transaction-summary/index.tsx | 2 +- src/components/custom/typography/index.tsx | 6 +- .../custom/typography/s.module.scss | 20 +- src/components/input/s.module.scss | 2 +- src/components/portfolio-balance/index.tsx | 24 +- src/components/providers/web3Provider.tsx | 4 +- src/components/warning/index.tsx | 2 +- src/layout/components/layout-footer/index.tsx | 10 +- .../components/layout-footer/s.module.scss | 4 +- src/layout/components/layout-header/index.tsx | 28 +- .../components/layout-header/s.module.scss | 2 +- .../components/layout-side-nav/index.tsx | 30 +- .../faucets/views/faucet-list-view/index.tsx | 10 +- .../components/add-zeros-popup/index.tsx | 4 +- .../create-proposal-action-modal/index.tsx | 6 +- .../components/proposal-action-card/index.tsx | 12 +- .../proposal-action-card/s.module.scss | 2 +- .../simulated-proposal-action-modal/index.tsx | 4 +- .../voting-detailed-modal/s.module.scss | 2 +- .../components/voting-header/index.tsx | 28 +- .../components/activation-threshold/index.tsx | 8 +- .../components/voters-table/index.tsx | 18 +- .../components/voting-stat-list/index.tsx | 42 +- .../portfolio-delegate/index.tsx | 20 +- .../wallet-deposit-confirm-modal/index.tsx | 4 +- .../portfolio-deposit/index.tsx | 12 +- .../components/wallet-lock-chart/index.tsx | 8 +- .../wallet-lock-confirm-modal/index.tsx | 4 +- .../portfolio-view/portfolio-lock/index.tsx | 12 +- .../portfolio-withdraw/index.tsx | 12 +- .../views/proposal-create-view/index.tsx | 4 +- .../abrogation-approval-card/index.tsx | 6 +- .../abrogation-details-card/index.tsx | 10 +- .../abrogation-proposal-modal/index.tsx | 2 +- .../abrogation-vote-modal/index.tsx | 26 +- .../abrogation-vote-results-card/index.tsx | 20 +- .../abrogation-voters-modal/index.tsx | 10 +- .../abrogation-votes-card/index.tsx | 18 +- .../proposal-abrogation-card/index.tsx | 22 +- .../proposal-approval-card/index.tsx | 6 +- .../proposal-details-card/index.tsx | 16 +- .../components/proposal-quorum-card/index.tsx | 6 +- .../components/proposal-status-card/index.tsx | 4 +- .../components/proposal-vote-modal/index.tsx | 24 +- .../proposal-vote-results-card/index.tsx | 26 +- .../proposal-voters-modal/index.tsx | 10 +- .../components/proposal-votes-card/index.tsx | 20 +- .../queue-for-execution-modal/index.tsx | 2 +- .../components/proposals-table/index.tsx | 8 +- .../governance/views/proposals-view/index.tsx | 8 +- .../treasury-view/treasury-fees/index.tsx | 2 +- .../treasury-fees/sa-section.tsx | 26 +- .../treasury-fees/se-section.tsx | 34 +- .../treasury-fees/sy-section.tsx | 22 +- .../treasury-view/treasury-holdings/index.tsx | 30 +- .../components/trade/s.module.scss | 2 +- .../smart-alpha/components/transactions.tsx | 20 +- .../views/deposit-view/depositForm.tsx | 24 +- .../smart-alpha/views/deposit-view/index.tsx | 18 +- .../smart-alpha/views/deposit-view/select.tsx | 6 +- .../smart-alpha/views/kpi-option/index.tsx | 2 +- .../views/kpi-option/s.module.scss | 4 +- .../views/kpi-option/stake/index.tsx | 20 +- .../views/kpi-option/statistics/index.tsx | 6 +- .../views/kpi-option/statistics/s.module.scss | 4 +- .../views/kpi-option/transactions/index.tsx | 14 +- .../kpi-options/kpi-option-card/index.tsx | 2 +- .../kpi-options/kpi-option-card/s.module.scss | 6 +- .../smart-alpha/views/launch/index.tsx | 2 +- .../smart-alpha/views/launch/s.module.scss | 2 +- .../smart-alpha/views/pool-view/index.tsx | 76 +-- .../views/pool-view/pool-performance.tsx | 2 +- .../views/pool-view/previous-epochs/index.tsx | 48 +- .../pool-view/previous-epochs/s.module.scss | 4 +- .../views/pool-view/queue-state/index.tsx | 30 +- .../smart-alpha/views/pool-view/s.module.scss | 4 +- .../views/pool-view/tokens-price.tsx | 2 +- .../smart-alpha/views/pools-view/index.tsx | 100 ++-- .../views/portfolio-view/index.tsx | 12 +- .../views/portfolio-view/portfolio-value.tsx | 2 +- .../views/portfolio-view/positions.tsx | 70 +-- .../views/simulate-epoch/index.tsx | 4 +- .../views/simulate-epoch/simulate.tsx | 32 +- .../smart-alpha/views/withdraw-view/index.tsx | 18 +- .../views/withdraw-view/withdrawForm.tsx | 24 +- .../components/transactions-table/index.tsx | 18 +- .../views/change-tranche-view/index.tsx | 20 +- .../views/deposit-view/Deposit.tsx | 12 +- .../views/deposit-view/Swap.tsx | 10 +- .../views/deposit-view/index.tsx | 24 +- .../smart-exposure/views/pools-view/index.tsx | 18 +- .../views/pools-view/table/index.tsx | 16 +- .../views/portfolio-view/index.tsx | 4 +- .../portfolio-table/positions.tsx | 6 +- .../portfolio-view/portfolio-value/index.tsx | 8 +- .../views/tranche-view/charts/index.tsx | 12 +- .../views/tranche-view/details/index.tsx | 58 +- .../views/tranche-view/index.tsx | 4 +- .../views/tranche-view/transactions/index.tsx | 2 +- .../views/tranche-view/trend/index.tsx | 6 +- .../views/withdraw-view/Multiple.tsx | 22 +- .../views/withdraw-view/Single.tsx | 14 +- .../views/withdraw-view/index.tsx | 24 +- .../components/portfolio-value/index.tsx | 6 +- .../components/transaction-summary/index.tsx | 18 +- .../components/tx-status-modal/index.tsx | 4 +- .../deposit-view/deposit-header/index.tsx | 26 +- .../deposit-view/junior-tranche/index.tsx | 28 +- .../deposit-view/select-tranche/index.tsx | 18 +- .../deposit-view/senior-tranche/index.tsx | 20 +- .../smart-yield/views/markets-view/index.tsx | 12 +- .../views/markets-view/pools-table/index.tsx | 44 +- .../smart-yield/views/pool-view/index.tsx | 2 +- .../smart-yield/views/pool-view/s.module.scss | 4 +- .../views/pool-view/stake/index.tsx | 20 +- .../views/pool-view/statistics/index.tsx | 6 +- .../views/pool-view/statistics/s.module.scss | 4 +- .../views/pool-view/transactions/index.tsx | 16 +- .../pools-view/aggregated-pool-card/index.tsx | 28 +- .../smart-yield/views/pools-view/index.tsx | 12 +- .../views/pools-view/pool-card/index.tsx | 2 +- .../views/pools-view/pool-card/s.module.scss | 6 +- .../views/portfolio-view/index.tsx | 12 +- .../junior/active-positions-table/index.tsx | 16 +- .../views/portfolio-view/junior/index.tsx | 10 +- .../junior/locked-positions-table/index.tsx | 12 +- .../junior/past-positions-table/index.tsx | 22 +- .../junior/staked-positions-table/index.tsx | 18 +- .../overview/history-table/index.tsx | 24 +- .../senior/active-position/index.tsx | 52 +- .../senior/past-positions-list/index.tsx | 24 +- .../views/stats-view/apy/index.tsx | 6 +- .../stats-view/junior-bonds-table/index.tsx | 20 +- .../views/stats-view/liquidity/index.tsx | 6 +- .../views/stats-view/market/index.tsx | 90 ++-- .../views/stats-view/pool-tx-table/index.tsx | 24 +- .../stats-view/senior-bonds-table/index.tsx | 24 +- .../withdraw-view/initiate-withdraw/index.tsx | 26 +- .../withdraw-view/instant-withdraw/index.tsx | 32 +- .../withdraw-view/two-step-withdraw/index.tsx | 24 +- .../withdraw-view/withdraw-header/index.tsx | 18 +- .../components/dao-reward-card/index.tsx | 26 +- .../components/pool-card/index.tsx | 50 +- .../components/pool-chart/index.tsx | 8 +- .../components/pool-harvest-modal/index.tsx | 8 +- .../components/pool-header/index.tsx | 24 +- .../components/pool-rewards/index.tsx | 8 +- .../components/pool-stake/index.tsx | 16 +- .../components/pool-statistics/index.tsx | 26 +- .../components/pool-stats/index.tsx | 14 +- .../components/pool-transactions/index.tsx | 16 +- .../components/pool-unstake/index.tsx | 16 +- .../components/pools-transactions/index.tsx | 16 +- .../yield-farming/views/pools-view/index.tsx | 2 +- src/resources/fonts/Montserrat-Bold.ttf | Bin 244468 -> 0 bytes src/resources/fonts/Montserrat-Regular.ttf | Bin 245708 -> 0 bytes src/resources/fonts/Montserrat-SemiBold.ttf | Bin 243816 -> 0 bytes src/resources/fonts/Prompt-Bold.ttf | Bin 0 -> 172528 bytes src/resources/fonts/Prompt-Medium.ttf | Bin 0 -> 170148 bytes src/resources/fonts/Prompt-Regular.ttf | Bin 0 -> 162624 bytes src/resources/fonts/Prompt-SemiBold.ttf | Bin 0 -> 169024 bytes src/resources/svg/static-sprite.svg | 504 +++++++++--------- src/resources/svg/wallets/metamask-logo.svg | 30 +- src/styles/button.scss | 2 +- src/styles/index.scss | 40 +- src/styles/rechart.scss | 10 +- src/styles/table.scss | 4 +- src/styles/text.scss | 38 +- .../components/connect-wallet-modal/index.tsx | 2 +- .../install-metamask-modal/index.tsx | 4 +- .../components/notifications/index.tsx | 2 +- .../unsupported-chain-modal/index.tsx | 4 +- src/web3/components/tx-status-modal/index.tsx | 4 +- .../components/user-rejected-modal/index.tsx | 2 +- 214 files changed, 1816 insertions(+), 1691 deletions(-) delete mode 100644 src/resources/fonts/Montserrat-Bold.ttf delete mode 100644 src/resources/fonts/Montserrat-Regular.ttf delete mode 100644 src/resources/fonts/Montserrat-SemiBold.ttf create mode 100644 src/resources/fonts/Prompt-Bold.ttf create mode 100644 src/resources/fonts/Prompt-Medium.ttf create mode 100644 src/resources/fonts/Prompt-Regular.ttf create mode 100644 src/resources/fonts/Prompt-SemiBold.ttf diff --git a/package-lock.json b/package-lock.json index e6955b63..23b32254 100644 --- a/package-lock.json +++ b/package-lock.json @@ -58,6 +58,7 @@ "wolfy87-eventemitter": "5.2.9" }, "devDependencies": { + "@prettier/plugin-xml": "1.2.0", "@storybook/addon-actions": "6.3.7", "@storybook/addon-essentials": "6.3.7", "@storybook/addon-links": "6.3.7", @@ -86,7 +87,7 @@ "react-scripts": "4.0.3", "rewire": "5.0.0", "rimraf": "3.0.2", - "sass": "^1.49.0", + "sass": "1.49.0", "source-map-explorer": "2.5.2", "stylelint": "13.13.1", "stylelint-config-sass-guidelines": "8.0.0", @@ -185,7 +186,7 @@ }, "node_modules/@0x/subproviders/node_modules/ethereumjs-abi": { "version": "0.6.8", - "resolved": "https://git@github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0", + "resolved": "git+https://git@github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0", "license": "MIT", "dependencies": { "bn.js": "^4.11.8", @@ -4753,6 +4754,16 @@ "node": ">=4.0.0" } }, + "node_modules/@prettier/plugin-xml": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@prettier/plugin-xml/-/plugin-xml-1.2.0.tgz", + "integrity": "sha512-bFvVAZKs59XNmntYjyefn3K4TBykS6E+d6ZW8IcylAs88ZO+TzLhp0dPpi0VKfPzq1Nb+kpDnPRTiwb4zY6NgA==", + "dev": true, + "dependencies": { + "@xml-tools/parser": "^1.0.11", + "prettier": ">=2.3" + } + }, "node_modules/@rollup/plugin-node-resolve": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz", @@ -10239,6 +10250,15 @@ "@xtuc/long": "4.2.2" } }, + "node_modules/@xml-tools/parser": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@xml-tools/parser/-/parser-1.0.11.tgz", + "integrity": "sha512-aKqQ077XnR+oQtHJlrAflaZaL7qZsulWc/i/ZEooar5JiWj1eLt0+Wg28cpa+XLney107wXqneC+oG1IZvxkTA==", + "dev": true, + "dependencies": { + "chevrotain": "7.1.1" + } + }, "node_modules/@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", @@ -13538,6 +13558,15 @@ "functional-red-black-tree": "^1.0.1" } }, + "node_modules/chevrotain": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/chevrotain/-/chevrotain-7.1.1.tgz", + "integrity": "sha512-wy3mC1x4ye+O+QkEinVJkPf5u2vsrDIYW9G7ZuwFl6v/Yu0LwUuT2POsb+NUWApebyxfkQq6+yDfRExbnI5rcw==", + "dev": true, + "dependencies": { + "regexp-to-ast": "0.5.0" + } + }, "node_modules/chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -17553,7 +17582,7 @@ }, "node_modules/eth-json-rpc-filters/node_modules/ethereumjs-abi": { "version": "0.6.8", - "resolved": "https://git@github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0", + "resolved": "git+https://git@github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0", "license": "MIT", "dependencies": { "bn.js": "^4.11.8", @@ -17662,7 +17691,7 @@ }, "node_modules/eth-json-rpc-middleware/node_modules/ethereumjs-abi": { "version": "0.6.8", - "resolved": "https://git@github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0", + "resolved": "git+https://git@github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0", "license": "MIT", "dependencies": { "bn.js": "^4.11.8", @@ -40934,6 +40963,12 @@ "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==", "dev": true }, + "node_modules/regexp-to-ast": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/regexp-to-ast/-/regexp-to-ast-0.5.0.tgz", + "integrity": "sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw==", + "dev": true + }, "node_modules/regexp.prototype.flags": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz", @@ -47800,7 +47835,7 @@ }, "node_modules/web3-provider-engine/node_modules/ethereumjs-abi": { "version": "0.6.8", - "resolved": "https://git@github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0", + "resolved": "git+https://git@github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0", "license": "MIT", "dependencies": { "bn.js": "^4.11.8", @@ -49957,7 +49992,7 @@ } }, "ethereumjs-abi": { - "version": "https://git@github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0", + "version": "git+https://git@github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0", "from": "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git", "requires": { "bn.js": "^4.11.8", @@ -53272,6 +53307,16 @@ } } }, + "@prettier/plugin-xml": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@prettier/plugin-xml/-/plugin-xml-1.2.0.tgz", + "integrity": "sha512-bFvVAZKs59XNmntYjyefn3K4TBykS6E+d6ZW8IcylAs88ZO+TzLhp0dPpi0VKfPzq1Nb+kpDnPRTiwb4zY6NgA==", + "dev": true, + "requires": { + "@xml-tools/parser": "^1.0.11", + "prettier": ">=2.3" + } + }, "@rollup/plugin-node-resolve": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz", @@ -57538,6 +57583,15 @@ "@xtuc/long": "4.2.2" } }, + "@xml-tools/parser": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@xml-tools/parser/-/parser-1.0.11.tgz", + "integrity": "sha512-aKqQ077XnR+oQtHJlrAflaZaL7qZsulWc/i/ZEooar5JiWj1eLt0+Wg28cpa+XLney107wXqneC+oG1IZvxkTA==", + "dev": true, + "requires": { + "chevrotain": "7.1.1" + } + }, "@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", @@ -60311,6 +60365,15 @@ "functional-red-black-tree": "^1.0.1" } }, + "chevrotain": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/chevrotain/-/chevrotain-7.1.1.tgz", + "integrity": "sha512-wy3mC1x4ye+O+QkEinVJkPf5u2vsrDIYW9G7ZuwFl6v/Yu0LwUuT2POsb+NUWApebyxfkQq6+yDfRExbnI5rcw==", + "dev": true, + "requires": { + "regexp-to-ast": "0.5.0" + } + }, "chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -63526,7 +63589,7 @@ } }, "ethereumjs-abi": { - "version": "https://git@github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0", + "version": "git+https://git@github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0", "from": "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git", "requires": { "bn.js": "^4.11.8", @@ -63633,7 +63696,7 @@ } }, "ethereumjs-abi": { - "version": "https://git@github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0", + "version": "git+https://git@github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0", "from": "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git", "requires": { "bn.js": "^4.11.8", @@ -81466,6 +81529,12 @@ "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==", "dev": true }, + "regexp-to-ast": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/regexp-to-ast/-/regexp-to-ast-0.5.0.tgz", + "integrity": "sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw==", + "dev": true + }, "regexp.prototype.flags": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz", @@ -86968,7 +87037,7 @@ } }, "ethereumjs-abi": { - "version": "https://git@github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0", + "version": "git+https://git@github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0", "from": "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git", "requires": { "bn.js": "^4.11.8", diff --git a/package.json b/package.json index 8ce0c3b0..a41d3718 100644 --- a/package.json +++ b/package.json @@ -77,6 +77,7 @@ "jsxBracketSameLine": true, "arrowParens": "avoid", "trailingComma": "all", + "xmlWhitespaceSensitivity": "ignore", "endOfLine": "lf" }, "stylelint": { @@ -157,6 +158,7 @@ "wolfy87-eventemitter": "5.2.9" }, "devDependencies": { + "@prettier/plugin-xml": "1.2.0", "@storybook/addon-actions": "6.3.7", "@storybook/addon-essentials": "6.3.7", "@storybook/addon-links": "6.3.7", diff --git a/src/components/alert/index.tsx b/src/components/alert/index.tsx index bc295cad..bb571994 100644 --- a/src/components/alert/index.tsx +++ b/src/components/alert/index.tsx @@ -54,12 +54,12 @@ export const Alert: React.FC = ({ type, className, children, tit
{title ? ( - + {title} ) : null} {children ? ( - + {children} ) : null} diff --git a/src/components/alert/s.module.scss b/src/components/alert/s.module.scss index 44e20e38..bc9363bf 100644 --- a/src/components/alert/s.module.scss +++ b/src/components/alert/s.module.scss @@ -1,5 +1,5 @@ .alert { - font: var(--font-p2); + font: var(--font-body2); font-weight: 600; padding: 16px 24px; display: flex; diff --git a/src/components/antd/alert/s.module.scss b/src/components/antd/alert/s.module.scss index 2195a8ee..a252bad7 100644 --- a/src/components/antd/alert/s.module.scss +++ b/src/components/antd/alert/s.module.scss @@ -17,7 +17,7 @@ } > :global(.ant-alert-content) { - font: var(--font-p2); + font: var(--font-body2); font-weight: 600; } diff --git a/src/components/antd/button/s.module.scss b/src/components/antd/button/s.module.scss index c8e750fa..27a1c3f6 100644 --- a/src/components/antd/button/s.module.scss +++ b/src/components/antd/button/s.module.scss @@ -120,7 +120,7 @@ } .component:global(.ant-btn) { - font: var(--font-p2); + font: var(--font-body2); font-weight: bold; display: flex; align-items: center; @@ -132,14 +132,14 @@ text-align: center; &:global(.ant-btn-lg) { - font: var(--font-p1); + font: var(--font-body1); font-weight: bold; height: 64px; padding: 20px; } &:global(.ant-btn-sm) { - font: var(--font-sm); + font: var(--font-caption); font-weight: bold; height: 34px; padding: 9px; diff --git a/src/components/antd/datepicker/s.module.scss b/src/components/antd/datepicker/s.module.scss index bbc976a8..cf3e2ece 100644 --- a/src/components/antd/datepicker/s.module.scss +++ b/src/components/antd/datepicker/s.module.scss @@ -31,7 +31,7 @@ :global(.ant-picker-input) { input { - font: var(--font-p1); + font: var(--font-body1); font-weight: 600; color: var(--theme-primary-color); diff --git a/src/components/antd/field-label/index.tsx b/src/components/antd/field-label/index.tsx index 9cc007ab..00471d60 100644 --- a/src/components/antd/field-label/index.tsx +++ b/src/components/antd/field-label/index.tsx @@ -19,7 +19,7 @@ const FieldLabel: FCx = props => {
{typeof label === 'string' ? ( - + {label} ) : ( diff --git a/src/components/antd/form/s.module.scss b/src/components/antd/form/s.module.scss index 955991e5..931887ba 100644 --- a/src/components/antd/form/s.module.scss +++ b/src/components/antd/form/s.module.scss @@ -6,7 +6,7 @@ margin-bottom: 0; :global(.ant-form-item-label) label { - font: var(--font-sm); + font: var(--font-caption); font-weight: 600; display: inline-grid; grid-template-columns: repeat(2, max-content); diff --git a/src/components/antd/input/s.module.scss b/src/components/antd/input/s.module.scss index 317cedde..9f3868e1 100644 --- a/src/components/antd/input/s.module.scss +++ b/src/components/antd/input/s.module.scss @@ -24,7 +24,7 @@ :global(.ant-input), &:global(.ant-input) { - font: var(--font-p1); + font: var(--font-body1); font-weight: 600; height: 48px; padding: 12px 16px; diff --git a/src/components/antd/modal/index.tsx b/src/components/antd/modal/index.tsx index 3d5553a0..6f223821 100644 --- a/src/components/antd/modal/index.tsx +++ b/src/components/antd/modal/index.tsx @@ -50,7 +50,7 @@ const Modal: React.FC = props => { closeIcon={<>} onCancel={() => showConfirm(false)}> - + {confirmText} diff --git a/src/components/antd/modal/s.module.scss b/src/components/antd/modal/s.module.scss index 88bb3bf4..9c91f661 100644 --- a/src/components/antd/modal/s.module.scss +++ b/src/components/antd/modal/s.module.scss @@ -24,7 +24,7 @@ border-bottom: 1px solid var(--theme-border-color); :global(.ant-modal-title) { - font: var(--font-p1); + font: var(--font-body1); font-weight: 600; color: var(--theme-primary-color); } diff --git a/src/components/antd/popover-menu/s.module.scss b/src/components/antd/popover-menu/s.module.scss index d8066d3b..13ccb327 100644 --- a/src/components/antd/popover-menu/s.module.scss +++ b/src/components/antd/popover-menu/s.module.scss @@ -9,7 +9,7 @@ } :global(.ant-menu-item) { - font: var(--font-p1); + font: var(--font-body1); font-weight: 600; display: grid; grid-auto-flow: column; diff --git a/src/components/antd/popover/s.module.scss b/src/components/antd/popover/s.module.scss index 4375a95e..f0ab4655 100644 --- a/src/components/antd/popover/s.module.scss +++ b/src/components/antd/popover/s.module.scss @@ -8,7 +8,7 @@ } :global(.ant-popover-title) { - font: var(--font-p1); + font: var(--font-body1); font-weight: 600; padding: 24px; border-bottom: 1px solid var(--theme-border-color); diff --git a/src/components/antd/select/index.tsx b/src/components/antd/select/index.tsx index dc928113..023b87c3 100644 --- a/src/components/antd/select/index.tsx +++ b/src/components/antd/select/index.tsx @@ -45,11 +45,11 @@ const Select: React.FC> = {label && ( - + {label} )} - + {option.label} diff --git a/src/components/antd/select/s.module.scss b/src/components/antd/select/s.module.scss index 9491032a..d4899c22 100644 --- a/src/components/antd/select/s.module.scss +++ b/src/components/antd/select/s.module.scss @@ -38,7 +38,7 @@ :global(.ant-select-selection-item), :global(.ant-select-selection-placeholder) { - font: var(--font-p1); + font: var(--font-body1); font-weight: 600; color: var(--theme-primary-color); } @@ -75,7 +75,7 @@ } :global(.ant-select-item-option-content) { - font: var(--font-p2); + font: var(--font-body2); font-weight: 600; color: var(--theme-secondary-color); } diff --git a/src/components/antd/table/s.module.scss b/src/components/antd/table/s.module.scss index 5c513695..c02ea7ec 100644 --- a/src/components/antd/table/s.module.scss +++ b/src/components/antd/table/s.module.scss @@ -10,7 +10,7 @@ } :global(.ant-table-thead .ant-table-cell) { - font: var(--font-sm); + font: var(--font-caption); font-weight: 600; padding: 16px 24px; background: var(--theme-card-color); @@ -86,7 +86,7 @@ border-radius: 0 0 4px 4px; :global(.ant-pagination-total-text) { - font: var(--font-p2); + font: var(--font-body2); font-weight: 600; width: 100%; color: var(--theme-secondary-color); diff --git a/src/components/antd/tabs/s.module.scss b/src/components/antd/tabs/s.module.scss index 18efc969..ecc771ae 100644 --- a/src/components/antd/tabs/s.module.scss +++ b/src/components/antd/tabs/s.module.scss @@ -13,7 +13,7 @@ > :global(.ant-tabs-nav-list) { > :global(.ant-tabs-tab) { > :global(.ant-tabs-tab-btn) { - font: var(--font-p1); + font: var(--font-body1); font-weight: 600; display: flex; flex-direction: row; diff --git a/src/components/antd/textarea/s.module.scss b/src/components/antd/textarea/s.module.scss index 84509312..f37cbe28 100644 --- a/src/components/antd/textarea/s.module.scss +++ b/src/components/antd/textarea/s.module.scss @@ -1,5 +1,5 @@ .component { - font: var(--font-p1); + font: var(--font-body1); font-weight: 600; width: 100%; min-height: 64px; diff --git a/src/components/antd/tooltip/s.module.scss b/src/components/antd/tooltip/s.module.scss index 3c856466..a7b72c3f 100644 --- a/src/components/antd/tooltip/s.module.scss +++ b/src/components/antd/tooltip/s.module.scss @@ -1,6 +1,6 @@ .overlay:global(.ant-tooltip) { :global(.ant-tooltip-inner) { - font: var(--font-p1); + font: var(--font-body1); max-width: 360px; padding: 16px; background: var(--theme-card-color); diff --git a/src/components/antd/yes-no-selector/s.module.scss b/src/components/antd/yes-no-selector/s.module.scss index 04b4f0a1..ea1fd593 100644 --- a/src/components/antd/yes-no-selector/s.module.scss +++ b/src/components/antd/yes-no-selector/s.module.scss @@ -7,7 +7,7 @@ height: 64px; label:global(.ant-radio-button-wrapper) { - font: var(--font-p1); + font: var(--font-body1); font-weight: 600; display: flex; align-items: center; diff --git a/src/components/button/index.tsx b/src/components/button/index.tsx index f722384d..8a9cb44d 100644 --- a/src/components/button/index.tsx +++ b/src/components/button/index.tsx @@ -72,7 +72,14 @@ const ButtonContent: React.FC = ({ size, icon, iconPosition, }; interface CommonProps extends ButtonContentProps { - variation?: 'primary' | 'secondary' | 'ghost' | 'ghost-alt' | 'text' | 'text-alt' | 'link'; + variation?: + | 'primary' + | 'secondary' + | 'ghost' // TODO: deprecated + | 'ghost-alt' // TODO: deprecated + | 'text' + | 'text-alt' + | 'link'; className?: string; } diff --git a/src/components/button/s.module.scss b/src/components/button/s.module.scss index b1439fd0..66022703 100644 --- a/src/components/button/s.module.scss +++ b/src/components/button/s.module.scss @@ -3,17 +3,17 @@ flex-direction: row; align-items: center; justify-content: center; - font: var(--font-p2-bold); - padding: 11px 32px; + font: var(--font-body2-semibold); + padding: 8px 16px; + border-radius: 8px; text-align: center; white-space: nowrap; - - border: 1px solid transparent; + border: none; &.small { - padding: 9px 24px; - font: var(--font-sm-bold); + padding: 8px 12px; + font: var(--font-caption-semibold); &.iconOnly { padding: 9px; @@ -21,8 +21,8 @@ } &.normal { - padding: 11px 32px; - font: var(--font-p2-bold); + padding: 8px 16px; + font: var(--font-body2-semibold); &.iconOnly { padding: 11px; @@ -30,8 +30,8 @@ } &.big { - padding: 19px 48px; - font: var(--font-p1-bold); + padding: 12px 32px; + font: var(--font-body1-semibold); &.iconOnly { padding: 19px; @@ -52,7 +52,6 @@ background: var(--theme-red-color); box-shadow: 0 8px 16px rgba(var(--theme-red-color-rgb), 0.16); - border-radius: 4px; color: #fff; &:hover { @@ -80,7 +79,31 @@ @include button-base; background: rgba(var(--theme-red-color-rgb), 0.1); - border-radius: 4px; + color: var(--theme-red-color); + + &:hover { + background: rgba(var(--theme-red400-color-rgb), 0.1); + color: var(--theme-red400-color); + } + + &:active { + background: rgba(var(--theme-red600-color-rgb), 0.08); + color: var(--theme-red600-color); + } + + &:disabled, + &[disabled], + &[aria-disabled='true'], + &.disabled { + background-color: rgba(170, 175, 179, 0.08); + color: var(--theme-grey300-color); + } +} + +.secondary-alt { + @include button-base; + + background: rgba(var(--theme-red-color-rgb), 0.1); color: var(--theme-red-color); &:hover { @@ -105,10 +128,10 @@ .ghost { @include button-base; - border-color: currentColor; + border: 1px solid currentColor; background-color: transparent; - border-radius: 4px; color: var(--theme-red-color); + padding: 7px 15px; &:hover { background: rgba(var(--theme-red400-color-rgb), 0.1); @@ -120,6 +143,18 @@ color: var(--theme-red600-color); } + &.small { + padding: 7px 11px; + } + + &.normal { + padding: 7px 15px; + } + + &.big { + padding: 11px 31px; + } + &:disabled, &[disabled], &[aria-disabled='true'], @@ -135,9 +170,9 @@ border: 1px solid var(--theme-border-color); background-color: transparent; - border-radius: 4px; color: var(--theme-grey300-color); + padding: 7px 15px; &:hover { background: rgba(var(--theme-red400-color-rgb), 0.1); @@ -151,6 +186,18 @@ color: var(--theme-red600-color); } + &.small { + padding: 7px 11px; + } + + &.normal { + padding: 7px 15px; + } + + &.big { + padding: 11px 31px; + } + &:disabled, &[disabled], &[aria-disabled='true'], @@ -179,15 +226,15 @@ } &.small { - font: var(--font-sm-bold); + font: var(--font-caption-semibold); } &.normal { - font: var(--font-p2-bold); + font: var(--font-body2-semibold); } &.big { - font: var(--font-p1-bold); + font: var(--font-body1-semibold); } &:disabled, @@ -218,15 +265,15 @@ } &.small { - font: var(--font-sm-bold); + font: var(--font-caption-semibold); } &.normal { - font: var(--font-p2-bold); + font: var(--font-body2-semibold); } &.big { - font: var(--font-p1-bold); + font: var(--font-body1-semibold); } &:disabled, @@ -240,7 +287,7 @@ } .link { - font: var(--font-p2); + font: var(--font-body2); font-weight: 600; color: var(--theme-blue-color); background-color: transparent; @@ -268,15 +315,15 @@ } &.small { - font: var(--font-sm-semibold); + font: var(--font-caption-semibold); } &.normal { - font: var(--font-p2-semibold); + font: var(--font-body2-semibold); } &.big { - font: var(--font-p1-semibold); + font: var(--font-body1-semibold); } &:disabled, diff --git a/src/components/chart/index.tsx b/src/components/chart/index.tsx index 45012343..f45f1219 100644 --- a/src/components/chart/index.tsx +++ b/src/components/chart/index.tsx @@ -124,7 +124,7 @@ export const Chart: React.FC = ({ data, x, y, className, loading = fa {data.length === 0 ? (
- + Not enough data to plot a graph
diff --git a/src/components/chart/s.module.scss b/src/components/chart/s.module.scss index 01f036fa..716d8f04 100644 --- a/src/components/chart/s.module.scss +++ b/src/components/chart/s.module.scss @@ -5,7 +5,7 @@ } .tooltipTitle { - font: var(--font-p2); + font: var(--font-body2); font-weight: 600; padding: 8px; color: var(--theme-primary-color); @@ -26,7 +26,7 @@ } .tooltipName { - font: var(--font-sm); + font: var(--font-caption); font-weight: 600; color: var(--theme-secondary-color); position: relative; @@ -47,7 +47,7 @@ } .tooltipValue { - font: var(--font-p2); + font: var(--font-body2); font-weight: 600; color: var(--theme-primary-color); margin: 0; @@ -69,7 +69,7 @@ } .legendItem { - font: var(--font-sm); + font: var(--font-caption); font-weight: 600; background: var(--theme-body-color); color: var(--theme-secondary-color); diff --git a/src/components/checkbox/index.tsx b/src/components/checkbox/index.tsx index 0d42a9c6..986a0083 100644 --- a/src/components/checkbox/index.tsx +++ b/src/components/checkbox/index.tsx @@ -33,7 +33,7 @@ export const Checkbox: React.FC = ({ checked, onChange, indeterminate /> {children ? ( - + {children} ) : null} diff --git a/src/components/custom/badge/s.module.scss b/src/components/custom/badge/s.module.scss index 6ca4ebc7..0c71cf8f 100644 --- a/src/components/custom/badge/s.module.scss +++ b/src/components/custom/badge/s.module.scss @@ -29,23 +29,23 @@ } &.small { - font: var(--font-sm-bold); + font: var(--font-caption-bold); padding: 0 10px; } &.medium { - font: var(--font-p2-bold); + font: var(--font-body2-bold); padding: 0 12px; } &.large { - font: var(--font-lb2-bold); + font: var(--font-caption-bold); padding: 8px 24px; } } .squareBadge { - font: var(--font-sm); + font: var(--font-caption); font-weight: 600; align-items: center; background: rgba(113, 121, 128, 0.08); diff --git a/src/components/custom/dropdown/s.module.scss b/src/components/custom/dropdown/s.module.scss index 1803b9ec..793b9773 100644 --- a/src/components/custom/dropdown/s.module.scss +++ b/src/components/custom/dropdown/s.module.scss @@ -14,7 +14,7 @@ } .tokenSelectListButton { - font: var(--font-p2); + font: var(--font-body2); font-weight: 600; background-color: transparent; border: 0; diff --git a/src/components/custom/error-boundary/index.tsx b/src/components/custom/error-boundary/index.tsx index ada94736..607bc0a1 100644 --- a/src/components/custom/error-boundary/index.tsx +++ b/src/components/custom/error-boundary/index.tsx @@ -43,7 +43,7 @@ export default class ErrorBoundary extends React.Component { } subTitle={ - + Sorry, something went wrong. } diff --git a/src/components/custom/form/index.tsx b/src/components/custom/form/index.tsx index 0d2daa88..9b0fb432 100644 --- a/src/components/custom/form/index.tsx +++ b/src/components/custom/form/index.tsx @@ -144,7 +144,7 @@ export function FieldLabel(props: CP) {
{typeof label === 'string' ? ( - + {label} ) : ( @@ -175,7 +175,7 @@ export function FormError(props: CP) { } return ( - + {err.message ?? children} ); diff --git a/src/components/custom/gas-fee-list/index.tsx b/src/components/custom/gas-fee-list/index.tsx index 6b6e0b9e..6e36080a 100644 --- a/src/components/custom/gas-fee-list/index.tsx +++ b/src/components/custom/gas-fee-list/index.tsx @@ -122,16 +122,16 @@ const GasFeeList: React.FC = props => { + {option.name} } hint={ - + {option.value} - + Gwei diff --git a/src/components/custom/label/s.module.scss b/src/components/custom/label/s.module.scss index bf136b0e..dc4055b6 100644 --- a/src/components/custom/label/s.module.scss +++ b/src/components/custom/label/s.module.scss @@ -1,5 +1,5 @@ .aprLabel { - font: var(--font-sm); + font: var(--font-caption); font-weight: 600; display: inline-flex; align-items: center; @@ -10,7 +10,7 @@ background-color: var(--theme-body-color); &.aprLabelLarge { - font: var(--font-p1); + font: var(--font-body1); font-weight: 600; svg { diff --git a/src/components/custom/notification/index.tsx b/src/components/custom/notification/index.tsx index 30e37a87..0fcedba4 100644 --- a/src/components/custom/notification/index.tsx +++ b/src/components/custom/notification/index.tsx @@ -40,7 +40,7 @@ function getProposalLink(id: number): React.ReactNode { function getStrongText(text: string = ''): React.ReactNode { return ( - + {text} ); @@ -57,7 +57,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re 'file-add', colorPairs.blue, <> - + Proposal {getProposalLink(n.metadata.proposalId)} has been created by{' '} {getStrongText(shortenAddr(n.metadata.proposer))} and entered the warm-up phase. You have{' '} {getStrongText(getRelativeTime(n.metadata.displayDuration))} to stake your BOND @@ -71,7 +71,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re return [ 'timer', colorPairs.blue, - + Voting on proposal {getProposalLink(n.metadata.proposalId)} starts in {getStrongText('5 minutes')} , ]; @@ -79,7 +79,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re return [ 'file-failed', colorPairs.red, - + Proposal {getProposalLink(n.metadata.proposalId)} has been cancelled by{' '} {shortenAddr(n.metadata.caller)} @@ -90,7 +90,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re return [ 'judge', colorPairs.blue, - + Proposal {getProposalLink(n.metadata.proposalId)} has entered the voting period. You have{' '} {getStrongText(getRelativeTime(n.metadata.displayDuration))} to cast your vote , @@ -99,7 +99,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re return [ 'judge', colorPairs.red, - + Voting on proposal {getProposalLink(n.metadata.proposalId)} ends in {getStrongText('5 minutes')} , ]; @@ -107,7 +107,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re return [ 'file-clock', colorPairs.blue, - + {n.message} , ]; @@ -115,7 +115,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re return [ 'file-clock', colorPairs.blue, - + Proposal {getProposalLink(n.metadata.proposalId)} has been accepted with{' '} {getStrongText(`${n.metadata.votedRatio}%`)} votes for. You have{' '} {getStrongText(getRelativeTime(n.metadata.displayDuration))} to queue it for execution @@ -125,7 +125,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re return [ 'file-failed', colorPairs.red, - + Proposal {getProposalLink(n.metadata.proposalId)} has not met quorum and has been rejected , ]; @@ -133,7 +133,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re return [ 'file-failed', colorPairs.red, - + Proposal {getProposalLink(n.metadata.proposalId)} has been rejected with {n.metadata.votedRatio}% votes against , @@ -142,7 +142,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re return [ 'queue', colorPairs.blue, - + Proposal {getProposalLink(n.metadata.proposalId)} has been queued for execution by{' '} {getStrongText(shortenAddr(n.metadata.caller))}. You have{' '} {getStrongText(getRelativeTime(n.metadata.displayDuration))} to create an abrogation proposal @@ -152,7 +152,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re return [ 'queue', colorPairs.red, - + Queue period on proposal {getProposalLink(n.metadata.proposalId)} ends in {getStrongText('5 minutes')} , ]; @@ -160,7 +160,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re return [ 'gear', colorPairs.blue, - + Proposal {getProposalLink(n.metadata.proposalId)} has passed the queue period. You have{' '} {getStrongText(getRelativeTime(n.metadata.displayDuration))} to execute it , @@ -169,7 +169,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re return [ 'file-check', colorPairs.green, - + Proposal {getProposalLink(n.metadata.proposalId)} has been executed by{' '} {getStrongText(shortenAddr(n.metadata.caller))} , @@ -178,7 +178,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re return [ 'docs', colorPairs.red, - + Proposal {getProposalLink(n.metadata.proposalId)} expires in {getStrongText('5 minutes')} , ]; @@ -186,7 +186,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re return [ 'file-failed', colorPairs.red, - + Proposal {getProposalLink(n.metadata.proposalId)} has expired , ]; @@ -194,7 +194,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re return [ 'proposal-canceled', colorPairs.blue, - + Abrogation proposal for proposal {getProposalLink(n.metadata.proposalId)} has been created by{' '} {getStrongText(shortenAddr(n.metadata.proposer))}. You have{' '} {getStrongText(getRelativeTime(n.metadata.displayDuration))} to vote on the abrogation proposal @@ -204,7 +204,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re return [ 'file-failed', colorPairs.red, - + Proposal {getProposalLink(n.metadata.proposalId)} has been abrogated , ]; @@ -212,7 +212,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re return [ 'delegated', colorPairs.blue, - + {getStrongText( `${getHumanValue(new BigNumber(n.metadata.amount ?? 0), knownTokens.projectToken.decimals)?.toFixed()} v${ knownTokens.projectToken.symbol @@ -242,7 +242,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re 'stake', colorPairs.blue, <> - + Stake your{' '} {getStrongText( `${formatToken(BigNumber.from(n.metadata.amount)?.unscaleBy(erc20Contract.decimals)) ?? '-'} ${ @@ -264,7 +264,7 @@ function useGetData(n: NotificationType): [IconNames, [string, string], React.Re return [ 'bell', colorPairs.blue, - + {/* @ts-ignore */} {n.message} , diff --git a/src/components/custom/notification/s.module.scss b/src/components/custom/notification/s.module.scss index 8ef21df5..ec3e9ac3 100644 --- a/src/components/custom/notification/s.module.scss +++ b/src/components/custom/notification/s.module.scss @@ -36,7 +36,7 @@ } .time { - font: var(--font-sm); + font: var(--font-caption); font-weight: 600; color: var(--theme-icon-color); margin-left: auto; diff --git a/src/components/custom/status-tag/index.tsx b/src/components/custom/status-tag/index.tsx index 1b3e9e94..6279dbc3 100644 --- a/src/components/custom/status-tag/index.tsx +++ b/src/components/custom/status-tag/index.tsx @@ -17,7 +17,7 @@ const StatusTag: React.FC = props => { return (
- + {text}
diff --git a/src/components/custom/table/index.tsx b/src/components/custom/table/index.tsx index 62cb3c9c..fedff9ab 100644 --- a/src/components/custom/table/index.tsx +++ b/src/components/custom/table/index.tsx @@ -102,7 +102,7 @@ export const TableFooter: React.FC = ({ children, text, total, return (
{generatedText ? ( - + {generatedText} ) : null} diff --git a/src/components/custom/tabs/s.module.scss b/src/components/custom/tabs/s.module.scss index 2d2f19c9..196d07c7 100644 --- a/src/components/custom/tabs/s.module.scss +++ b/src/components/custom/tabs/s.module.scss @@ -24,7 +24,7 @@ } .tab { - font: var(--font-p1); + font: var(--font-body1); font-weight: 600; // margin-right: 32px; color: var(--theme-secondary-color); @@ -143,7 +143,7 @@ a.tab { } .elasticTab { - font: var(--font-sm); + font: var(--font-caption); font-weight: 600; color: var(--theme-secondary-color); display: flex; diff --git a/src/components/custom/token-amount-new/index.tsx b/src/components/custom/token-amount-new/index.tsx index b6d0dab9..9485d05f 100644 --- a/src/components/custom/token-amount-new/index.tsx +++ b/src/components/custom/token-amount-new/index.tsx @@ -80,7 +80,7 @@ export const TokenAmount: FC = forwardRef {!!errors.length && errors.map((error, idx) => ( - + {error} ))} @@ -170,7 +170,7 @@ export const TokenSelect: FC = ({ value, onChange, tokens, clas className={cn(s.tokenAmountSelectToken, className)} style={style}> {foundToken ? : null} - + {foundToken?.symbol} = props type="number" className={s.deadlineInput} suffix={ - + minutes } @@ -143,7 +143,7 @@ const TransactionDetails: React.FC = props => { return (
- + {props.children} = props => { {showSlippage && (
- + Slippage tolerance - + {slippage}%
@@ -182,11 +182,11 @@ const TransactionDetails: React.FC = props => { {showDeadline && (
- + Transaction deadline - + {deadline} minutes
diff --git a/src/components/custom/transaction-summary/index.tsx b/src/components/custom/transaction-summary/index.tsx index c4a102e5..3cf27f61 100644 --- a/src/components/custom/transaction-summary/index.tsx +++ b/src/components/custom/transaction-summary/index.tsx @@ -17,7 +17,7 @@ export const TransactionSummary: React.FC = ({ items, heading, classN {heading ? ( heading ) : ( - + Transaction summary )} diff --git a/src/components/custom/typography/index.tsx b/src/components/custom/typography/index.tsx index 25b6439c..e50e681f 100644 --- a/src/components/custom/typography/index.tsx +++ b/src/components/custom/typography/index.tsx @@ -8,7 +8,7 @@ import s from './s.module.scss'; export type TextProps = { tag?: keyof JSX.IntrinsicElements; - type: 'h1' | 'h2' | 'h3' | 'p1' | 'p2' | 'lb1' | 'lb2' | 'small'; + type: 'h1' | 'h2' | 'h3' | 'body1' | 'body2' | 'caption'; weight?: 'semibold' | 'bold'; color?: 'primary' | 'secondary' | 'red' | 'green' | 'blue' | 'purple' | 'yellow'; align?: 'left' | 'center' | 'right'; @@ -42,7 +42,7 @@ export const Text: React.FC = React.memo(props => { return tooltip ? ( @@ -75,7 +75,7 @@ export const Hint: React.FC = props => { {children} diff --git a/src/components/custom/typography/s.module.scss b/src/components/custom/typography/s.module.scss index 55ca6fe3..7d3175d6 100644 --- a/src/components/custom/typography/s.module.scss +++ b/src/components/custom/typography/s.module.scss @@ -19,24 +19,16 @@ font: var(--font-h3); } - &.p1 { - font: var(--font-p1); + &.body1 { + font: var(--font-body1); } - &.p2 { - font: var(--font-p2); + &.body2 { + font: var(--font-body2); } - &.lb1 { - font: var(--font-lb1); - } - - &.lb2 { - font: var(--font-lb2); - } - - &.small { - font: var(--font-sm); + &.caption { + font: var(--font-caption); } &.primary-color { diff --git a/src/components/input/s.module.scss b/src/components/input/s.module.scss index 39e7e24b..b94e426a 100644 --- a/src/components/input/s.module.scss +++ b/src/components/input/s.module.scss @@ -7,7 +7,7 @@ } .input { - font: var(--font-p1); + font: var(--font-body1); font-weight: 600; border: 0; padding: 11px 12px; diff --git a/src/components/portfolio-balance/index.tsx b/src/components/portfolio-balance/index.tsx index 2cc10545..cb508a3f 100644 --- a/src/components/portfolio-balance/index.tsx +++ b/src/components/portfolio-balance/index.tsx @@ -42,14 +42,14 @@ const PortfolioBalance: React.FC = (props: Props) => { return (
- + Portfolio balance
- + Total balance @@ -60,11 +60,11 @@ const PortfolioBalance: React.FC = (props: Props) => { {aggregated !== null && (
- + Aggregated APY - + {formatPercent(aggregated)} {Boolean(aggregatedApr) && ( @@ -87,18 +87,18 @@ const PortfolioBalance: React.FC = (props: Props) => { />
- + {label1} - + {formatUSDValue(value1)}
- + {label2} - + {formatUSDValue(value2)}
@@ -122,20 +122,20 @@ const PortfolioBalance: React.FC = (props: Props) => {
- + {label3} - + {formatUSDValue(value3)}
- + {label4} - + {formatUSDValue(value4)}
diff --git a/src/components/providers/web3Provider.tsx b/src/components/providers/web3Provider.tsx index 07c43fd7..1f77cd50 100644 --- a/src/components/providers/web3Provider.tsx +++ b/src/components/providers/web3Provider.tsx @@ -231,11 +231,11 @@ const Web3Provider: FC = props => { onClick={() => switchNetwork(network.id)}>
- + {network.meta.name} {network === activeNetwork && ( - + Connected )} diff --git a/src/components/warning/index.tsx b/src/components/warning/index.tsx index 1d4cab38..cd186c73 100644 --- a/src/components/warning/index.tsx +++ b/src/components/warning/index.tsx @@ -34,7 +34,7 @@ const Warn: React.FC = props => {
- + {text} diff --git a/src/layout/components/layout-footer/index.tsx b/src/layout/components/layout-footer/index.tsx index 8e7d09c0..7cd7dac8 100644 --- a/src/layout/components/layout-footer/index.tsx +++ b/src/layout/components/layout-footer/index.tsx @@ -19,7 +19,7 @@ const LayoutFooter: React.FC = () => { - + A fluctuations derivatives protocol for hedging yield sensitivity and market price.
@@ -30,7 +30,7 @@ const LayoutFooter: React.FC = () => {
- + DAO
    @@ -57,7 +57,7 @@ const LayoutFooter: React.FC = () => {
- + SMART Products
    @@ -79,7 +79,7 @@ const LayoutFooter: React.FC = () => {
- + INFO
    @@ -103,7 +103,7 @@ const LayoutFooter: React.FC = () => {
- + BarnBridge © {new Date().getFullYear()}
diff --git a/src/layout/components/layout-footer/s.module.scss b/src/layout/components/layout-footer/s.module.scss index 27c7d3a9..aff127ca 100644 --- a/src/layout/components/layout-footer/s.module.scss +++ b/src/layout/components/layout-footer/s.module.scss @@ -46,7 +46,7 @@ } a { - font: var(--font-p2-semibold) !important; + font: var(--font-body2-semibold) !important; } } @@ -81,6 +81,6 @@ gap: 16px 24px; a { - font: var(--font-sm-semibold) !important; + font: var(--font-caption-semibold) !important; } } diff --git a/src/layout/components/layout-header/index.tsx b/src/layout/components/layout-header/index.tsx index 08eb4b33..06a7900b 100644 --- a/src/layout/components/layout-header/index.tsx +++ b/src/layout/components/layout-header/index.tsx @@ -84,7 +84,7 @@ const PositionsAction: React.FC = () => { content={
- + Queued positions
@@ -97,10 +97,10 @@ const PositionsAction: React.FC = () => {
  • - + {item.poolName} - + {`${item.tranche === 'SENIOR' ? 'Senior' : 'Junior'} ${item.queueType} queue`}
    @@ -165,7 +165,7 @@ const NetworkAction: React.FC = () => { onClick={() => showNetworkSelect()} className={cn(s.actionButton, 'hidden-mobile hidden-tablet')}> - + {activeNetwork.meta.name} @@ -197,7 +197,7 @@ const WalletAction: React.FC = () => { )} - + {wallet.ens.name || shortenAddr(wallet.account, 8, 8)} @@ -205,7 +205,7 @@ const WalletAction: React.FC = () => {
    - + Status @@ -214,10 +214,10 @@ const WalletAction: React.FC = () => {
    - + Wallet - + {wallet.connecting?.name}
    @@ -267,7 +267,7 @@ const WalletAction: React.FC = () => { )} - + {wallet.ens.name || shortenAddr(wallet.account, 8, 8)} @@ -275,7 +275,7 @@ const WalletAction: React.FC = () => {
    - + Status @@ -284,19 +284,19 @@ const WalletAction: React.FC = () => {
    - + Wallet - + {wallet.meta?.name}
    - + Network - + {activeNetwork.meta.name}
    diff --git a/src/layout/components/layout-header/s.module.scss b/src/layout/components/layout-header/s.module.scss index 5ad2dd07..65889b17 100644 --- a/src/layout/components/layout-header/s.module.scss +++ b/src/layout/components/layout-header/s.module.scss @@ -64,7 +64,7 @@ background: var(--theme-body-color); border-radius: 4px; border: 0; - font: var(--font-p2-semibold); + font: var(--font-body2-semibold); color: var(--theme-secondary-color); display: flex; align-items: center; diff --git a/src/layout/components/layout-side-nav/index.tsx b/src/layout/components/layout-side-nav/index.tsx index d1bada02..0b6abf60 100644 --- a/src/layout/components/layout-side-nav/index.tsx +++ b/src/layout/components/layout-side-nav/index.tsx @@ -59,10 +59,10 @@ const LayoutSideNav: React.FC = () => {
    - + DAO - + Faucets
    @@ -74,10 +74,10 @@ const LayoutSideNav: React.FC = () => {
    - + DAO - + Yield Farming
    @@ -89,10 +89,10 @@ const LayoutSideNav: React.FC = () => {
    - + DAO - + Governance
    @@ -104,10 +104,10 @@ const LayoutSideNav: React.FC = () => {
    - + SMART - + Yield
    @@ -119,10 +119,10 @@ const LayoutSideNav: React.FC = () => {
    - + SMART - + Alpha
    @@ -134,10 +134,10 @@ const LayoutSideNav: React.FC = () => {
    - + SMART - + Exposure
    @@ -194,7 +194,7 @@ const NotificationsAction: React.FC<{ displayTooltip: boolean }> = ({ displayToo
    - + Notifications
    @@ -213,7 +213,7 @@ const NetworkAction: React.FC<{ displayTooltip: boolean }> = ({ displayTooltip } - + {activeNetwork.meta.name} @@ -244,7 +244,7 @@ const ToggleThemeButton = ({ displayTooltip }: { displayTooltip: boolean }) => {
    - + {text}
    diff --git a/src/modules/faucets/views/faucet-list-view/index.tsx b/src/modules/faucets/views/faucet-list-view/index.tsx index d0adcdcc..916fa17a 100644 --- a/src/modules/faucets/views/faucet-list-view/index.tsx +++ b/src/modules/faucets/views/faucet-list-view/index.tsx @@ -26,10 +26,12 @@ const columns: ColumnType[] = [ className="mr-16" />
    -
    {item.name}
    - {item.label &&
    {item.label}
    } +
    {item.name}
    + {item.label &&
    {item.label}
    } {item.markets && ( -
    {item.markets.map(m => m.name).join(' / ')}
    +
    + {item.markets.map(m => m.name).join(' / ')} +
    )}
    @@ -42,7 +44,7 @@ const columns: ColumnType[] = [ render: function YourBalance(item) { const wallet = useWallet(); return ( -
    +
    {formatToken((item.name === 'kETH' ? wallet.ethBalance : item.token?.balance)?.unscaleBy(item.decimals)) ?? '-'}
    diff --git a/src/modules/governance/components/add-zeros-popup/index.tsx b/src/modules/governance/components/add-zeros-popup/index.tsx index 82c4aeb9..8d59dbe4 100644 --- a/src/modules/governance/components/add-zeros-popup/index.tsx +++ b/src/modules/governance/components/add-zeros-popup/index.tsx @@ -41,7 +41,7 @@ const AddZerosPopup: React.FC = props => { const content = ( - + Number of zeros @@ -57,7 +57,7 @@ const AddZerosPopup: React.FC = props => { - + Use the options above to add trailing zeros to the input amount. diff --git a/src/modules/governance/components/create-proposal-action-modal/index.tsx b/src/modules/governance/components/create-proposal-action-modal/index.tsx index b535efb6..7f9f8b5d 100644 --- a/src/modules/governance/components/create-proposal-action-modal/index.tsx +++ b/src/modules/governance/components/create-proposal-action-modal/index.tsx @@ -339,7 +339,7 @@ const CreateProposalActionModal: React.FC = prop - + Is this a proxy address? @@ -385,7 +385,7 @@ const CreateProposalActionModal: React.FC = prop name="actionValue" label={ - + Action Value = prop name={['functionParams', input.name]} label={ - + {input.name} ({input.type}) {/(u?int\d+)/g.test(input.type) && ( diff --git a/src/modules/governance/components/proposal-action-card/index.tsx b/src/modules/governance/components/proposal-action-card/index.tsx index b053a0da..e67d29f7 100644 --- a/src/modules/governance/components/proposal-action-card/index.tsx +++ b/src/modules/governance/components/proposal-action-card/index.tsx @@ -64,7 +64,7 @@ const ProposalActionCard: React.FC = props => { key: 'sig', icon: , title: ( - + {isSignature ? 'Show transaction' : 'Show function signature'} ), @@ -78,7 +78,7 @@ const ProposalActionCard: React.FC = props => { key: 'delete', icon: , title: ( - + Delete action ), @@ -115,7 +115,7 @@ const ProposalActionCard: React.FC = props => { + {title} } @@ -126,7 +126,7 @@ const ProposalActionCard: React.FC = props => { ) : ( @@ -136,7 +136,7 @@ const ProposalActionCard: React.FC = props => { ellipsis || expanded ? ( @@ -146,7 +146,7 @@ const ProposalActionCard: React.FC = props => { {...cardProps}>
    - + {shortenAddr(target)} diff --git a/src/modules/governance/components/proposal-action-card/s.module.scss b/src/modules/governance/components/proposal-action-card/s.module.scss index ac3a18de..d050a08d 100644 --- a/src/modules/governance/components/proposal-action-card/s.module.scss +++ b/src/modules/governance/components/proposal-action-card/s.module.scss @@ -8,7 +8,7 @@ } div.paragraph:global(.ant-typography) { - font: var(--font-p1); + font: var(--font-body1); margin: 0; color: var(--theme-primary-color); diff --git a/src/modules/governance/components/simulated-proposal-action-modal/index.tsx b/src/modules/governance/components/simulated-proposal-action-modal/index.tsx index e99f0eee..b79037e8 100644 --- a/src/modules/governance/components/simulated-proposal-action-modal/index.tsx +++ b/src/modules/governance/components/simulated-proposal-action-modal/index.tsx @@ -26,7 +26,7 @@ const SimulatedProposalActionModal: React.FC Action could not be simulated - + We run a simulation for every action before adding it to the proposal. The following action failed to simulate: @@ -38,7 +38,7 @@ const SimulatedProposalActionModal: React.FC signature={functionSignature} callData={functionEncodedParams} /> - + If you think this is a mistake, you can still add this action to the proposal. diff --git a/src/modules/governance/components/voting-detailed-modal/s.module.scss b/src/modules/governance/components/voting-detailed-modal/s.module.scss index 825a9f1f..52568c89 100644 --- a/src/modules/governance/components/voting-detailed-modal/s.module.scss +++ b/src/modules/governance/components/voting-detailed-modal/s.module.scss @@ -17,7 +17,7 @@ } .row { - font: var(--font-p1); + font: var(--font-body1); font-weight: 600; padding: 16px 32px; display: flex; diff --git a/src/modules/governance/components/voting-header/index.tsx b/src/modules/governance/components/voting-header/index.tsx index ee428ecd..a4299b45 100644 --- a/src/modules/governance/components/voting-header/index.tsx +++ b/src/modules/governance/components/voting-header/index.tsx @@ -81,12 +81,12 @@ const VotingHeader: React.FC = () => { return (
    - + My Voting Power
    - + Current reward @@ -107,7 +107,7 @@ const VotingHeader: React.FC = () => {
    - + {projectToken.symbol} Balance @@ -120,7 +120,7 @@ const VotingHeader: React.FC = () => {
    - + Total voting power @@ -146,19 +146,19 @@ const VotingHeader: React.FC = () => { - + The multiplier mechanic allows users to lock ${projectToken.symbol} for a period up to 1 year and get a bonus of up to 2x v{projectToken.symbol}. The bonus is linear, as per the following example:
    • - + lock 1000 ${projectToken.symbol} for 1 year → get back 2000 v{projectToken.symbol}
    • - + lock 1000 ${projectToken.symbol} for 6 months → get back 1500 v{projectToken.symbol}
      • @@ -171,18 +171,18 @@ const VotingHeader: React.FC = () => { } className="mb-4"> - + Multiplier & Lock timer - + {inRange(multiplier, 1, 1.01) ? '>' : ''} {formatBigValue(leftMultiplier, 2, '-', 2)}x - + for @@ -202,7 +202,7 @@ const VotingHeader: React.FC = () => { Claim your reward - + Select the reward contract you want to claim your reward from
    @@ -217,14 +217,14 @@ const VotingHeader: React.FC = () => { disabled={!!claimingReward || !reward?.toClaim?.gt(BigNumber.ZERO)} onClick={() => handleRewardClaim(reward)}>
    - + Reward contract {rewardIndex + 1}
    - + Reward - + {formatToken(reward?.toClaim, { tokenName: projectToken.symbol, })} diff --git a/src/modules/governance/views/overview-view/components/activation-threshold/index.tsx b/src/modules/governance/views/overview-view/components/activation-threshold/index.tsx index d4c62c52..5390ae2e 100644 --- a/src/modules/governance/views/overview-view/components/activation-threshold/index.tsx +++ b/src/modules/governance/views/overview-view/components/activation-threshold/index.tsx @@ -38,12 +38,12 @@ const ActivationThreshold: React.FC = props => { + For the DAO to be activated, a threshold of {formatToken(config.dao?.activationThreshold)} $ {projectToken.symbol} tokens staked has to be met. }> - + Activation threshold @@ -61,10 +61,10 @@ const ActivationThreshold: React.FC = props => { - + {formatToken(daoCtx.bondStaked)} - + / {formatToken(config.dao?.activationThreshold)} already staked. diff --git a/src/modules/governance/views/overview-view/components/voters-table/index.tsx b/src/modules/governance/views/overview-view/components/voters-table/index.tsx index 072ce796..92f6c3ac 100644 --- a/src/modules/governance/views/overview-view/components/voters-table/index.tsx +++ b/src/modules/governance/views/overview-view/components/voters-table/index.tsx @@ -19,10 +19,10 @@ const Columns: ColumnsType = [
    - + {value} - + {shortenAddr(value)} @@ -36,7 +36,7 @@ const Columns: ColumnsType = [ width: 200, align: 'right', render: (value: BigNumber) => ( - + {formatBigValue(value, 2, '-', 2)} ), @@ -47,7 +47,7 @@ const Columns: ColumnsType = [ width: 200, align: 'right', render: (value: BigNumber) => ( - + {formatBigValue(value, 2, '-', 2)} ), @@ -58,7 +58,7 @@ const Columns: ColumnsType = [ width: 150, align: 'right', render: (value: number) => ( - + {value} ), @@ -69,7 +69,7 @@ const Columns: ColumnsType = [ width: 150, align: 'right', render: (value: number) => ( - + {value} ), @@ -108,7 +108,7 @@ const VotersTable: React.FC = props => { return (
    - + Voter weights
    @@ -124,10 +124,10 @@ const VotersTable: React.FC = props => { position: ['bottomRight'], showTotal: (total: number, [from, to]: [number, number]) => ( <> - + Showing {from} to {to} out of {total} stakers - + {from}..{to} of {total} diff --git a/src/modules/governance/views/overview-view/components/voting-stat-list/index.tsx b/src/modules/governance/views/overview-view/components/voting-stat-list/index.tsx index 06b06a83..07865665 100644 --- a/src/modules/governance/views/overview-view/components/voting-stat-list/index.tsx +++ b/src/modules/governance/views/overview-view/components/voting-stat-list/index.tsx @@ -45,12 +45,12 @@ const VotingStatList: React.FC = props => { + This number shows the amount of ${projectToken.symbol} (and their USD value) currently staked in the DAO. }> - + {projectToken.symbol} Staked @@ -59,7 +59,7 @@ const VotingStatList: React.FC = props => { {formatToken(daoCtx.daoBarn.bondStaked)} - + {projectToken.symbol} = props => { - + {formatUSD(convertTokenInUSD(daoCtx.daoBarn.bondStaked, projectToken.symbol))} @@ -90,7 +90,7 @@ const VotingStatList: React.FC = props => { - + This number shows the amount of v{projectToken.symbol} currently minted. This number may differ from the amount of ${projectToken.symbol} staked because of the multiplier mechanic @@ -102,7 +102,7 @@ const VotingStatList: React.FC = props => { }> - + V{capitalize(projectToken.symbol)} @@ -119,7 +119,7 @@ const VotingStatList: React.FC = props => { - + This counter shows the average amount of time ${projectToken.symbol} stakers locked their deposits in order to take advantage of the voting power bonus. @@ -131,7 +131,7 @@ const VotingStatList: React.FC = props => { }> - + Avg. Lock Time @@ -139,7 +139,7 @@ const VotingStatList: React.FC = props => { {overview?.avgLockTimeSeconds ? getFormattedDuration(overview?.avgLockTimeSeconds) : '-'} - + average time @@ -151,13 +151,13 @@ const VotingStatList: React.FC = props => { + This number shows the ${projectToken.symbol} token rewards distributed so far out of the total of{' '} {formatToken(daoCtx.daoReward.pullFeature?.totalAmount)} that are going to be available for the DAO Staking. }> - + {projectToken.symbol} Rewards @@ -169,7 +169,7 @@ const VotingStatList: React.FC = props => { )} - + out of {formatToken(daoCtx.daoReward.pullFeature?.totalAmount)} @@ -182,7 +182,7 @@ const VotingStatList: React.FC = props => { - + This number shows the amount of v{projectToken.symbol} that is delegated to other addresses. = props => { }> - + Delegated @@ -201,7 +201,7 @@ const VotingStatList: React.FC = props => { {formatToken(overview?.totalDelegatedPower)} - + out of{' '} {formatToken((projectToken.contract as Erc20Contract).totalSupply?.unscaleBy(projectToken.decimals))} @@ -213,12 +213,12 @@ const VotingStatList: React.FC = props => { + This card shows the number of holders of ${projectToken.symbol} and compares it to the number of stakers and voters in the DAO. }> - + Addresses @@ -227,11 +227,11 @@ const VotingStatList: React.FC = props => { {overview?.holdersStakingExcluded} - + holders - + {overview?.barnUsers} stakers & {overview?.voters} voters @@ -242,7 +242,7 @@ const VotingStatList: React.FC = props => { <>
    - + Annual Percentage Rate (APR) @@ -254,7 +254,7 @@ const VotingStatList: React.FC = props => {
    - + Weekly {ProjectToken.symbol} Rewards diff --git a/src/modules/governance/views/portfolio-view/portfolio-delegate/index.tsx b/src/modules/governance/views/portfolio-view/portfolio-delegate/index.tsx index 4a42729c..5a366bd8 100644 --- a/src/modules/governance/views/portfolio-view/portfolio-delegate/index.tsx +++ b/src/modules/governance/views/portfolio-view/portfolio-delegate/index.tsx @@ -151,23 +151,23 @@ const PortfolioDelegate: FC = () => {
    - + Current voting type
    - + {isDelegated ? 'Delegate voting' : 'Manual voting'}
    {isDelegated && (
    - + Delegated address
    - + {shortenAddr(userDelegatedTo)} @@ -182,7 +182,7 @@ const PortfolioDelegate: FC = () => { selected={field.value === MANUAL_KEY} onClick={() => form.updateValue('votingType', MANUAL_KEY)}>
    - + Manual voting {field.value === MANUAL_KEY && } @@ -192,7 +192,7 @@ const PortfolioDelegate: FC = () => { selected={field.value === DELEGATED_KEY} onClick={() => form.updateValue('votingType', DELEGATED_KEY)}>
    - + Delegate voting {field.value === DELEGATED_KEY && } @@ -225,23 +225,23 @@ const PortfolioDelegate: FC = () => { votingType === DELEGATED_KEY ? (
    - + Delegate {projectToken.symbol} amount
    - + {formatToken(bondBalance) ?? '-'}
    - + Delegate address
    - + {shortenAddr(delegateAddress)}
    diff --git a/src/modules/governance/views/portfolio-view/portfolio-deposit/components/wallet-deposit-confirm-modal/index.tsx b/src/modules/governance/views/portfolio-view/portfolio-deposit/components/wallet-deposit-confirm-modal/index.tsx index 9cc4eccf..9edd6feb 100644 --- a/src/modules/governance/views/portfolio-view/portfolio-deposit/components/wallet-deposit-confirm-modal/index.tsx +++ b/src/modules/governance/views/portfolio-view/portfolio-deposit/components/wallet-deposit-confirm-modal/index.tsx @@ -31,12 +31,12 @@ const WalletDepositConfirmModal: React.FC = prop Are you sure you want to deposit?     - + You are about to deposit {formatToken(deposit)} ${projectToken.symbol}.
    You have an active lock for {getFormattedDuration(0, lockDuration)}.     - + All deposits you make until the lock timer ends will be locked for the same duration. diff --git a/src/modules/governance/views/portfolio-view/portfolio-deposit/index.tsx b/src/modules/governance/views/portfolio-view/portfolio-deposit/index.tsx index 0f68c86a..dffe7fde 100644 --- a/src/modules/governance/views/portfolio-view/portfolio-deposit/index.tsx +++ b/src/modules/governance/views/portfolio-view/portfolio-deposit/index.tsx @@ -149,22 +149,22 @@ const PortfolioDeposit: FC = () => {
    - + Portfolio balance
    - + {formatToken(stakedBalance) ?? '-'}
    - + Wallet balance
    - + {formatToken(bondBalance) ?? '-'} @@ -217,11 +217,11 @@ const PortfolioDeposit: FC = () => { title="Confirm deposit" header={
    - + Deposit amount
    - + {formatToken(bnAmount, { decimals: projectToken.decimals, })} diff --git a/src/modules/governance/views/portfolio-view/portfolio-lock/components/wallet-lock-chart/index.tsx b/src/modules/governance/views/portfolio-view/portfolio-lock/components/wallet-lock-chart/index.tsx index 88848b8a..012224e0 100644 --- a/src/modules/governance/views/portfolio-view/portfolio-lock/components/wallet-lock-chart/index.tsx +++ b/src/modules/governance/views/portfolio-view/portfolio-lock/components/wallet-lock-chart/index.tsx @@ -176,22 +176,22 @@ const WalletLockChart: React.FC = props => { - + The multiplier mechanic allows users to lock ${projectToken.symbol} for a period up to 1 year and get a bonus of up to 2x v{projectToken.symbol}. The bonus is linear, as per the following example:
    • - lock 1000 ${projectToken.symbol} for 1 year → get back 2000 vBOND + lock 1000 ${projectToken.symbol} for 1 year → get back 2000 vBOND
    • - lock 1000 ${projectToken.symbol} for 6 months → get back 1500 vBOND + lock 1000 ${projectToken.symbol} for 6 months → get back 1500 vBOND
    Learn more }> - + {formatToken(myBonus)} v{projectToken.symbol} bonus - {inRange(multiplier, 1, 1.01) ? '>' : ''} diff --git a/src/modules/governance/views/portfolio-view/portfolio-lock/components/wallet-lock-confirm-modal/index.tsx b/src/modules/governance/views/portfolio-view/portfolio-lock/components/wallet-lock-confirm-modal/index.tsx index 74452e6a..fde1e9d7 100644 --- a/src/modules/governance/views/portfolio-view/portfolio-lock/components/wallet-lock-confirm-modal/index.tsx +++ b/src/modules/governance/views/portfolio-view/portfolio-lock/components/wallet-lock-confirm-modal/index.tsx @@ -27,7 +27,7 @@ const WalletLockConfirmModal: React.FC = props => { Are you sure you want to lock your balance? - + You are about to lock {formatToken(balance)} $BOND for {getFormattedDuration(0, duration)}.

    @@ -41,7 +41,7 @@ const WalletLockConfirmModal: React.FC = props => {

    - + The multiplier you get for locking tokens only applies to your voting power, it does not earn more rewards. diff --git a/src/modules/governance/views/portfolio-view/portfolio-lock/index.tsx b/src/modules/governance/views/portfolio-view/portfolio-lock/index.tsx index df541790..79eddfce 100644 --- a/src/modules/governance/views/portfolio-view/portfolio-lock/index.tsx +++ b/src/modules/governance/views/portfolio-view/portfolio-lock/index.tsx @@ -159,24 +159,24 @@ const PortfolioLock: FC = () => {
    - + Portfolio balance
    - + {formatToken(stakedBalance) ?? '-'}
    - + Lock duration
    {leftTime => ( - + {getFormattedDuration(leftTime / 1_000)?.trim() || '0s'} )} @@ -223,7 +223,7 @@ const PortfolioLock: FC = () => { title="Are you sure you want to lock your balance?" header={
    - + You are about to lock{' '} {formatToken(stakedBalance)} {projectToken.symbol} @@ -233,7 +233,7 @@ const PortfolioLock: FC = () => { You cannot undo this or partially lock your balance. Locked tokens will be unavailable for withdrawal until the lock timer ends. All future deposits you make will be locked for the same time. - + The multiplier you get for locking tokens only applies to your voting power, it does not earn more rewards. diff --git a/src/modules/governance/views/portfolio-view/portfolio-withdraw/index.tsx b/src/modules/governance/views/portfolio-view/portfolio-withdraw/index.tsx index 3a8b69de..d9578296 100644 --- a/src/modules/governance/views/portfolio-view/portfolio-withdraw/index.tsx +++ b/src/modules/governance/views/portfolio-view/portfolio-withdraw/index.tsx @@ -115,22 +115,22 @@ const PortfolioWithdraw: FC = () => {
    - + Portfolio balance
    - + {formatToken(stakedBalance) ?? '-'}
    - + Wallet balance
    - + {formatToken(bondBalance) ?? '-'} @@ -163,11 +163,11 @@ const PortfolioWithdraw: FC = () => { title="Confirm withdraw" header={
    - + Withdraw amount
    - + {formatToken(bnAmount, { decimals: projectToken.decimals, })} diff --git a/src/modules/governance/views/proposal-create-view/index.tsx b/src/modules/governance/views/proposal-create-view/index.tsx index 88d3eb0d..04533a1f 100644 --- a/src/modules/governance/views/proposal-create-view/index.tsx +++ b/src/modules/governance/views/proposal-create-view/index.tsx @@ -200,7 +200,7 @@ const ProposalCreateView: React.FC = () => {
    - + Proposal description
    @@ -224,7 +224,7 @@ const ProposalCreateView: React.FC = () => {
    - + Actions
    diff --git a/src/modules/governance/views/proposal-detail-view/components/abrogation-approval-card/index.tsx b/src/modules/governance/views/proposal-detail-view/components/abrogation-approval-card/index.tsx index dbafed75..16eb58e1 100644 --- a/src/modules/governance/views/proposal-detail-view/components/abrogation-approval-card/index.tsx +++ b/src/modules/governance/views/proposal-detail-view/components/abrogation-approval-card/index.tsx @@ -15,17 +15,17 @@ const AbrogationApprovalCard: React.FC = () => {
    - + Abrogation proposal approval
    - + {abrogationCtx.approvalRate?.toFixed(2)}% - + (> {abrogationCtx.acceptanceThreshold}% required) diff --git a/src/modules/governance/views/proposal-detail-view/components/abrogation-details-card/index.tsx b/src/modules/governance/views/proposal-detail-view/components/abrogation-details-card/index.tsx index e0346acc..e3a61346 100644 --- a/src/modules/governance/views/proposal-detail-view/components/abrogation-details-card/index.tsx +++ b/src/modules/governance/views/proposal-detail-view/components/abrogation-details-card/index.tsx @@ -15,20 +15,20 @@ const AbrogationDetailsCard: React.FC = () => { return (
    - + Details
    - + Created by - + {shortenAddr(abrogationCtx.abrogation?.caller)} @@ -38,10 +38,10 @@ const AbrogationDetailsCard: React.FC = () => { - + Description - + {abrogationCtx.abrogation?.description} diff --git a/src/modules/governance/views/proposal-detail-view/components/abrogation-proposal-modal/index.tsx b/src/modules/governance/views/proposal-detail-view/components/abrogation-proposal-modal/index.tsx index 4c40a999..e7df31c9 100644 --- a/src/modules/governance/views/proposal-detail-view/components/abrogation-proposal-modal/index.tsx +++ b/src/modules/governance/views/proposal-detail-view/components/abrogation-proposal-modal/index.tsx @@ -25,7 +25,7 @@ const AbrogationProposalModalInner: React.FC = pro - + Abrogation proposal diff --git a/src/modules/governance/views/proposal-detail-view/components/abrogation-vote-modal/index.tsx b/src/modules/governance/views/proposal-detail-view/components/abrogation-vote-modal/index.tsx index 4508005d..0371f418 100644 --- a/src/modules/governance/views/proposal-detail-view/components/abrogation-vote-modal/index.tsx +++ b/src/modules/governance/views/proposal-detail-view/components/abrogation-vote-modal/index.tsx @@ -126,7 +126,7 @@ const AbrogationVoteModal: React.FC = props => { onFinish={handleSubmit}> {voteState === VoteAbrogationState.VoteInitiate && ( - + {proposalCtx.proposal?.title} @@ -137,46 +137,46 @@ const AbrogationVoteModal: React.FC = props => { {formatBigValue(proposalCtx.votingPower, 2)} - + Votes {(voteState === VoteAbrogationState.VoteFor || voteState === VoteAbrogationState.VoteAgainst) && ( - + You are about to vote {voteState === VoteAbrogationState.VoteFor ? 'FOR' : 'AGAINST'} the abrogation proposal for - + “{proposalCtx.proposal?.title}” - + You can change your vote later. )} {voteState === VoteAbrogationState.VoteChange && ( - + You are about to change your vote on the abrogation proposal for - + “{proposalCtx.proposal?.title}” - + Are you sure you want to continue? You can change your vote again later. )} {voteState === VoteAbrogationState.VoteCancel && ( - + You are about to cancel your vote on the abrogation proposal for - + “{proposalCtx.proposal?.title}&dquo; - + Are you sure you want to continue? You can change your vote again later. @@ -196,7 +196,7 @@ const AbrogationVoteModal: React.FC = props => { + For } @@ -204,7 +204,7 @@ const AbrogationVoteModal: React.FC = props => { /> + Against } diff --git a/src/modules/governance/views/proposal-detail-view/components/abrogation-vote-results-card/index.tsx b/src/modules/governance/views/proposal-detail-view/components/abrogation-vote-results-card/index.tsx index a536dcce..35ca823e 100644 --- a/src/modules/governance/views/proposal-detail-view/components/abrogation-vote-results-card/index.tsx +++ b/src/modules/governance/views/proposal-detail-view/components/abrogation-vote-results-card/index.tsx @@ -16,7 +16,7 @@ const AbrogationVoteResultsCard: React.FC = () => { <>
    - + Vote results
    @@ -80,7 +80,7 @@ const columns: ColumnType[] = [ alignItems: 'center', }}> - + {againstRate.toFormat(2)}%
    diff --git a/src/modules/governance/views/proposals-view/index.tsx b/src/modules/governance/views/proposals-view/index.tsx index 9b458634..b51c2c2a 100644 --- a/src/modules/governance/views/proposals-view/index.tsx +++ b/src/modules/governance/views/proposals-view/index.tsx @@ -81,7 +81,7 @@ const ProposalsViewInner: React.FC = () => { {hasCreateRestrictions && !canCreateProposal && ( - + You are not able to create a proposal. { overlayStyle={{ width: 520 }} content={ - + There are 2 possible reasons for why you can’t create a proposal:
    • - + You already are the creator of an ongoing proposal
    • - + You don’t have enough voting power to create a proposal. The creator of a proposal needs to have a voting power of at least {daoCtx.minThreshold}% of the amount of $ {ProjectToken.symbol} staked in the DAO. diff --git a/src/modules/governance/views/treasury-view/treasury-fees/index.tsx b/src/modules/governance/views/treasury-view/treasury-fees/index.tsx index c1b44114..bebae4c5 100644 --- a/src/modules/governance/views/treasury-view/treasury-fees/index.tsx +++ b/src/modules/governance/views/treasury-view/treasury-fees/index.tsx @@ -22,7 +22,7 @@ const TreasuryFees: FC = () => { {formatUSD(totalFeesUSD) ?? '-'} - + Total fees accrued diff --git a/src/modules/governance/views/treasury-view/treasury-fees/sa-section.tsx b/src/modules/governance/views/treasury-view/treasury-fees/sa-section.tsx index d0afd4f5..d37e6f79 100644 --- a/src/modules/governance/views/treasury-view/treasury-fees/sa-section.tsx +++ b/src/modules/governance/views/treasury-view/treasury-fees/sa-section.tsx @@ -53,12 +53,12 @@ const columns: ColumnType[] = [
      - + {entity.poolName ?? '-'} - + {entity.poolToken.symbol}
      @@ -72,7 +72,7 @@ const columns: ColumnType[] = [ return (
      - + {entity.network.type}
      @@ -85,7 +85,7 @@ const columns: ColumnType[] = [ return (
      [] = [ compact: true, }) ?? '-'} - + {formatUSD(entity.feesAmountUSDToken) ?? '-'}
      @@ -154,10 +154,10 @@ const columns: ColumnType[] = [
      - + {entity.poolToken.symbol} fee - + {formatToken(feesAmountToken) ?? '-'} @@ -165,11 +165,11 @@ const columns: ColumnType[] = [
      - + Warning
      - + Transferring fees earns no profits for the caller - this function just transfers the fees to the DAO Treasury. Make sure you are willing to spend the gas to send this transaction! @@ -362,18 +362,18 @@ export const SASection = ({
      - + SMART Alpha - + Fees
      - + Total fees accrued - + {formatUSD(total) ?? '-'}
      diff --git a/src/modules/governance/views/treasury-view/treasury-fees/se-section.tsx b/src/modules/governance/views/treasury-view/treasury-fees/se-section.tsx index 34d37f82..c627c6d5 100644 --- a/src/modules/governance/views/treasury-view/treasury-fees/se-section.tsx +++ b/src/modules/governance/views/treasury-view/treasury-fees/se-section.tsx @@ -48,12 +48,12 @@ const columns: ColumnType[] = [
      - + {entity.poolName ?? '-'} - + {entity.tokenA.symbol} – {entity.tokenB.symbol}
      @@ -67,7 +67,7 @@ const columns: ColumnType[] = [ return (
      - + {entity.network.type}
      @@ -80,7 +80,7 @@ const columns: ColumnType[] = [ return (
      [] = [ compact: true, }) ?? '-'} - + {formatUSD(entity.feesAmountUSDTokenA) ?? '-'}
      @@ -105,7 +105,7 @@ const columns: ColumnType[] = [ return (
      [] = [ compact: true, }) ?? '-'} - + {formatUSD(entity.feesAmountUSDTokenB) ?? '-'}
      @@ -175,19 +175,19 @@ const columns: ColumnType[] = [
      - + {entity.tokenA.symbol} fee - + {formatToken(feesAmountTokenA) ?? '-'}
      - + {entity.tokenB.symbol} fee - + {formatToken(feesAmountTokenB) ?? '-'} @@ -195,11 +195,11 @@ const columns: ColumnType[] = [
      - + Warning
      - + Transferring fees earns no profits for the caller - this function just transfers the fees to the DAO Treasury. Make sure you are willing to spend the gas to send this transaction! @@ -367,18 +367,18 @@ export const SESection = ({
      - + SMART Exposure - + Fees
      - + Total fees accrued - + {formatUSD(total) ?? '-'}
      diff --git a/src/modules/governance/views/treasury-view/treasury-fees/sy-section.tsx b/src/modules/governance/views/treasury-view/treasury-fees/sy-section.tsx index d1142c47..20aa538a 100644 --- a/src/modules/governance/views/treasury-view/treasury-fees/sy-section.tsx +++ b/src/modules/governance/views/treasury-view/treasury-fees/sy-section.tsx @@ -49,12 +49,12 @@ const columns: ColumnType[] = [ />
      - + {entity.underlyingSymbol ?? '-'} - + {entity.market?.name ?? '-'}
      @@ -66,7 +66,7 @@ const columns: ColumnType[] = [ render: entity => (
      - + {entity.network.type}
      @@ -78,7 +78,7 @@ const columns: ColumnType[] = [ render: entity => ( <> [] = [ compact: true, }) ?? '-'} - + {formatUSD(entity.feesAmountUSDToken) ?? '-'} @@ -151,11 +151,11 @@ const columns: ColumnType[] = [
      - + Warning
      - + Transferring fees earns no profits for the caller - this function just transfers the fees to the DAO Treasury. Make sure you are willing to spend the gas to send this transaction! @@ -350,18 +350,18 @@ export const SYSection = ({
      - + SMART Yield - + Fees
      - + Total fees accrued - + {formatUSD(total) ?? '-'}
      diff --git a/src/modules/governance/views/treasury-view/treasury-holdings/index.tsx b/src/modules/governance/views/treasury-view/treasury-holdings/index.tsx index ee845f5f..167a873a 100644 --- a/src/modules/governance/views/treasury-view/treasury-holdings/index.tsx +++ b/src/modules/governance/views/treasury-view/treasury-holdings/index.tsx @@ -50,10 +50,10 @@ const Columns: ColumnType[] = [
      - + {entity.tokenSymbol ?? '-'} - + {entity.token?.name ?? '-'}
      @@ -64,7 +64,7 @@ const Columns: ColumnType[] = [ heading: 'Transaction Hash', render: entity => ( - + {shortenAddr(entity.transactionHash)} @@ -74,10 +74,10 @@ const Columns: ColumnType[] = [ heading: 'Date', render: entity => ( <> - + {formatDate(entity.blockTimestamp * 1_000)} - + {formatTime(entity.blockTimestamp * 1_000)} @@ -93,10 +93,10 @@ const Columns: ColumnType[] = [ tokenName: entity.tokenSymbol, })}>
      - + {entity.transactionDirection === 'IN' ? '+' : '-'} {formatToken(entity.amount) ?? '-'} - + {formatUSD(entity.amountUSD) ?? '-'}
      @@ -108,7 +108,7 @@ const Columns: ColumnType[] = [ render: entity => ( - + {entity.transactionDirection === 'IN' ? entity.counterpartyLabel || shortenAddr(entity.counterpartyAddress) : entity.accountLabel || shortenAddr(entity.accountAddress)} @@ -121,7 +121,7 @@ const Columns: ColumnType[] = [ render: entity => ( - + {entity.transactionDirection === 'OUT' ? entity.counterpartyLabel || shortenAddr(entity.counterpartyAddress) : entity.accountLabel || shortenAddr(entity.accountAddress)} @@ -284,7 +284,7 @@ const TreasuryHoldings: FC = () => { style={{ display: 'inline-block' }}> {formatUSD(totalHoldingsUSD, { compact: true }) ?? '-'} - + Total holdings balance
      {
      - + {item.symbol ?? '-'} - + {item.token?.name ?? '-'}
      - + {formatToken(item.balanceAmount) ?? '-'} - + {formatUSD(item.balanceAmountUSD) ?? '-'}
      @@ -324,7 +324,7 @@ const TreasuryHoldings: FC = () => {
      - + Transaction history filters={historyFilters} value={filterValue} onChange={handleFilterChange} /> diff --git a/src/modules/smart-alpha/components/trade/s.module.scss b/src/modules/smart-alpha/components/trade/s.module.scss index 9c9406b2..43e2ebc3 100644 --- a/src/modules/smart-alpha/components/trade/s.module.scss +++ b/src/modules/smart-alpha/components/trade/s.module.scss @@ -27,7 +27,7 @@ grid-template-columns: max-content 1fr; gap: 12px; align-items: center; - font: var(--font-p2-semibold); + font: var(--font-body2-semibold); } .arrowIcon { diff --git a/src/modules/smart-alpha/components/transactions.tsx b/src/modules/smart-alpha/components/transactions.tsx index 510f84bf..c83f0c1a 100644 --- a/src/modules/smart-alpha/components/transactions.tsx +++ b/src/modules/smart-alpha/components/transactions.tsx @@ -92,7 +92,7 @@ export const TransactionsTable = ({ return (
      - + Transaction history @@ -148,7 +148,7 @@ function getColumns(accountAddress?: string): ColumnType[] { className="mr-16" /> - + {item.tokenSymbol} @@ -160,11 +160,11 @@ function getColumns(accountAddress?: string): ColumnType[] { heading: `Side / transaction`, render: item => (
      - + {item.tranche === 'SENIOR' ? 'Senior' : null} {item.tranche === 'JUNIOR' ? 'Junior' : null} - + {transactionTypeLabelMap[item.transactionType] || null}
      @@ -179,11 +179,15 @@ function getColumns(accountAddress?: string): ColumnType[] { return (
      - + {isIncome ? '+' : '-'} {formatToken(BigNumber.from(item.amount))} [] { const date = new Date(item.blockTimestamp * 1000); return ( <> - + {formatDate(date)} - + {formatTime(date)} diff --git a/src/modules/smart-alpha/views/deposit-view/depositForm.tsx b/src/modules/smart-alpha/views/deposit-view/depositForm.tsx index b9de3247..5aaf5c45 100644 --- a/src/modules/smart-alpha/views/deposit-view/depositForm.tsx +++ b/src/modules/smart-alpha/views/deposit-view/depositForm.tsx @@ -127,7 +127,7 @@ export const DepositForm = ({ pool, smartAlphaContract, poolTokenContract }: Pro {isSenior ? 'Senior' : 'Junior'} deposit - + Choose the amount of tokens you want to deposit in the {tranche} side. Make sure you double check the amounts. @@ -136,11 +136,11 @@ export const DepositForm = ({ pool, smartAlphaContract, poolTokenContract }: Pro - + Balance in deposit queue - + {formatToken(depositQueueBalance?.unscaleBy(pool.poolToken.decimals)) ?? '-'} @@ -153,11 +153,11 @@ export const DepositForm = ({ pool, smartAlphaContract, poolTokenContract }: Pro pool.poolToken.symbol } to the deposit queue.`} className="mb-4"> - + Unclaimed {tranche} tokens - + {formatToken(unclaimedTokens?.unscaleBy(pool.poolToken.decimals)) ?? '-'}
      - + {pool.poolToken.symbol} amount - + Your balance of{' '} - + {formatToken(BigNumber.from(tokenState), { decimals: pool.poolToken.decimals })}{' '} {pool.poolToken.symbol} {' '} @@ -223,19 +223,19 @@ export const DepositForm = ({ pool, smartAlphaContract, poolTokenContract }: Pro
      - + Deposited amount - + {formatToken(BigNumber.from(tokenState)) ?? '-'}
      - + Redeemable unclaimed tokens - + {formatToken(unclaimedTokens?.unscaleBy(pool.poolToken.decimals)) ?? '-'} {
      - + {pool.poolName} - + Epoch {pool.state.epoch}
      - + Wallet balance
      - + {formatToken(poolTokenContract?.getBalanceOf()?.unscaleBy(pool.poolToken.decimals)) ?? '-'} - + {pool.poolToken.symbol}
      @@ -126,20 +126,20 @@ const DepositView = () => {
      - + Side - + Senior
      - + Side - + Junior
      diff --git a/src/modules/smart-alpha/views/deposit-view/select.tsx b/src/modules/smart-alpha/views/deposit-view/select.tsx index ff14f9dc..d296efcb 100644 --- a/src/modules/smart-alpha/views/deposit-view/select.tsx +++ b/src/modules/smart-alpha/views/deposit-view/select.tsx @@ -17,20 +17,20 @@ export const SelectTranche = ({ pool }: { pool: PoolApiType }) => { Select your preferred side - + You can choose between senior or junior positions. Be aware of the risk involved and read the warnings before going further. setTranche('senior')}> - + Senior side setTranche('junior')}> - + Junior side diff --git a/src/modules/smart-alpha/views/kpi-option/index.tsx b/src/modules/smart-alpha/views/kpi-option/index.tsx index 3c282d7d..3258a904 100644 --- a/src/modules/smart-alpha/views/kpi-option/index.tsx +++ b/src/modules/smart-alpha/views/kpi-option/index.tsx @@ -114,7 +114,7 @@ const KpiOptionView: FC = () => { size={36} className="mr-16" /> - + {kpiOption.poolToken.symbol}
      diff --git a/src/modules/smart-alpha/views/kpi-option/s.module.scss b/src/modules/smart-alpha/views/kpi-option/s.module.scss index 0e2aa895..14b373a3 100644 --- a/src/modules/smart-alpha/views/kpi-option/s.module.scss +++ b/src/modules/smart-alpha/views/kpi-option/s.module.scss @@ -16,14 +16,14 @@ } dt { - font: var(--font-sm); + font: var(--font-caption); font-weight: 600; color: var(--theme-secondary-color); margin-bottom: 8px; } dd { - font: var(--font-p1); + font: var(--font-body1); font-weight: 600; margin: 0; color: var(--theme-primary-color); diff --git a/src/modules/smart-alpha/views/kpi-option/stake/index.tsx b/src/modules/smart-alpha/views/kpi-option/stake/index.tsx index e9844b3c..3a4f42a4 100644 --- a/src/modules/smart-alpha/views/kpi-option/stake/index.tsx +++ b/src/modules/smart-alpha/views/kpi-option/stake/index.tsx @@ -120,7 +120,7 @@ const StakeForm: FC = ({ kpiOption, kpiContract, poolTokenContra return ( <> - + Amount = ({ kpiOption, kpiContract, poolTokenContra slider placeholder={`0 (Max ${maxAmountUnscaled?.toNumber() ?? 0})`} /> - + {(fieldState.error as any)?.message} @@ -296,7 +296,7 @@ const UnstakeForm: FC = ({ kpiOption, kpiContract, poolTokenCo return ( <> - + Amount = ({ kpiOption, kpiContract, poolTokenCo slider placeholder={`0 (Max ${maxAmountUnscaled?.toNumber() ?? 0})`} /> - + {(fieldState.error as any)?.message} @@ -364,7 +364,7 @@ const UnstakeForm: FC = ({ kpiOption, kpiContract, poolTokenCo header={
      - + Unstake
      @@ -384,7 +384,7 @@ const UnstakeForm: FC = ({ kpiOption, kpiContract, poolTokenCo {isClaimUnstake && (
      - + Claim {kpiOption.rewardTokens.map(token => { @@ -443,7 +443,7 @@ const Stake: FCx = ({ className, kpiOption, kpiContract, poolTokenCo
      - + Staked balance = ({ className, kpiOption, kpiContract, poolTokenCo getAmountInUSD(stakedBalance?.unscaleBy(kpiOption.poolToken.decimals), kpiOption.poolToken.symbol), ) ?? '-' }> - + {formatToken(stakedBalance, { decimals: kpiOption.poolToken.decimals, scale: kpiOption.poolToken.decimals, @@ -461,7 +461,7 @@ const Stake: FCx = ({ className, kpiOption, kpiContract, poolTokenCo
      - + Wallet balance = ({ className, kpiOption, kpiContract, poolTokenCo getAmountInUSD(walletBalance?.unscaleBy(kpiOption.poolToken.decimals), kpiOption.poolToken.symbol), ) ?? '-' }> - + {formatToken(walletBalance, { decimals: kpiOption.poolToken.decimals, scale: kpiOption.poolToken.decimals, diff --git a/src/modules/smart-alpha/views/kpi-option/statistics/index.tsx b/src/modules/smart-alpha/views/kpi-option/statistics/index.tsx index b7ea9086..70de1e15 100644 --- a/src/modules/smart-alpha/views/kpi-option/statistics/index.tsx +++ b/src/modules/smart-alpha/views/kpi-option/statistics/index.tsx @@ -77,7 +77,7 @@ const Statistics: FCx = ({ <>
      - + My statistics
      @@ -171,7 +171,7 @@ const Statistics: FCx = ({ /> + {formatToken(kpiContract.getClaimFor(token.address), { decimals: token.decimals, scale: token.decimals, @@ -195,7 +195,7 @@ const Statistics: FCx = ({
      ); })} - + My current reward{kpiOption.rewardTokens.length! > 1 ? 's' : ''}
      diff --git a/src/modules/smart-alpha/views/kpi-option/statistics/s.module.scss b/src/modules/smart-alpha/views/kpi-option/statistics/s.module.scss index f3157bb3..6262cc9b 100644 --- a/src/modules/smart-alpha/views/kpi-option/statistics/s.module.scss +++ b/src/modules/smart-alpha/views/kpi-option/statistics/s.module.scss @@ -18,13 +18,13 @@ } dt { - font: var(--font-sm); + font: var(--font-caption); font-weight: 600; color: var(--theme-secondary-color); } dd { - font: var(--font-p1); + font: var(--font-body1); font-weight: 600; color: var(--theme-primary-color); margin: 0 0 0 auto; diff --git a/src/modules/smart-alpha/views/kpi-option/transactions/index.tsx b/src/modules/smart-alpha/views/kpi-option/transactions/index.tsx index 6355e768..e0f5a8f5 100644 --- a/src/modules/smart-alpha/views/kpi-option/transactions/index.tsx +++ b/src/modules/smart-alpha/views/kpi-option/transactions/index.tsx @@ -35,10 +35,10 @@ function getColumns(kpiOption: KpiOptionType, isAll: boolean): ColumnType
      - + {entity.transactionType} - + {kpiOption.poolToken.symbol}
      @@ -63,14 +63,14 @@ function getColumns(kpiOption: KpiOptionType, isAll: boolean): ColumnType - + {isStake ? '+' : '-'} {formatToken(amount, { tokenName: kpiOption.poolToken.symbol, }) ?? '-'} - + {formatUSD(amountInUSD)} @@ -83,7 +83,7 @@ function getColumns(kpiOption: KpiOptionType, isAll: boolean): ColumnType ( - + {shortenAddr(entity.userAddress)} @@ -96,11 +96,11 @@ function getColumns(kpiOption: KpiOptionType, isAll: boolean): ColumnType ( <> - + {shortenAddr(entity.transactionHash)} - + {formatDateTime(entity.blockTimestamp * 1_000)} diff --git a/src/modules/smart-alpha/views/kpi-options/kpi-option-card/index.tsx b/src/modules/smart-alpha/views/kpi-options/kpi-option-card/index.tsx index 2deb5dd9..f1c085ff 100644 --- a/src/modules/smart-alpha/views/kpi-options/kpi-option-card/index.tsx +++ b/src/modules/smart-alpha/views/kpi-options/kpi-option-card/index.tsx @@ -107,7 +107,7 @@ export const KpiOptionCard: FC = props => { size={36} className="mr-16" /> - + {kpiOption.poolToken.symbol}
      diff --git a/src/modules/smart-alpha/views/kpi-options/kpi-option-card/s.module.scss b/src/modules/smart-alpha/views/kpi-options/kpi-option-card/s.module.scss index 83c2416c..8c7ed73b 100644 --- a/src/modules/smart-alpha/views/kpi-options/kpi-option-card/s.module.scss +++ b/src/modules/smart-alpha/views/kpi-options/kpi-option-card/s.module.scss @@ -16,7 +16,7 @@ } .endedLabel { - font: var(--font-lb2); + font: var(--font-caption); font-weight: bold; background: rgba(113, 121, 128, 0.08); border-radius: 32px; @@ -33,7 +33,7 @@ } .defRow dt { - font: var(--font-sm); + font: var(--font-caption); font-weight: 600; color: var(--theme-secondary-color); display: flex; @@ -41,7 +41,7 @@ } .defRow dd { - font: var(--font-p1); + font: var(--font-body1); font-weight: 600; margin: 0 0 0 auto; color: var(--theme-primary-color); diff --git a/src/modules/smart-alpha/views/launch/index.tsx b/src/modules/smart-alpha/views/launch/index.tsx index f5d624c3..dca7cfb8 100644 --- a/src/modules/smart-alpha/views/launch/index.tsx +++ b/src/modules/smart-alpha/views/launch/index.tsx @@ -70,7 +70,7 @@ const Launch = ({ launchDate }: { launchDate: Date }) => { We are launching soon! - + You can play with the simulator in the meantime
      diff --git a/src/modules/smart-alpha/views/launch/s.module.scss b/src/modules/smart-alpha/views/launch/s.module.scss index 83455631..9490eff0 100644 --- a/src/modules/smart-alpha/views/launch/s.module.scss +++ b/src/modules/smart-alpha/views/launch/s.module.scss @@ -29,7 +29,7 @@ text-align: center; dt { - font: var(--font-sm); + font: var(--font-caption); font-weight: bold; } diff --git a/src/modules/smart-alpha/views/pool-view/index.tsx b/src/modules/smart-alpha/views/pool-view/index.tsx index 84e9ca36..65c3d668 100644 --- a/src/modules/smart-alpha/views/pool-view/index.tsx +++ b/src/modules/smart-alpha/views/pool-view/index.tsx @@ -118,10 +118,10 @@ const PoolView = () => {
      - + {pool.poolName} - + Epoch {smartAlphaContract?.epoch ?? pool.state.epoch ?? '-'}
      @@ -136,7 +136,7 @@ const PoolView = () => { Simulate {isDisabled ? ( - FLOKI deposits have been disabled}> + FLOKI deposits have been disabled}> {
      - + EPOCH {smartAlphaContract?.epoch ?? '-'} - IN PROGRESS
      @@ -170,7 +170,7 @@ const PoolView = () => { Junior
      - + Upside leverage Junior positions will have their upside amplified by this much @@ -189,7 +189,7 @@ const PoolView = () => { Junior
      - + Downside leverage How much of every 1% move to the downside in the underlying asset a junior position will have exposure @@ -210,7 +210,7 @@ const PoolView = () => { Senior
      - + Upside exposure rate How much of every 1% move to the upside in the underlying asset a senior position will have exposure @@ -228,7 +228,7 @@ const PoolView = () => { Senior
      - + Downside protection rate How much the underlying asset can decline before a senior position takes on losses. @@ -240,13 +240,13 @@ const PoolView = () => {
      - + {pool.poolToken.symbol} epoch entry price
      {
      - + Senior liquidity {
      + {formatToken( smartAlphaContract?.epochSeniorLiquidity?.unscaleBy(pool.poolToken.decimals) ?? @@ -310,7 +310,7 @@ const PoolView = () => {
      - + Junior liquidity {
      + {formatToken( smartAlphaContract?.epochJuniorLiquidity?.unscaleBy(pool.poolToken.decimals) ?? @@ -361,10 +361,10 @@ const PoolView = () => { } />
      - + {formatPercent(smartAlphaContract?.epochSeniorLiquidityRate) ?? '-'} - + {formatPercent(smartAlphaContract?.epochJuniorLiquidityRate) ?? '-'}
      @@ -377,7 +377,7 @@ const PoolView = () => {
    • - + EPOCH {smartAlphaContract?.currentEpoch !== undefined ? smartAlphaContract?.currentEpoch + 1 : '-'} - ESTIMATES @@ -392,7 +392,7 @@ const PoolView = () => { Junior
    - + Upside leverage Junior positions will have their upside amplified by this much @@ -411,7 +411,7 @@ const PoolView = () => { Junior
    - + Downside leverage How much of every 1% move to the downside in the underlying asset a junior position will have exposure @@ -432,7 +432,7 @@ const PoolView = () => { Senior
    - + Upside exposure rate How much of every 1% move to the upside in the underlying asset a senior position will have exposure @@ -449,7 +449,7 @@ const PoolView = () => { Senior
    - + Downside protection rate How much the underlying asset can decline before a senior position takes on losses. @@ -461,13 +461,13 @@ const PoolView = () => {
    - + {pool.poolToken.symbol} epoch entry price
    {
    - + Senior liquidity {
    + {formatToken(nextEpochEstimates[1]?.unscaleBy(pool.poolToken.decimals), { tokenName: pool.poolToken.symbol, @@ -523,7 +523,7 @@ const PoolView = () => {
    - + Junior liquidity {
    + {formatToken(nextEpochEstimates[0]?.unscaleBy(pool.poolToken.decimals), { tokenName: pool.poolToken.symbol, @@ -569,10 +569,10 @@ const PoolView = () => { } />
    - + {formatPercent(nextEpochSeniorLiquidityRate) ?? '-'} - + {formatPercent(nextEpochJuniorLiquidityRate) ?? '-'}
    @@ -619,7 +619,7 @@ const PoolView = () => { if (smartAlphaContract?.requireEpochAdvance) { return ( Epochs are automatically advanced whenever an action occurs - however, until that happens, they @@ -646,10 +646,10 @@ const PoolView = () => { if (tillNextEpoch > 0) { return ( <> - + {getFormattedDuration(tillNextEpoch / 1_000)} - + until next epoch @@ -680,10 +680,10 @@ const PoolView = () => {
    - + Previous epochs - + {pool.poolName}
    diff --git a/src/modules/smart-alpha/views/pool-view/pool-performance.tsx b/src/modules/smart-alpha/views/pool-view/pool-performance.tsx index 03fbef8f..f0d372ec 100644 --- a/src/modules/smart-alpha/views/pool-view/pool-performance.tsx +++ b/src/modules/smart-alpha/views/pool-view/pool-performance.tsx @@ -58,7 +58,7 @@ export const PoolPerformance: React.FC<{ poolAddress: string; oracleAssetSymbol: return (
    - + Pool performance diff --git a/src/modules/smart-alpha/views/pool-view/previous-epochs/index.tsx b/src/modules/smart-alpha/views/pool-view/previous-epochs/index.tsx index a6358b72..c4aa7966 100644 --- a/src/modules/smart-alpha/views/pool-view/previous-epochs/index.tsx +++ b/src/modules/smart-alpha/views/pool-view/previous-epochs/index.tsx @@ -125,13 +125,13 @@ function Epoch({ 'mt-8': !isFirst, })}>
    - + Epoch {item.id} - + -