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

Beta #197

Open
wants to merge 981 commits into
base: main
Choose a base branch
from
Open

Beta #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
981 commits
Select commit Hold shift + click to select a range
b594472
Merge branch 'feat/hide-show-trade-history-candles-chart' into beta
binhnguyen2501 Apr 20, 2024
3409b7f
Merge branch 'mod/update-holding-table' into beta
binhnguyen2501 Apr 24, 2024
ed25f4f
Merge branch 'feat/hide-show-trade-history-candles-chart' into beta
binhnguyen2501 Apr 24, 2024
60997ba
Merge branch 'feat/hide-show-trade-history-candles-chart' into beta
binhnguyen2501 Apr 24, 2024
76b7430
Merge branch 'feat/hide-show-trade-history-candles-chart' into beta
binhnguyen2501 Apr 24, 2024
6b30b84
Merge branch 'mod/update-trading-stats-query-token-holding' into beta
binhnguyen2501 Apr 24, 2024
56e9acf
Merge branch 'mod/update-trading-stats-query-token-holding' into beta
binhnguyen2501 Apr 24, 2024
825b0f4
Merge branch 'mod/update-trading-stats-query-token-holding' into beta
binhnguyen2501 Apr 24, 2024
aa591f4
Merge branch 'main' into beta
binhnguyen2501 Apr 24, 2024
b4a6620
Merge branch 'main' into beta
binhnguyen2501 Apr 24, 2024
8d8c06c
Merge branch 'main' into beta
binhnguyen2501 Apr 24, 2024
057ce8a
Merge branch 'main' into beta
binhnguyen2501 Apr 24, 2024
df703b0
Merge branch 'feat/daily-checkin-redeem' into beta
binhnguyen2501 Apr 25, 2024
8c056fa
Merge branch 'fix/error-toast-when-add-wallet-fail' into beta
anhuong541 Apr 26, 2024
982a6ae
Merge branch 'main' into beta
binhnguyen2501 Apr 26, 2024
a4c59ab
Merge branch 'main' into beta
binhnguyen2501 Apr 26, 2024
9a73682
Merge branch 'main' into beta
binhnguyen2501 Apr 26, 2024
a80fdf2
feat/update-tab-news
binhnguyen2501 Apr 27, 2024
b66782b
Merge branch 'feat/update-tab-news' into beta
binhnguyen2501 Apr 27, 2024
7063d37
Merge branch 'feat/update-tab-news' into beta
binhnguyen2501 Apr 27, 2024
fbad7e5
Merge branch 'main' into beta
binhnguyen2501 Apr 27, 2024
c5eccd7
Merge branch 'main' into beta
binhnguyen2501 Apr 27, 2024
5e5f7c5
Merge branch 'main' into beta
binhnguyen2501 Apr 27, 2024
cae0d7c
Merge branch 'main' into beta
binhnguyen2501 Apr 27, 2024
5fa66cc
merge main
binhnguyen2501 Apr 27, 2024
87da288
Merge branch 'main' into beta
binhnguyen2501 Apr 28, 2024
c3fd24a
Merge branch 'main' into beta
binhnguyen2501 Apr 28, 2024
3a44c10
Merge branch 'main' into beta
binhnguyen2501 Apr 28, 2024
308ae9e
Merge branch 'main' into beta
binhnguyen2501 Apr 30, 2024
cb15784
merge main
binhnguyen2501 Apr 30, 2024
a93f982
Merge branch 'feat/point-market-feature' into beta
binhnguyen2501 Apr 30, 2024
bf9624f
Merge branch 'feat/point-market-feature' into beta
binhnguyen2501 May 1, 2024
9afe9b9
Merge branch 'main' into beta
binhnguyen2501 May 1, 2024
650c64a
Merge branch 'main' into beta
binhnguyen2501 May 2, 2024
552c239
Merge branch 'main' into beta
binhnguyen2501 May 2, 2024
bfa4e0d
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 3, 2024
c961327
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 3, 2024
d97e398
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 3, 2024
d7de4b2
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 3, 2024
e36f68e
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 3, 2024
2579f37
merge main
binhnguyen2501 May 3, 2024
b02dd01
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 3, 2024
878b1c2
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 4, 2024
d0acc28
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 4, 2024
ee84831
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 4, 2024
2be3c07
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 5, 2024
1564054
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 5, 2024
392489e
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 5, 2024
01a55af
Merge branch 'main' into beta
binhnguyen2501 May 5, 2024
44c7f52
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 5, 2024
3b6d816
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 5, 2024
d49e46a
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 5, 2024
0e62168
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 5, 2024
e23a44c
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 5, 2024
4babb02
remove cursor
binhnguyen2501 May 5, 2024
8273ad2
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 6, 2024
e71a798
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 6, 2024
ad8f5cd
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 6, 2024
ba0ee74
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 6, 2024
f6889a5
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 6, 2024
7e17e1f
remove sigout
binhnguyen2501 May 6, 2024
18282aa
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 6, 2024
abe7f8b
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 6, 2024
946ff2a
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 6, 2024
a365872
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 6, 2024
18efca4
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 6, 2024
d05b8fa
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 6, 2024
bad193c
Merge branch 'fix/hide-borrow-defi-if-empty' into beta
anhuong541 May 7, 2024
78d0b28
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 7, 2024
cb5ecd4
merge main
binhnguyen2501 May 7, 2024
49c77be
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 7, 2024
6fd2fe2
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 7, 2024
c89a20b
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 7, 2024
2e54c62
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 7, 2024
3603970
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 7, 2024
e23b8e4
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 8, 2024
1d6b577
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 8, 2024
d7a729c
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 8, 2024
5a9cd09
Merge branch 'mod/add-pagination-checkin-leaderboard' into beta
anhuong541 May 8, 2024
2c7c879
try to deploy beta again
anhuong541 May 8, 2024
16b30e0
Merge branch 'mod/add-pagination-checkin-leaderboard' into beta
anhuong541 May 8, 2024
e14f1d4
Merge branch 'mod/add-pagination-checkin-leaderboard' into beta
anhuong541 May 8, 2024
0e98961
Merge branch 'mod/add-pagination-checkin-leaderboard' into beta
anhuong541 May 8, 2024
9178644
try to deploy again
anhuong541 May 8, 2024
4ed015e
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 8, 2024
fd7ea1d
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 8, 2024
0960fdb
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 8, 2024
d9b8cb2
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 8, 2024
7604956
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 8, 2024
835fd04
update tele auth
binhnguyen2501 May 8, 2024
f3ec7e3
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 8, 2024
a1adbab
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 8, 2024
8ad5fd3
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 8, 2024
6ad41f3
Merge branch 'mod/cross-login' into beta
binhnguyen2501 May 8, 2024
b470741
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 9, 2024
13025c0
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 9, 2024
0061417
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 9, 2024
590ee97
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 9, 2024
28c5094
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 9, 2024
b344eca
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 9, 2024
33c2a66
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 9, 2024
e29b2f3
merge main
binhnguyen2501 May 9, 2024
67f6b5d
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 9, 2024
9148ff7
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 9, 2024
b278e82
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 9, 2024
4874f4a
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 9, 2024
dde47ab
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 9, 2024
388cc7a
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 9, 2024
2b9cf22
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 9, 2024
98c5bba
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 9, 2024
8adb53c
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 10, 2024
9cd20ba
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 10, 2024
a3901f9
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 10, 2024
eeea2f3
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 10, 2024
13cb555
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 10, 2024
fd12448
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 10, 2024
ba05205
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 10, 2024
76a9d6c
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 10, 2024
6a435b3
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 10, 2024
95215c3
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 10, 2024
ac9ae75
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 10, 2024
9582311
Merge branch 'feat/sui-quests-campaign' into beta
binhnguyen2501 May 10, 2024
aa5f00e
Merge branch 'main' into beta
binhnguyen2501 May 11, 2024
49d9037
Merge branch 'main' into beta
binhnguyen2501 May 11, 2024
919f04b
Merge branch 'main' into beta
binhnguyen2501 May 11, 2024
c13735d
Merge branch 'main' into beta
binhnguyen2501 May 11, 2024
3e46ea7
Merge branch 'main' into beta
binhnguyen2501 May 11, 2024
297f466
Merge branch 'main' into beta
binhnguyen2501 May 11, 2024
747ff4a
Merge branch 'main' into beta
binhnguyen2501 May 12, 2024
c462b33
Merge branch 'main' into beta
binhnguyen2501 May 12, 2024
cf1fd5d
Merge branch 'main' into beta
binhnguyen2501 May 12, 2024
d5347c5
Merge branch 'main' into beta
binhnguyen2501 May 12, 2024
5382cf7
Merge branch 'main' into beta
binhnguyen2501 May 13, 2024
7005085
Merge branch 'mod/sui-campaign-v2' into beta
binhnguyen2501 May 13, 2024
6caa4ed
Merge branch 'main' into beta
binhnguyen2501 May 13, 2024
43bf8b7
Merge branch 'mod/sui-campaign-v2' into beta
binhnguyen2501 May 13, 2024
696568b
Merge branch 'mod/sui-campaign-v2' into beta
binhnguyen2501 May 13, 2024
d4c2a36
Merge branch 'main' into beta
binhnguyen2501 May 13, 2024
77e79e9
Merge branch 'mod/sui-campaign-v2' into beta
anhuong541 May 13, 2024
038c5fc
Merge branch 'mod/sui-campaign-v2' into beta
binhnguyen2501 May 13, 2024
0c675b9
fix bug when user connect different wallet
anhuong541 May 13, 2024
9057b60
Merge branch 'mod/sui-campaign-v2' into beta
binhnguyen2501 May 13, 2024
7653bd0
Merge branch 'mod/sui-campaign-v2' into beta
binhnguyen2501 May 13, 2024
1e17351
Merge branch 'mod/sui-campaign-v2' into beta
anhuong541 May 13, 2024
21d056c
Merge branch 'mod/sui-campaign-v2' into beta
anhuong541 May 13, 2024
4f8f101
Merge branch 'main' into beta
binhnguyen2501 May 13, 2024
9d9abf6
Merge branch 'main' into beta
binhnguyen2501 May 13, 2024
9bf018c
Merge branch 'main' into beta
binhnguyen2501 May 13, 2024
249502c
Merge branch 'main' into beta
binhnguyen2501 May 13, 2024
019952c
Merge branch 'main' into beta
binhnguyen2501 May 13, 2024
c346c29
Merge branch 'main' into beta
binhnguyen2501 May 14, 2024
208d9ad
Merge branch 'main' into beta
binhnguyen2501 May 14, 2024
de2041c
Merge branch 'main' into beta
binhnguyen2501 May 14, 2024
ba38373
Merge branch 'main' into beta
binhnguyen2501 May 14, 2024
de4569e
Merge branch 'main' into beta
binhnguyen2501 May 14, 2024
ba8eb4f
Merge branch 'main' into beta
binhnguyen2501 May 14, 2024
c7625b0
Merge branch 'main' into beta
binhnguyen2501 May 14, 2024
3280b38
update flowX to protocolInfo
anhuong541 May 14, 2024
9f22cee
Merge branch 'mod/update-flowx-point' into beta
anhuong541 May 14, 2024
2b12063
Merge branch 'main' into beta
binhnguyen2501 May 14, 2024
7ef801d
Merge branch 'mod/sui-campaign-v2' into beta
anhuong541 May 14, 2024
3c1d085
Merge branch 'mod/sui-campaign-v2' into beta
anhuong541 May 14, 2024
bc4dd17
remove unused state
anhuong541 May 14, 2024
95b89e0
Merge branch 'mod/sui-campaign-v2' into beta
anhuong541 May 14, 2024
e489522
try to deploy again
anhuong541 May 14, 2024
211be70
Merge branch 'mod/sui-campaign-v2' into beta
anhuong541 May 14, 2024
7ea2e22
ttruy to deploy beta again
anhuong541 May 14, 2024
c253c5b
Merge branch 'main' into beta
binhnguyen2501 May 14, 2024
7f7a1f1
Merge branch 'main' into beta
binhnguyen2501 May 14, 2024
42a5e4f
Merge branch 'fix/fix-sidebar-mobile' into beta
anhuong541 May 15, 2024
34ddaf4
Merge branch 'mod/flowx-test' into beta
binhnguyen2501 May 15, 2024
5bde551
merge main
binhnguyen2501 May 15, 2024
2a8388f
update condition
binhnguyen2501 May 15, 2024
b6eca3e
Merge branch 'main' into beta
binhnguyen2501 May 15, 2024
8bae0c1
Merge branch 'main' into beta
binhnguyen2501 May 15, 2024
144af3f
Merge branch 'main' into beta
binhnguyen2501 May 15, 2024
e3f5e84
Merge branch 'main' into beta
binhnguyen2501 May 15, 2024
a41b37d
Merge branch 'main' into beta
binhnguyen2501 May 16, 2024
592648d
Merge branch 'main' into beta
binhnguyen2501 May 16, 2024
eb9b3af
Merge branch 'main' into beta
binhnguyen2501 May 16, 2024
a4f54c1
Merge branch 'main' into beta
binhnguyen2501 May 16, 2024
fc63963
Merge branch 'main' into beta
binhnguyen2501 May 16, 2024
42acaf3
Merge branch 'main' into beta
binhnguyen2501 May 16, 2024
e9bc948
Merge branch 'main' into beta
binhnguyen2501 May 16, 2024
7930ffb
Merge branch 'main' into beta
binhnguyen2501 May 17, 2024
82ce76c
Merge branch 'mod/update-claim-lootbox' into beta
binhnguyen2501 May 21, 2024
af9dc5d
Merge branch 'mod/update-claim-lootbox' into beta
binhnguyen2501 May 21, 2024
640e2ce
Merge branch 'mod/update-claim-lootbox' into beta
binhnguyen2501 May 21, 2024
2baab04
Merge branch 'mod/update-claim-lootbox' into beta
binhnguyen2501 May 21, 2024
733fce7
Merge branch 'mod/update-claim-lootbox' into beta
binhnguyen2501 May 21, 2024
9c2b098
Merge branch 'mod/update-claim-lootbox' into beta
binhnguyen2501 May 22, 2024
2296897
fix query
binhnguyen2501 May 22, 2024
e3481b1
mod/reopen-virtual-portfolio
binhnguyen2501 May 22, 2024
083b837
merge main
binhnguyen2501 May 22, 2024
5cd8fa6
merge mod/reopen-loot-box
binhnguyen2501 May 22, 2024
b8c46b6
update partner pizza card
binhnguyen2501 May 22, 2024
c4d8efd
update input networth
binhnguyen2501 May 22, 2024
dfb3cf5
Merge branch 'mod/reopen-loot-box' into beta
binhnguyen2501 May 22, 2024
0a94daf
Merge branch 'mod/add-points-airdrop-2' into beta
anhuong541 May 22, 2024
689e2c6
try to deploy again
anhuong541 May 22, 2024
01edf58
try to deploy again!
anhuong541 May 22, 2024
be9a484
Merge branch 'mod/reopen-loot-box' into beta
binhnguyen2501 May 22, 2024
9a0e5c2
Merge branch 'mod/reopen-loot-box' into beta
binhnguyen2501 May 22, 2024
cb8b220
update networth
binhnguyen2501 May 22, 2024
287a835
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 22, 2024
358e5c6
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 22, 2024
dd17f81
update token list
binhnguyen2501 May 22, 2024
a144bdc
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 22, 2024
3a05992
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 22, 2024
0801c58
render allocation and holidng
binhnguyen2501 May 22, 2024
e8d6e0a
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 22, 2024
75844f7
Merge branch 'main' into beta
binhnguyen2501 May 22, 2024
8bd94df
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 23, 2024
06c35e0
hotfix toast
binhnguyen2501 May 23, 2024
e79626e
Merge branch 'main' into beta
binhnguyen2501 May 23, 2024
b6cc0f7
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 23, 2024
12debb2
merge main
binhnguyen2501 May 23, 2024
ccaaaa9
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 23, 2024
e7564a9
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 23, 2024
df5de61
merge main
binhnguyen2501 May 23, 2024
e1ea4a2
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 23, 2024
8168ab3
Merge branch 'main' into beta
binhnguyen2501 May 23, 2024
7729a0a
fix import
binhnguyen2501 May 23, 2024
cb933f7
update calculate
binhnguyen2501 May 23, 2024
87f9ddb
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 23, 2024
80c268b
Merge branch 'main' into beta
binhnguyen2501 May 23, 2024
f472584
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 23, 2024
8be20ff
Merge branch 'main' into beta
binhnguyen2501 May 23, 2024
fc7d1ce
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 24, 2024
52a159d
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 24, 2024
a9badd8
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 24, 2024
53dc5be
Merge branch 'main' into beta
binhnguyen2501 May 24, 2024
e6d32be
Merge branch 'main' into beta
binhnguyen2501 May 24, 2024
7044e74
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 24, 2024
8c2fb79
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 24, 2024
85324aa
Merge branch 'main' into beta
binhnguyen2501 May 24, 2024
cde8642
Merge branch 'main' into beta
binhnguyen2501 May 24, 2024
6c069d4
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 24, 2024
a68d2e6
update edit
binhnguyen2501 May 24, 2024
6bc667f
update flow edit
binhnguyen2501 May 24, 2024
0fedd53
update render
binhnguyen2501 May 24, 2024
262a64c
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 24, 2024
a4ec04c
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 25, 2024
0f81f57
update more virtual
binhnguyen2501 May 25, 2024
7327a1b
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 25, 2024
534f5a5
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 25, 2024
0e8d537
Merge branch 'main' into mod/reopen-virtual-portfolio
binhnguyen2501 May 25, 2024
90d31ee
performance chart
binhnguyen2501 May 25, 2024
8f5599b
Merge branch 'mod/reopen-virtual-portfolio' into beta
binhnguyen2501 May 25, 2024
02b791c
merge main
binhnguyen2501 May 26, 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
1 change: 0 additions & 1 deletion src/UI/DailyCheckin/TabReward.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,6 @@
{/each}
</AnimateSharedLayout>
</div>

{#if selectedType === "redeemGift"}
<div class="flex flex-col gap-4">
<div
Expand Down
31 changes: 29 additions & 2 deletions src/UI/Header/Header.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,31 @@
}
}

handleSaveSuggest(validateAccount?.address);
if (validateAccount?.type === "EVM" || validateAccount?.type === "MOVE") {
window.history.replaceState(
null,
"",
window.location.pathname +
`?type=${validateAccount?.type}&chain=ALL&address=${validateAccount?.address}`
);
}
if (
validateAccount?.type === "BTC" ||
validateAccount?.type === "SOL" ||
validateAccount?.type === "NEAR" ||
validateAccount?.type === "TON" ||
validateAccount?.type === "AURA" ||
validateAccount?.type === "ALGO" ||
validateAccount?.type === "CEX"
) {
window.history.replaceState(
null,
"",
window.location.pathname +
`?type=${validateAccount?.type}&address=${validateAccount?.address}`
);
}
handleSaveSuggest(validateAccount?.address);

search = "";
Expand Down Expand Up @@ -460,10 +485,12 @@
userPublicAddress.update((n) => (n = data?.publicAddress));
userId.update((n) => (n = data?.id));
userID = data?.id;
selectedPackage.update((n) => (n = data?.plan?.tier.toUpperCase()));
buyPackage = data.plan?.tier;
displayName = data?.displayName;
publicAddress = data?.publicAddress;
selectedPackage.update(
(n) => (n = data?.plan?.tier.toUpperCase() || "FREE")
);
buyPackage = data.plan?.tier;
mixpanel.identify(data.publicAddress);
};

Expand Down
2 changes: 0 additions & 2 deletions src/UI/Portfolio/AirdropsAndPointsTracker.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@
return item?.eligibility;
})
);

eligibilityData = formatEligibilityData
.filter((item: any) => item?.eligible)
.map((item: any) => {
Expand Down Expand Up @@ -224,7 +223,6 @@
(prev, item) => prev + Number(item?.listing_value),
0
);

totalEstimateValuePoints = pointsData.reduce(
(prev, item) => prev + Number(item?.value),
0
Expand Down
8 changes: 4 additions & 4 deletions src/UI/Portfolio/DefiPosition/TokenStatePosition.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
{#if data?.length !== 0}
<!-- Desktop view -->
<div
class={`xl:block hidden rounded-[10px] overflow-hidden w-full ${
$isDarkMode ? "bg-[#222222]" : "bg-[#fff] border border_0000000d"
class={`xl:block hidden rounded-[10px] border border_0000000d overflow-hidden w-full ${
$isDarkMode ? "bg-[#222222]" : "bg-[#fff]"
}`}
>
<div class="bg_f4f5f8 grid grid-cols-4">
Expand Down Expand Up @@ -96,8 +96,8 @@

<!-- Mobile view -->
<div
class={`xl:hidden block rounded-[10px] p-2 overflow-hidden w-full ${
$isDarkMode ? "bg-[#222222]" : "bg-[#fff] border border_0000000d"
class={`xl:hidden block rounded-[10px] border border_0000000d p-2 overflow-hidden w-full ${
$isDarkMode ? "bg-[#222222]" : "bg-[#fff]"
}`}
>
{#each data as item}
Expand Down
Loading