Skip to content

Feat/Unstaking + Loan&Borrowing screens #24

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

Draft
wants to merge 110 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
63b4d26
wip: dashboard screen & API init
Sterioboy Jun 27, 2024
639e110
wip: dashboard layout
Sterioboy Jun 28, 2024
5765898
wip: charts added
Sterioboy Jul 1, 2024
1caca42
wip: charts added (fix)
Sterioboy Jul 1, 2024
ce014cd
wip: charts added (fix 2)
Sterioboy Jul 1, 2024
3862c45
wip: charts added (fix 3)
Sterioboy Jul 1, 2024
2e5b6e1
feat/component decomposition & unit tests
Sterioboy Jul 2, 2024
03f4e64
refactor/api dto changed
Sterioboy Jul 2, 2024
97c0222
feat/tests dateChanger, floorHex, getLockupDate
Sterioboy Jul 3, 2024
d2608aa
feat/unit tests & main screen optimisation
Sterioboy Jul 4, 2024
df0ac00
feat/dashboard post-review updates
Sterioboy Jul 5, 2024
1a6802e
fix/label removed chart
Sterioboy Jul 5, 2024
dcb3c4e
fix: added fixed graph pointers
Sterioboy Jul 8, 2024
a4ba436
fix: naming updated
Sterioboy Jul 8, 2024
e54c0c1
fix: naming changed
Sterioboy Jul 8, 2024
49076a4
fix: neative decimal added
Sterioboy Jul 9, 2024
1c0e5cb
wip: redesigned assets tab & connected the API
Sterioboy Jul 9, 2024
22ab3f2
fix: adjusted shadow for the dashboard components
Sterioboy Jul 9, 2024
79ea6b7
fix: adjusted shadow for the dashboard components
Sterioboy Jul 9, 2024
83dec21
wip: dashboard section
Sterioboy Jul 11, 2024
6419d2d
feat: My Assets Dashboard redesign
Sterioboy Jul 15, 2024
a8348d2
fix: menu component props
Sterioboy Jul 15, 2024
f1bd455
fix: MyAsset component props
Sterioboy Jul 15, 2024
82bc7ff
fix: BG image src updated
Sterioboy Jul 15, 2024
c040757
fix: post-review fixes
Sterioboy Jul 15, 2024
0025850
fix: arrow container width adjusted
Sterioboy Jul 15, 2024
64db236
fix: navigation updated
Sterioboy Jul 15, 2024
b8abeb3
feat: added action cards to the Main screen
Sterioboy Jul 16, 2024
d0b5cfb
fix: flex parametr fixed
Sterioboy Jul 17, 2024
d86a4d6
fix: MainAssets Dashboard stats font-size reduced
Sterioboy Jul 17, 2024
cc1c112
feat: main re-design & dashboard updates
Sterioboy Jul 19, 2024
9566f5b
fix: design changes reflected
Sterioboy Jul 19, 2024
41e36fc
wip: loan nft items screen
Sterioboy Jul 22, 2024
c2ef88a
wip: empty nfts screen & risk disclosure screen added
Sterioboy Jul 23, 2024
68c853f
wip: loan borrow items
Sterioboy Jul 24, 2024
72bebe1
wip: NFT list item & Borrow screen init
Sterioboy Jul 25, 2024
147f28a
wip: added dropdown custom component & react-dropdown package
Sterioboy Jul 29, 2024
3af87cd
wip: staking info dynamic added
Sterioboy Jul 30, 2024
8c46f85
wip: BorrowDetails screen init, ProgressBar component, DoubleArrows c…
Sterioboy Jul 30, 2024
ae22485
wip: ProgressBar component, RiskList component, BorrowDetails Page, B…
Sterioboy Jul 31, 2024
72ef21e
wip: added dark variant to basic modal comp-t, confirm borrow modal, …
Sterioboy Aug 1, 2024
c853bb3
wip: preview preparation
Sterioboy Aug 2, 2024
4c4bc2f
fix: TS errors
Sterioboy Aug 2, 2024
c91d8e2
wip: added Borrow Action Card to the Main screen
Sterioboy Aug 2, 2024
6a053b9
fix: useEffect routing dep-s
Sterioboy Aug 2, 2024
65d948f
fix: margin bug resolved
Sterioboy Aug 2, 2024
278b121
wip: padding added
Sterioboy Aug 2, 2024
368fcc4
wip: padding added (2)
Sterioboy Aug 2, 2024
9be2b5b
wip: repay empty screen & repay list item init
Sterioboy Aug 5, 2024
1daf7f6
wip: repay list items & post-review borrow fixes
Sterioboy Aug 6, 2024
414a07c
fix: import NFT list item img
Sterioboy Aug 6, 2024
66ba843
wip: StakingInfo component improvements, RepaymentDetails screen, Modals
Sterioboy Aug 7, 2024
98ae201
fix: TMA backButton routing bug
Sterioboy Aug 8, 2024
6079d0e
fix: TMA routing absolute paths
Sterioboy Aug 8, 2024
35759b3
fix: Repay List Item bug
Sterioboy Aug 8, 2024
4a0f58d
fix: Repayment page test
Sterioboy Aug 8, 2024
25f7a92
wip: history screens init
Sterioboy Aug 8, 2024
5e63e6f
wip: history details screen, staking info comp-t update, history list…
Sterioboy Aug 9, 2024
932fcca
wip: minor fixes
Sterioboy Aug 12, 2024
dbf2ebd
fix: LTV numbers updated
Sterioboy Aug 13, 2024
09470a0
feat: added BorrowInput component
Sterioboy Aug 14, 2024
623c739
feat:nftInfo DTO updated
Sterioboy Aug 19, 2024
a6ac183
wip: connected NFTDetail page with the updated API
Sterioboy Aug 20, 2024
3bd4986
fix: deprecated comp-t fix
Sterioboy Aug 20, 2024
4a85c24
fix: deprecated comp-t fix
Sterioboy Aug 20, 2024
3099eb1
refactor: updated the deprecated components
Sterioboy Aug 20, 2024
ae21509
refactor: updated the deprecated components
Sterioboy Aug 20, 2024
a43b49c
refactor: removed deprecated Borrow component
Sterioboy Aug 20, 2024
413cd9e
comment: specified mocked screens
Sterioboy Sep 3, 2024
ce2bccd
feat: refactored NFT remaingn days utils, added NFT list counter, add…
Sterioboy Sep 3, 2024
ab20202
feat: unstaking flow pages, NFTList component refactoring, utils func…
Sterioboy Sep 4, 2024
530f0ad
feat: unstaking detail screen, unstaking conirmations modals, borrowi…
Sterioboy Sep 5, 2024
3a6828e
feat: conditional unstaking btn display, minor fixes
Sterioboy Sep 5, 2024
b77ef6f
feat: connected GET unstaking info API, NFT img-s updated, Nominator …
Sterioboy Sep 6, 2024
22e35cf
feat: unstaked list screen
Sterioboy Sep 9, 2024
d1e29d5
fix: imports updated
Sterioboy Sep 9, 2024
d08a4c0
feat: myAssets filtering, empty NFTs Fallback
Sterioboy Sep 10, 2024
406d7cc
feat: myAssets nfts list empty fallback
Sterioboy Sep 10, 2024
5fbd02b
feat: ustakingList API connected, unstakingItem implemented
Sterioboy Sep 11, 2024
0b264b4
fix: props resolved
Sterioboy Sep 11, 2024
0e42f4e
feat: added view unstaking screen & error/loading fallbacks
Sterioboy Sep 13, 2024
3f59356
feat: loaders & errors interceptor added
Sterioboy Sep 19, 2024
c230b04
Merge branch 'main' into feat/loan-screens
Sterioboy Oct 10, 2024
57cd8d3
fix: post-merge fixes
Sterioboy Oct 10, 2024
9d6f71a
wip: unstaking smart-contract wrapper init
Sterioboy Oct 10, 2024
80efc33
wip: unstaking smart-contract wrapper init
Sterioboy Oct 10, 2024
c31f0e3
Merge branch 'main' into feat/loan-screens
Sterioboy Oct 10, 2024
9734f15
update: lock-file updated
Sterioboy Oct 10, 2024
98ab8a6
wip: ustaking flow SC connection
Sterioboy Oct 11, 2024
b132257
feat: unstakableDate format unified
Sterioboy Oct 11, 2024
da5ab98
fix: routing
Sterioboy Oct 11, 2024
b03d0d1
feat: NFT img-s updated
Sterioboy Oct 14, 2024
79b9e10
feat: successfully staked page add
jymin99 Oct 17, 2024
258de89
feat:successfully-staked-page add
jymin99 Oct 17, 2024
2dc787d
fix:build error resolve
jymin99 Oct 17, 2024
03fdc6d
style:referral image change
jymin99 Oct 17, 2024
872f392
fix:button change and nft information fix
jymin99 Oct 17, 2024
eb650ff
fix:nft info error fix
jymin99 Oct 17, 2024
d118dcd
fix:toastpopup-loacation-fix
jymin99 Oct 17, 2024
4e7a518
fix:toastpopup error fix
jymin99 Oct 17, 2024
ee7ef87
fix:toastpopup location change
jymin99 Oct 17, 2024
1ce0108
fix:stake success popup initialize fix
jymin99 Oct 17, 2024
ab2fce4
fix:toast pop up success
jymin99 Oct 17, 2024
e639216
fix:주석 풀어서 nft 이미지 적용
jymin99 Oct 18, 2024
63064d2
feat:dashboard page tvl tooltip 추가
Oct 28, 2024
e2149f9
fix: module error resolve
Oct 28, 2024
5d58af0
test: google analytics test
Oct 29, 2024
7083f0d
test: 원상복구
Oct 29, 2024
67473f5
style: loan header 변경
jymin99 Dec 2, 2024
2c31dac
loan: button abled
jymin99 Dec 3, 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
11,132 changes: 6,062 additions & 5,070 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@
"ngrok": "^5.0.0-beta.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-dropdown": "^1.11.0",
"react-hook-form": "^7.51.4",
"react-hot-toast": "^2.4.1",
"react-icons": "^5.3.0",
"react-loader-spinner": "^6.1.6",
"react-number-format": "^5.3.4",
"react-router-dom": "^6.14.2",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/icons/Dashboard/ic_stake_link_arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icons/Landing/ic_more_arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icons/Landing/ic_nftMore_arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icons/Landing/ic_nftMore_arrow_disabled.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/assets/icons/Landing/ic_wallet_connect.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/Loan/ic_alert.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/Loan/ic_arrow_right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/icons/Loan/ic_bars.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/Loan/ic_exclude.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion src/assets/icons/Loan/ic_loan_arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/assets/icons/Loan/ic_ton_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/Loan/ic_trend_right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/Loan/ic_trend_up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icons/Main/ic_lst_coin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/assets/icons/Menu/ic_menu_asset.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions src/assets/icons/Menu/ic_menu_dashboard.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icons/Menu/ic_menu_sad_smile.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icons/Menu/ic_menu_swap.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/assets/icons/Modal/ic_close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icons/Modal/ic_modal_arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icons/MyAsset/ic_arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icons/MyAsset/ic_arrow_down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icons/MyAsset/ic_arrow_right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icons/MyAsset/ic_arrow_up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icons/MyAsset/ic_cardCheck_active.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icons/MyAsset/ic_cardCheck_disable.svg
2 changes: 1 addition & 1 deletion src/assets/icons/MyAsset/ic_card_active.svg
2 changes: 1 addition & 1 deletion src/assets/icons/MyAsset/ic_card_disable.svg
Loading