Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: aggregated balance feature #27097

Merged
merged 37 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
fd8317f
feat: add new setting and remove useNativeCurrencyAsPrimaryCurrency s…
sahar-fehri Sep 12, 2024
c0e47ba
Merge branch 'develop' into feat/aggregated-balance-feature
sahar-fehri Sep 12, 2024
79408f2
fix: merge conflicts
sahar-fehri Sep 13, 2024
383715c
feat: aggregated balance logic (#27108)
sahar-fehri Sep 13, 2024
0cbb4ac
Merge branch 'develop' into feat/aggregated-balance-feature
sahar-fehri Sep 16, 2024
18992e2
fix: fix merge conflicts add type for new preference
sahar-fehri Sep 16, 2024
9dc5b48
fix: fix merge conflicts
sahar-fehri Sep 17, 2024
ce79a77
fix: fix lint
sahar-fehri Sep 17, 2024
b3e3fa2
feat: aggregated balance UI (#27161)
sahar-fehri Sep 20, 2024
6ff9669
fix: rm log and show popover on testnet if show conversion setting is on
sahar-fehri Sep 20, 2024
e5e85e4
fix: fix merge conflicts
sahar-fehri Sep 20, 2024
a6b7571
fix: e2e
sahar-fehri Sep 20, 2024
f19e550
fix: rm description for current locale
sahar-fehri Sep 20, 2024
a215630
fix: fix
sahar-fehri Sep 21, 2024
25d3df5
fix: fix lint
sahar-fehri Sep 21, 2024
c5f5f23
fix: fix
sahar-fehri Sep 21, 2024
90503ba
fix: add e2e
sahar-fehri Sep 21, 2024
e46d196
fix: add e2e
sahar-fehri Sep 21, 2024
9be7d16
fix: fix
sahar-fehri Sep 23, 2024
bedb2ac
fix: fix lint
sahar-fehri Sep 23, 2024
9072932
fix: fix merge conflicts
sahar-fehri Sep 23, 2024
8dda377
fix: refactor
sahar-fehri Sep 24, 2024
b5650b0
fix: refactor
sahar-fehri Sep 24, 2024
ebd529b
fix: rm comment
sahar-fehri Sep 24, 2024
83c4316
fix: rm lint comment
sahar-fehri Sep 24, 2024
e3eeb8a
fix: add loading until total aggregated balance is resolved
sahar-fehri Sep 24, 2024
64e4933
fix: fix
sahar-fehri Sep 24, 2024
81cafa1
fix: refactor marketData item search
sahar-fehri Sep 24, 2024
b101a24
fix: refactor e2e
sahar-fehri Sep 24, 2024
d61f708
fix: convert js test file to ts and split test
sahar-fehri Sep 27, 2024
098e6b5
fix: adjust css popover position slightly to top
sahar-fehri Sep 27, 2024
03a6b05
fix: refactor popover div elements
sahar-fehri Sep 27, 2024
8db1093
fix: move shouldShowAggregatedBalancePopover from appState to prefCon…
sahar-fehri Sep 27, 2024
339c70d
fix: fix shouldShowAggregatedBalancePopover for upgrades
sahar-fehri Sep 28, 2024
2253bc3
Merge branch 'develop' into feat/aggregated-balance-feature
sahar-fehri Sep 30, 2024
203bf04
fix: fix lint after merge
sahar-fehri Sep 30, 2024
5b79963
Merge branch 'develop' into feat/aggregated-balance-feature
sahar-fehri Oct 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .storybook/test-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ const state = {
welcomeScreenSeen: false,
currentLocale: 'en',
preferences: {
useNativeCurrencyAsPrimaryCurrency: true,
showNativeTokenAsMainBalance: true,
},
incomingTransactionsPreferences: {
[CHAIN_IDS.MAINNET]: true,
Expand Down
13 changes: 0 additions & 13 deletions app/_locales/am/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions app/_locales/ar/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions app/_locales/bg/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 0 additions & 13 deletions app/_locales/bn/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions app/_locales/ca/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions app/_locales/cs/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions app/_locales/da/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions app/_locales/de/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions app/_locales/el/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 11 additions & 17 deletions app/_locales/en/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions app/_locales/en_GB/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading