Feat: Add token symbols to swap transaction summary #3627

jmealy · 2024-04-30T07:43:13Z

What it solves

Resolves: https://www.notion.so/safe-global/Display-token-icons-in-the-tx-list-12098c01ba6743b7a3669e6262c9800c?pvs=4

How this PR fixes it

display the sell token symbol and then the buy token symbol in the transaction info

How to test it

Excecute a swap
View the swap tx in transaction history.

Screenshots

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) 🧑‍💻

github-actions · 2024-04-30T07:43:26Z

Branch preview

✅ Deploy successful!

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

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

github-actions · 2024-04-30T07:46:20Z

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: ✅ success
Annotations: 0 total

^{Report generated by eslint-plus-action}

github-actions · 2024-04-30T07:48:54Z

📦 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`	`1008.69 KB` (🟡 +2.36 KB)

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!

New Page Added

The following page was added to the bundle from the code in this PR:

Page	Size (compressed)	First Load
`/swap`	`28.26 KB`	1.01 MB

Thirteen Pages Changed Size

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

Page	Size (compressed)	First Load
`/apps`	`50.06 KB` (🟡 +3.47 KB)	1.03 MB
`/apps/custom`	`41.68 KB` (🟡 +3.47 KB)	1.03 MB
`/apps/open`	`85.35 KB` (🟡 +10.23 KB)	1.07 MB
`/balances`	`30.64 KB` (🟡 +739 B)	1.01 MB
`/home`	`63.47 KB` (🟡 +3.71 KB)	1.05 MB
`/new-safe/create`	`32.39 KB` (🟡 +10 B)	1.02 MB
`/new-safe/load`	`18.53 KB` (🟡 +10 B)	1 MB
`/settings/safe-apps`	`25.33 KB` (🟡 +3.47 KB)	1.01 MB
`/transactions`	`107.64 KB` (🟡 +5.99 KB)	1.09 MB
`/transactions/history`	`107.61 KB` (🟡 +5.99 KB)	1.09 MB
`/transactions/messages`	`67.4 KB` (🟡 +5.98 KB)	1.05 MB
`/transactions/queue`	`63.06 KB` (🟡 +5.99 KB)	1.05 MB
`/transactions/tx`	`52.41 KB` (🟡 +5.99 KB)	1.04 MB

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 · 2024-04-30T07:50:01Z

Coverage report

St.^❔	Category	Percentage	Covered / Total
🟡	Statements	78.89% (-0.06% 🔻)	11466/14535
🔴	Branches	57.63% (-0.27% 🔻)	2692/4671
🟡	Functions	65.8% (-0.09% 🔻)	1832/2784
🟢	Lines	80.22% (-0.05% 🔻)	10335/12884

Show files with reduced coverage 🔻

St.^❔	File	Statements	Branches	Functions	Lines
🟢	`...` / transaction-guards.ts	79.73% (-0.96% 🔻)	46.15% (-2.49% 🔻)	76.6% (-1.67% 🔻)	80.2% (-0.61% 🔻)
🟢	src/store/index.ts	97.3% (-2.7% 🔻)	100%	100%	100%
🟢	`...` / index.tsx	100%	93.33% (-0.42% 🔻)	100%	100%
🟢	`...` / useIsExpiredSwap.ts	92.86%	33.33% (-66.67% 🔻)	100%	91.67%
🟡	`...` / index.tsx	73.53% (+1.65% 🔼)	26.47% (-3.53% 🔻)	42.86%	75% (+1.67% 🔼)

Test suite run success

1441 tests passing in 201 suites.

Report generated by 🧪jest coverage report action from 13bdcd2

katspaugh · 2024-04-30T08:52:05Z

I this per the design? I feel like they should overlap a little more. Also there's not enough margin between the icons and the text on the right.

jmealy · 2024-04-30T10:37:59Z

I this per the design? I feel like they should overlap a little more. Also there's not enough margin between the icons and the text on the right.

It's an overlap of 4px in the design, but here it is with 6px, and the increased margin. It does look closer to the design.

compojoom · 2024-04-30T13:41:48Z

code looks fine to me, but I would wait for @TanyaEfremova approval.
here is the safe I tested with: https://feat_tx_icons--walletweb.review-wallet-web.5afe.dev/transactions/history?safe=sep:0x05E6B5EB1D0E6aaBAb082057D5Bb91F2Ee6D11bE

to me this looks somehow out of order.

katspaugh · 2024-04-30T14:57:42Z

We should probably add a negative offset to the swap pairs, so that the text to the right is always aligned to the grid.

jmealy · 2024-05-01T07:16:04Z

We should probably add a negative offset to the swap pairs, so that the text to the right is always aligned to the grid.

This is what it looks like with the text aligned:

katspaugh · 2024-05-01T08:38:46Z

Also not ideal but definitely better 👍
I would make the icons overlap even more, like 40%. But yeah let’s wait for a designer’s decision. 🙂

github-actions · 2024-05-02T09:11:36Z

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: ✅ success
Annotations: 0 total

^{Report generated by eslint-plus-action}

katspaugh · 2024-05-02T16:41:29Z

We should probably make all token icons circular in dark mode, otherwise some of them are circles and some rounded rectangles.

github-actions · 2024-05-06T13:00:17Z

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: ✅ success
Annotations: 0 total

^{Report generated by eslint-plus-action}

fix: make icons circular fix: increase overlap and right margin of token symbols fix: align text for swap orders with other tx types feat: implement swap label according to design

TanyaEfremova · 2024-05-06T14:23:01Z

The latest changes look good! Approved :)

.

compojoom force-pushed the feat-cow-swap branch from eb05e1e to 27ba816 Compare May 2, 2024 08:13

jmealy force-pushed the feat/tx-icons branch from 4f5045e to 6625669 Compare May 2, 2024 09:10

usame-algan force-pushed the feat-cow-swap branch from 179be31 to 4ed007f Compare May 6, 2024 10:01

compojoom force-pushed the feat/tx-icons branch from 6625669 to 63a2e33 Compare May 6, 2024 12:57

Add token symbols to swap transaction summary

6e67bce

fix: make icons circular fix: increase overlap and right margin of token symbols fix: align text for swap orders with other tx types feat: implement swap label according to design

compojoom force-pushed the feat/tx-icons branch from 63a2e33 to 6e67bce Compare May 6, 2024 13:03

fix: icons are square in dark mode

13bdcd2

.

compojoom marked this pull request as ready for review May 6, 2024 15:22

compojoom merged commit bef4c94 into feat-cow-swap May 6, 2024
14 checks passed

compojoom deleted the feat/tx-icons branch May 6, 2024 15:23

github-actions bot locked and limited conversation to collaborators May 6, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat: Add token symbols to swap transaction summary #3627

Feat: Add token symbols to swap transaction summary #3627

jmealy commented Apr 30, 2024 •

edited

Loading

github-actions bot commented Apr 30, 2024 •

edited

Loading

github-actions bot commented Apr 30, 2024 •

edited

Loading

github-actions bot commented Apr 30, 2024 •

edited

Loading

github-actions bot commented Apr 30, 2024 •

edited

Loading

katspaugh commented Apr 30, 2024 •

edited by jmealy

Loading

jmealy commented Apr 30, 2024

compojoom commented Apr 30, 2024

katspaugh commented Apr 30, 2024

jmealy commented May 1, 2024

katspaugh commented May 1, 2024

github-actions bot commented May 2, 2024

katspaugh commented May 2, 2024

github-actions bot commented May 6, 2024 •

edited

Loading

TanyaEfremova commented May 6, 2024

Feat: Add token symbols to swap transaction summary #3627

Feat: Add token symbols to swap transaction summary #3627

Conversation

jmealy commented Apr 30, 2024 • edited Loading

What it solves

How this PR fixes it

How to test it

Screenshots

Checklist

github-actions bot commented Apr 30, 2024 • edited Loading

Branch preview

github-actions bot commented Apr 30, 2024 • edited Loading

ESLint Summary View Full Report

github-actions bot commented Apr 30, 2024 • edited Loading

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

⚠️ Global Bundle Size Increased

New Page Added

Thirteen Pages Changed Size

github-actions bot commented Apr 30, 2024 • edited Loading

Coverage report

Test suite run success

katspaugh commented Apr 30, 2024 • edited by jmealy Loading

jmealy commented Apr 30, 2024

compojoom commented Apr 30, 2024

katspaugh commented Apr 30, 2024

jmealy commented May 1, 2024

katspaugh commented May 1, 2024

github-actions bot commented May 2, 2024

ESLint Summary View Full Report

katspaugh commented May 2, 2024

github-actions bot commented May 6, 2024 • edited Loading

ESLint Summary View Full Report

TanyaEfremova commented May 6, 2024

jmealy commented Apr 30, 2024 •

edited

Loading

github-actions bot commented Apr 30, 2024 •

edited

Loading

github-actions bot commented Apr 30, 2024 •

edited

Loading

github-actions bot commented Apr 30, 2024 •

edited

Loading

github-actions bot commented Apr 30, 2024 •

edited

Loading

katspaugh commented Apr 30, 2024 •

edited by jmealy

Loading

github-actions bot commented May 6, 2024 •

edited

Loading