Fix: display swap fees using the correct token [SW-67]

jmealy commented 1 week ago

What it solves

For buy orders the fee was being displayed in the wrong token.

How this PR fixes it

For both buy and sell orders, the fee is displayed in the sell token.
Also fixes some formatting in the fee tooltip text.

How to test it

Go to a buy order with fees, example
See that the fee is displayed with the correct token and amount. It should match the cowswap order.

Checklist

[ ] I've tested the branch on mobile 📱
[ ] I've documented how it affects the analytics (if at all) 📊
[ ] I've written a unit/e2e test for it (if applicable) 🧑‍💻

notion-workspace[bot] commented 1 week ago

Fees are not shown properly for Buy Orders in the tx details

github-actions[bot] commented 1 week ago

Branch preview

✅ Deploy successful!

Website: https://fix_fees_display--walletweb.review.5afe.dev/home?safe=eth:0xA77DE01e157f9f57C7c4A326eeE9C4874D0598b6

Storybook: https://fix_fees_display--walletweb.review.5afe.dev/storybook/

github-actions[bot] commented 1 week ago

ESLint Summary View Full Report

Annotations are provided inline on the Files Changed tab. You can also see all annotations that were generated on the annotations page.

Type	Occurrences	Fixable
Errors	0	0
Warnings	0	0
Ignored	0	N/A

Result: :white_check_mark: success
- Annotations: 0 total

^{Report generated by eslint-plus-action}

github-actions[bot] commented 1 week ago

📦 Next.js Bundle Analysis for safe-wallet-web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

⚠️ Global Bundle Size Increased

Page	Size (compressed)
`global`	`1000.83 KB` (🟡 +59 B)

Details

The global bundle is the javascript bundle that loads alongside every page. It is in its own category because its impact is much higher - an increase to its size means that every page on your website loads slower, and a decrease means every page loads faster.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

If you want further insight into what is behind the changes, give @next/bundle-analyzer a try!

Two Pages Changed Size

The following pages changed size from the code in this PR compared to its base branch:

Page	Size (compressed)	First Load
`/settings/cookies`	`7.64 KB` (🟢 -2 B)	1008.47 KB
`/terms`	`11.58 KB` (🟡 +1.56 KB)	1012.42 KB

Details

Only the gzipped size is provided here based on an expert tip.

First Load is the size of the global bundle plus the bundle for the individual page. If a user were to show up to your website and land on a given page, the first load size represents the amount of javascript that user would need to download. If next/link is used, subsequent page loads would only need to download that page's bundle (the number in the "Size" column), since the global bundle has already been downloaded.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

Next to the size is how much the size has increased or decreased compared with the base branch of this PR. If this percentage has increased by 20% or more, there will be a red status indicator applied, indicating that special attention should be given to this.

github-actions[bot] commented 1 week ago

Coverage report

[!CAUTION] Test run failed

St.^{:grey_question:}	Category	Percentage	Covered / Total
🟡	Statements	79.06% (+0.02% 🔼)	11628/14707
🔴	Branches	58.62% (+0.03% 🔼)	2848/4858
🟡	Functions	66.06%	1859/2814
🟢	Lines	80.45% (+0.02% 🔼)	10483/13031

Test suite run failed

Failed tests: 2/1433. Failed suites: 1/198.

``` ● PermissionsCheck › disables the submit button when the call is not allowed and shows the permission check status ReferenceError: fetch is not defined 70 | const fetchGasOracle = async (gasPriceOracle: GasPriceOracle): Promise => { 71 | const { uri, gasParameter, gweiFactor } = gasPriceOracle > 72 | const response = await fetch(uri) | ^ 73 | if (!response.ok) { 74 | throw new Error(`Error fetching gas price from oracle ${uri}`) 75 | } at fetchGasOracle (src/hooks/useGasPrice.ts:72:20) at fetchGasOracle (src/hooks/useGasPrice.ts:117:22) at getGasPrice (src/hooks/useGasPrice.ts:200:27) at callback (src/hooks/useAsync.ts:21:21) at commitHookEffectListMount (node_modules/react-dom/cjs/react-dom.development.js:23150:26) at commitPassiveMountOnFiber (node_modules/react-dom/cjs/react-dom.development.js:24931:11) at commitPassiveMountEffects_complete (node_modules/react-dom/cjs/react-dom.development.js:24891:9) at commitPassiveMountEffects_begin (node_modules/react-dom/cjs/react-dom.development.js:24878:7) at commitPassiveMountEffects (node_modules/react-dom/cjs/react-dom.development.js:24866:3) at flushPassiveEffectsImpl (node_modules/react-dom/cjs/react-dom.development.js:27039:3) at flushPassiveEffects (node_modules/react-dom/cjs/react-dom.development.js:26984:14) at node_modules/react-dom/cjs/react-dom.development.js:26769:9 at flushActQueue (node_modules/react/cjs/react.development.js:2667:24) at act (node_modules/react/cjs/react.development.js:2582:11) at node_modules/@testing-library/react/dist/act-compat.js:63:25 at renderRoot (node_modules/@testing-library/react/dist/pure.js:159:26) at render (node_modules/@testing-library/react/dist/pure.js:246:10) at customRender (src/tests/test-utils.tsx:71:16) at Object. (src/components/tx/SignOrExecuteForm/PermissionsCheck/__test__/PermissionsCheck.test.tsx:126:35) ● PermissionsCheck › disables the submit button when the call is not allowed and shows the permission check status ReferenceError: fetch is not defined 70 | const fetchGasOracle = async (gasPriceOracle: GasPriceOracle): Promise => { 71 | const { uri, gasParameter, gweiFactor } = gasPriceOracle > 72 | const response = await fetch(uri) | ^ 73 | if (!response.ok) { 74 | throw new Error(`Error fetching gas price from oracle ${uri}`) 75 | } at fetchGasOracle (src/hooks/useGasPrice.ts:72:20) at fetchGasOracle (src/hooks/useGasPrice.ts:117:22) at getGasPrice (src/hooks/useGasPrice.ts:200:27) at callback (src/hooks/useAsync.ts:21:21) at commitHookEffectListMount (node_modules/react-dom/cjs/react-dom.development.js:23150:26) at commitPassiveMountOnFiber (node_modules/react-dom/cjs/react-dom.development.js:24931:11) at commitPassiveMountEffects_complete (node_modules/react-dom/cjs/react-dom.development.js:24891:9) at commitPassiveMountEffects_begin (node_modules/react-dom/cjs/react-dom.development.js:24878:7) at commitPassiveMountEffects (node_modules/react-dom/cjs/react-dom.development.js:24866:3) at flushPassiveEffectsImpl (node_modules/react-dom/cjs/react-dom.development.js:27039:3) at flushPassiveEffects (node_modules/react-dom/cjs/react-dom.development.js:26984:14) at node_modules/react-dom/cjs/react-dom.development.js:26769:9 at flushActQueue (node_modules/react/cjs/react.development.js:2667:24) at act (node_modules/react/cjs/react.development.js:2582:11) at node_modules/@testing-library/react/dist/act-compat.js:63:25 at renderRoot (node_modules/@testing-library/react/dist/pure.js:159:26) at render (node_modules/@testing-library/react/dist/pure.js:246:10) at customRender (src/tests/test-utils.tsx:71:16) at Object. (src/components/tx/SignOrExecuteForm/PermissionsCheck/__test__/PermissionsCheck.test.tsx:144:35) ● PermissionsCheck › disables the submit button when the call is not allowed and shows the permission check status ReferenceError: fetch is not defined 70 | const fetchGasOracle = async (gasPriceOracle: GasPriceOracle): Promise => { 71 | const { uri, gasParameter, gweiFactor } = gasPriceOracle > 72 | const response = await fetch(uri) | ^ 73 | if (!response.ok) { 74 | throw new Error(`Error fetching gas price from oracle ${uri}`) 75 | } at fetchGasOracle (src/hooks/useGasPrice.ts:72:20) at fetchGasOracle (src/hooks/useGasPrice.ts:117:22) at getGasPrice (src/hooks/useGasPrice.ts:200:27) at callback (src/hooks/useAsync.ts:21:21) at commitHookEffectListMount (node_modules/react-dom/cjs/react-dom.development.js:23150:26) at commitPassiveMountOnFiber (node_modules/react-dom/cjs/react-dom.development.js:24931:11) at commitPassiveMountEffects_complete (node_modules/react-dom/cjs/react-dom.development.js:24891:9) at commitPassiveMountEffects_begin (node_modules/react-dom/cjs/react-dom.development.js:24878:7) at commitPassiveMountEffects (node_modules/react-dom/cjs/react-dom.development.js:24866:3) at flushPassiveEffectsImpl (node_modules/react-dom/cjs/react-dom.development.js:27039:3) at flushPassiveEffects (node_modules/react-dom/cjs/react-dom.development.js:26984:14) at node_modules/react-dom/cjs/react-dom.development.js:26769:9 at flushActQueue (node_modules/react/cjs/react.development.js:2667:24) at act (node_modules/react/cjs/react.development.js:2582:11) at node_modules/@testing-library/react/dist/act-compat.js:63:25 at renderRoot (node_modules/@testing-library/react/dist/pure.js:159:26) at render (node_modules/@testing-library/react/dist/pure.js:246:10) at customRender (src/tests/test-utils.tsx:71:16) at Object. (src/components/tx/SignOrExecuteForm/PermissionsCheck/__test__/PermissionsCheck.test.tsx:165:45) ● PermissionsCheck › execute the tx when the submit button is clicked ReferenceError: fetch is not defined 70 | const fetchGasOracle = async (gasPriceOracle: GasPriceOracle): Promise => { 71 | const { uri, gasParameter, gweiFactor } = gasPriceOracle > 72 | const response = await fetch(uri) | ^ 73 | if (!response.ok) { 74 | throw new Error(`Error fetching gas price from oracle ${uri}`) 75 | } at fetchGasOracle (src/hooks/useGasPrice.ts:72:20) at fetchGasOracle (src/hooks/useGasPrice.ts:117:22) at getGasPrice (src/hooks/useGasPrice.ts:200:27) at callback (src/hooks/useAsync.ts:21:21) at commitHookEffectListMount (node_modules/react-dom/cjs/react-dom.development.js:23150:26) at commitPassiveMountOnFiber (node_modules/react-dom/cjs/react-dom.development.js:24931:11) at commitPassiveMountEffects_complete (node_modules/react-dom/cjs/react-dom.development.js:24891:9) at commitPassiveMountEffects_begin (node_modules/react-dom/cjs/react-dom.development.js:24878:7) at commitPassiveMountEffects (node_modules/react-dom/cjs/react-dom.development.js:24866:3) at flushPassiveEffectsImpl (node_modules/react-dom/cjs/react-dom.development.js:27039:3) at flushPassiveEffects (node_modules/react-dom/cjs/react-dom.development.js:26984:14) at node_modules/react-dom/cjs/react-dom.development.js:26769:9 at flushActQueue (node_modules/react/cjs/react.development.js:2667:24) at act (node_modules/react/cjs/react.development.js:2582:11) at node_modules/@testing-library/react/dist/act-compat.js:63:25 at renderRoot (node_modules/@testing-library/react/dist/pure.js:159:26) at render (node_modules/@testing-library/react/dist/pure.js:246:10) at customRender (src/tests/test-utils.tsx:71:16) at Object. (src/components/tx/SignOrExecuteForm/PermissionsCheck/__test__/PermissionsCheck.test.tsx:189:34) ```

Report generated by 🧪jest coverage report action from 3ae6eb2cdba8b11ce37d58bc06e89b2c9fdbd6b8

safe-global / safe-wallet-web