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

Add Shibuya Scope Style #1078

Merged
merged 35 commits into from
Dec 20, 2023
Merged

Conversation

ayumitk
Copy link
Contributor

@ayumitk ayumitk commented Dec 6, 2023

Pull Request Summary

Describe what changes this pull request makes to the repository

Check list

  • contains breaking changes
  • adds new feature
  • modifies existing feature (bug fix or improvements)
  • relies on other tasks
  • documentation changes
  • tested on mobile devices

This pull request makes the following changes:

Adds

  • (ex: Add feature A)

Fixes

  • (ex: Fix validation function)

Changes

  • (ex: Change document B)

To-dos

*Feel free to remove this section if it's not applicable

  • (ex: add user list)

Copy link

github-actions bot commented Dec 6, 2023

Visit the preview URL for this PR (updated for commit 696e13d):

https://astar-apps--pr1078-feat-shibuya-scope-s-pnqon4og.web.app

(expires Wed, 27 Dec 2023 17:43:55 GMT)

🔥 via Firebase Hosting GitHub Action 🌎

Sign: dd76fe72958fe2910fef9d53f0b4539b82b849db

@ayumitk
Copy link
Contributor Author

ayumitk commented Dec 9, 2023

Note:

dApp staking page

  • dApps list categories
  • Replace icon to AstarUI

Vote/Stake page

  • Dark theme background
  • Side help

Project page

  • Heart icon button logic
  • Images slider
  • Team members slider
  • Background blur image

Owner page

  • Static

Assets page

  • Replace icon to AstarUI

@Kahonnohak
Copy link
Contributor

Hi!!

You could keep adding...

  1. Leaderboard
    A. each project is clickable
    B. please add page nation
    C. please also add rewards next to the tier
Screenshot 2023-12-13 at 07 30 45
  1. project card
    A. card design slightly changed (Like is not the feature yet) so if you have time you can change this now. the short description is coming from registration page that needs to be changed too, I will create amended registration page so we know whats been removed and added.
    B. Also add categories
    C. Search
Screenshot 2023-12-13 at 07 35 00
  1. Build /Vote period backgrounds

  2. Vote period hero

I will keep adding more as I review xx

@Kahonnohak
Copy link
Contributor

@ayumitk could you also keep all dummy numbers --- instead of 123 please so we can see the logic is missing? Thank you! we don't have static numbers, all should have logic:)

@ayumitk
Copy link
Contributor Author

ayumitk commented Dec 14, 2023

@Kahonnohak Here is my progress.

1. Leaderboard
A. each project is clickable - done
B. please add page nation - done (2 pages for now)
C. please also add rewards next to the tier - done (no logic)

2. project card
A. card design slightly changed - done
B. Also add categories - done
C. Search - done

3. Build /Vote period backgrounds
not yet

4. Vote period hero
not yet

could you also keep all dummy numbers --- instead of 123 please so we can see the logic is missing? Thank you! we don't have static numbers, all should have logic:)

It seems Bobo and Roy set -- instead of 123. If you find a static number, please let me know.

Also, there are some conflicts because of #1089, so I'll resolve them first and if i still have time, I'll fix the rest of feedback tomorrow.

@ayumitk
Copy link
Contributor Author

ayumitk commented Dec 15, 2023

@Kahonnohak I've resolve conflicts and updated 1.Leaderboard and 2.project card styles.

I'll work on

  1. Build /Vote period backgrounds
  2. Vote period hero

next week.

Can I ask the UI team to review this PR?

@ayumitk ayumitk marked this pull request as ready for review December 15, 2023 07:35
@Kahonnohak
Copy link
Contributor

@Kahonnohak I've resolve conflicts and updated 1.Leaderboard and 2.project card styles.

I'll work on

  1. Build /Vote period backgrounds
  2. Vote period hero

next week.

Can I ask the UI team to review this PR?

Thank you!
Yes lets, since Roy is on holiday next week he can take a look this afternoon.


const value = props.search.toLowerCase();

const result = dapps
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can simplify this logic by using dapps.filter

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bobo-k2 I've updated this logic in ccb7070. Please review again

@@ -3,23 +3,37 @@
<!-- Todo: Delete -->
<!-- <staking-home /> -->
<feature-dapp />
<staking />
<!-- <staking /> -->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should have Staking component on main dApp staking page. It is weird for me that I can't see my rewards and staked dApps when I come do dApp staking home page. It is fine to have Staking component on Assets page too. cc @Kahonnohak

const { getDappTier } = useDappStaking();
const { navigateToVote } = useDappStakingNavigation();

console.log('dapp', props.dapp);
Copy link
Contributor

@bobo-k2 bobo-k2 Dec 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delete if this is for debugging purpose. I plan to clear all console outputs in dApp staking expect for a places where we are logging subsciption events, e.g .protocol state changed, ledger changed...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bobo-k2 I've deleted it in 8947a54

}
@import './styles/leaderboard.scss';
@import './styles/tier.scss';
// @use 'src/css/quasar.variables.scss';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delete commented styles.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bobo-k2 I've deleted them in 8947a54

(dapp) =>
dapp.basic.name.toLowerCase().includes(value) ||
dapp.basic.shortDescription.toLowerCase().includes(value)
);
return result.length > 0 ? result : [];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

? operator is not needed here. Since filter function returns [] if no elements found. Just simply return result;

@Kahonnohak
Copy link
Contributor

Kahonnohak commented Dec 18, 2023

Voting page was confusing and added some changes, also moved the first box to the right so it has better view.

  • All numbers, tidied up. @bobo-k2 please help the logic
  • Rewards, made difference so people can notice
  • NOTE - moved to the right. Other banners are not fixed so no need to touch now. (NOTE stays in the same place on the mobile)

Shibuya-release-vote



  • Only show the warning message when locked token are not voted
  • Remove transferable but add total available funds next to
  • Add Total new vote
Screenshot 2023-12-15 at 12 50 08


- Please add one sentence "I would like to vote my tokens with" I think this makes a lot sense
  • Please add hover (border blue) on the page (choose project to vote/ input tokens) and search modal


Screenshot 2023-12-19 at 14 22 15
Screenshot 2023-12-19 at 14 23 45

- This is mobile modal - since we want to change the modal itself it doesn't matter - just to note not to forget (priority is higher for all backgrounds and some behaviours than this. just try to put all related Vote page here

Screenshot 2023-12-19 at 14 39 08

@bobo-k2
Copy link
Contributor

bobo-k2 commented Dec 18, 2023

Voting page was confusing and added some changes, also moved the first box to the right so it has better view.

@ayumitk just do styling and leave rows as they are. I will do the rest, rows removal/adjustments in another PR, after this one is merged.

@ayumitk ayumitk merged commit caaaf72 into feat/dapp-staking-v3 Dec 20, 2023
4 checks passed
@ayumitk ayumitk deleted the feat/shibuya-scope-style branch December 20, 2023 17:39
bobo-k2 added a commit that referenced this pull request Jan 8, 2024
* Defined v3 project structure

* Stake, unstake skeletons

* Code organization improvements

* Get protocol state

* Protocol change notification message

* Lock and stake

* Read account ledger

* Unstake call

* unstake and unlock, claim staker

* Staker info

* Started with can stake logic

* Updated node types

* Staker reward calculation part 1

* Staker rewards calculation part 2

* dApp rewards calculation and claim

* Calculate and claim bonus rewards

* Calculate claim staker batch size fix

* Rewards fetch fix

* can claim methods

* Can Claim bug fix

* feat: Prevents Errors from Occuring (#1026)

* Prevents UnavailableStakeFunds

* rephrase

* Prevent tooManyStakedContracts, unclaimedRewardsFromPastPeriods

* less logs

* unstake Prevents UnstakeAmountTooLarge ZeroAmount Disabled

* UnclaimedRewardsFromPastPeriods

* feat: added top page (#1033)

* Vote mobile page and logic (#1036)

* Voting page created

* Voting page - part 1

* Vote logic

---------

Co-authored-by: impelcrypto <impelcrypto@gmail.com>

* Vote batch bug fixes

* vote and dictionary changes (#1037)

* vote and dictionary changes

* fix value and more

* vote checks

* Vote on multiple dApps  (#1046)

* FeatureDapp logic

* Search dApps

* Implemented stake on multiple dApps

* dApp tiers

* Switch periods on UI

* Removed separate link for staking v3

* Dapp rewards per period calculation

* feat: link to the project page (#1049)

* feat: link to the project page

* fix: display dapp data

* fix: clean up

* fix: clean up

* fix: clean up

* styles: added 'current tier' and 'total earned' (#1053)

* pulled latest main branch (#1057)

* merge the `release-hotfix` to `main` branch (#1025)

* fix: enables Snap on the production (#1024)

* Add a link to the docs (#1027)

* fix: words (#1028)

* fix: display the staking list for EVM accounts (#1030)

---------

Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>

* dApp fetching optimization (#1041)

* dApp fetching optimization

* An additional tiny optimization

* Update assets page layout (#956)

* Update assets page layout

* style update

* clean up

* replace transfer button to icon

* Align icon buttons on the right side

* Add navy-4 colour

* Update text color from default black to navy-1

* align token balance positions

* Adjust breakpoint for account section

* fix pointer events depends on screen size

* use i18n

* update asset search style

* Add faucet icon

* align token balance

* add reward animation

* remove static texts from account section

* Update AstarUI and replace icons

* remove claim button from reward section

* fix rewards section

* fix background image

* set max width

* update styles

* update delete button style

* move reward button next to account info

* Header style update

* update header color

* Add border color variation

* update to simple style

* remove old background image

* fix account icon size

* update sidebar size

* add border color for zKatana

* Update header icon styles

* update

* update style

* add icons

* Ads

* remove dynamic links

* update asset page style

* adjust border thickness 3px

* add background images

* add accout background

* update evm native token section style

* add ads style

* asset page wrapper space

* update header style

* add mobile nav

* Update styles

* add side ad area

* update Erx20Currency

* update account bg

* Add Rewards section

* Add rewards style

* update mobile nav

* update rewards style

* add mobile nav

* hide expand icon for mobile

* remove duplicated transfable

* display none

* revert

* Add assets list icon

* change-dark-bk

* add claim function

* fix mobile nav scroll

* update styles

* Remove transferable and comment out e2e test

* replace rewards section div to button

* add-account-images

* add shiden and testnet background

* Add transfer button for shibuya

* update native asset list style

* fix: updated rewards UI on the assets page (#1042)

* fix: fetch estimated rewards

* fix: updated rewards UI on the assets page

* fix: clean up

* fix: do not allow to select ZK network if the portal connects to native wallet

* fix: display background when the app is claiming rewards (#1045)

* fix: E2E test for new assets page  (#1044)

* fix: E2E test

* fix: E2E test (2)

* fix: remove --debug from 'playwright' command

* fix: include vesting amount in locked tokens (#1043)

* amend-style (#1047)

* fix: clean up

* fix: clean up

* use i18n

* clean up

* replace numers to endpointKey enum

* replace svg icons to astar ui

---------

Co-authored-by: Kahori Razzell <kahorirazzell@Kahoris-MacBook-Pro.local>
Co-authored-by: kahonnohak <kahon.nohak@gmail.com>
Co-authored-by: impelcrypto <92044428+impelcrypto@users.noreply.github.com>
Co-authored-by: impelcrypto <impelcrypto@gmail.com>
Co-authored-by: Kahori <77480847+Kahonnohak@users.noreply.github.com>

* fix-styling (#1054)

* merge 'release-hotfix' to 'main' (#1052)

* fix: enables Snap on the production (#1024)

* Add a link to the docs (#1027)

* fix: words (#1028)

* fix: display the staking list for EVM accounts (#1030)

* Ignore gas station (#1050)

* Ignore gas station

* Turned off Gas station everywhere

* Ignore another one gas station call

---------

Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>
Co-authored-by: Bobo <bobo.kovacevic@gmail.com>

* fix: resolved new assets page bugs (#1055)

* fix: close the modal after claiming EVM withdrawal

* fix: close the modal after claiming EVM withdrawal (2)

* fix: ModalVesting.vue

* fix: link to subscan for WASM projects

* feat: added Reserved section

* feat: added Reserved section (2)

* fix: words

* fix: refactor

---------

Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>
Co-authored-by: Bobo <bobo.kovacevic@gmail.com>
Co-authored-by: Kahori Razzell <kahorirazzell@Kahoris-MacBook-Pro.local>
Co-authored-by: kahonnohak <kahon.nohak@gmail.com>
Co-authored-by: Kahori <77480847+Kahonnohak@users.noreply.github.com>

* Staking panels and leaderboard (#1056)

* Get contract stake

* Initial leaderboard version

* voting call refactoring

* Tier rewards updates

* Leaderboard rendering fix

* My staking components

* Staking components logic done

* Re-lock unlocking chunks

* Unbonding modal

* Bonus rewards calculation bug fix

* Minor navigation refactoring

* Display total stake

* PropType fix

* Total stake calculation fix

* feat: added owner section on the assets page (#1059)

* merge the `release-hotfix` to `main` branch (#1025)

* fix: enables Snap on the production (#1024)

* Add a link to the docs (#1027)

* fix: words (#1028)

* fix: display the staking list for EVM accounts (#1030)

---------

Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>

* dApp fetching optimization (#1041)

* dApp fetching optimization

* An additional tiny optimization

* Update assets page layout (#956)

* Update assets page layout

* style update

* clean up

* replace transfer button to icon

* Align icon buttons on the right side

* Add navy-4 colour

* Update text color from default black to navy-1

* align token balance positions

* Adjust breakpoint for account section

* fix pointer events depends on screen size

* use i18n

* update asset search style

* Add faucet icon

* align token balance

* add reward animation

* remove static texts from account section

* Update AstarUI and replace icons

* remove claim button from reward section

* fix rewards section

* fix background image

* set max width

* update styles

* update delete button style

* move reward button next to account info

* Header style update

* update header color

* Add border color variation

* update to simple style

* remove old background image

* fix account icon size

* update sidebar size

* add border color for zKatana

* Update header icon styles

* update

* update style

* add icons

* Ads

* remove dynamic links

* update asset page style

* adjust border thickness 3px

* add background images

* add accout background

* update evm native token section style

* add ads style

* asset page wrapper space

* update header style

* add mobile nav

* Update styles

* add side ad area

* update Erx20Currency

* update account bg

* Add Rewards section

* Add rewards style

* update mobile nav

* update rewards style

* add mobile nav

* hide expand icon for mobile

* remove duplicated transfable

* display none

* revert

* Add assets list icon

* change-dark-bk

* add claim function

* fix mobile nav scroll

* update styles

* Remove transferable and comment out e2e test

* replace rewards section div to button

* add-account-images

* add shiden and testnet background

* Add transfer button for shibuya

* update native asset list style

* fix: updated rewards UI on the assets page (#1042)

* fix: fetch estimated rewards

* fix: updated rewards UI on the assets page

* fix: clean up

* fix: do not allow to select ZK network if the portal connects to native wallet

* fix: display background when the app is claiming rewards (#1045)

* fix: E2E test for new assets page  (#1044)

* fix: E2E test

* fix: E2E test (2)

* fix: remove --debug from 'playwright' command

* fix: include vesting amount in locked tokens (#1043)

* amend-style (#1047)

* fix: clean up

* fix: clean up

* use i18n

* clean up

* replace numers to endpointKey enum

* replace svg icons to astar ui

---------

Co-authored-by: Kahori Razzell <kahorirazzell@Kahoris-MacBook-Pro.local>
Co-authored-by: kahonnohak <kahon.nohak@gmail.com>
Co-authored-by: impelcrypto <92044428+impelcrypto@users.noreply.github.com>
Co-authored-by: impelcrypto <impelcrypto@gmail.com>
Co-authored-by: Kahori <77480847+Kahonnohak@users.noreply.github.com>

* fix-styling (#1054)

* merge 'release-hotfix' to 'main' (#1052)

* fix: enables Snap on the production (#1024)

* Add a link to the docs (#1027)

* fix: words (#1028)

* fix: display the staking list for EVM accounts (#1030)

* Ignore gas station (#1050)

* Ignore gas station

* Turned off Gas station everywhere

* Ignore another one gas station call

---------

Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>
Co-authored-by: Bobo <bobo.kovacevic@gmail.com>

* fix: resolved new assets page bugs (#1055)

* fix: close the modal after claiming EVM withdrawal

* fix: close the modal after claiming EVM withdrawal (2)

* fix: ModalVesting.vue

* fix: link to subscan for WASM projects

* feat: added Reserved section

* feat: added Reserved section (2)

* fix: words

* fix: refactor

* fix: display the amount of estimated rewards for Shibuya (#1058)

* feat: added owner page

* feat: added your-project section

* feat: resolve errors when the app connected to Astar

* feat: resolve errors when the app connected to Astar (2)

* feat: updated owner section

* fix: clean up

* fix: link to the owner page

---------

Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>
Co-authored-by: Bobo <bobo.kovacevic@gmail.com>
Co-authored-by: Kahori Razzell <kahorirazzell@Kahoris-MacBook-Pro.local>
Co-authored-by: kahonnohak <kahon.nohak@gmail.com>
Co-authored-by: Kahori <77480847+Kahonnohak@users.noreply.github.com>

* Staking v3 data (#1064)

* Data list component and refactoring

* Leader board properly assign tiers ans style improvements

* Day of a period calculation fix

* Prevent multiple dapps data loading

* Update src/App.vue

Co-authored-by: impelcrypto <92044428+impelcrypto@users.noreply.github.com>

---------

Co-authored-by: impelcrypto <92044428+impelcrypto@users.noreply.github.com>

* Compatibility issues fix (#1075)

* Refresh TVL on unstake

* Compatibility issues fix

* feat: maxUnlockingChunks (#1071)

* maxUnlockingChunks

* using getDapp method

* Remove commented

* feat: added owner section (#1079)

* feat: added rewards section

* feat: added edit section

* fix: refactor

* fix: i18

* fix: copy the project page components to the staking-v3 folder (#1085)

* fix: copy project page components to staking-v3 folder

* fix: updated astar.yml

* fix: rollback the endpoint in astar.yml

* Owner page logic and unstake from unregistered (#1088)

* Unstake from unregistered

* usePeriod hook

* era lengths

* Owner page logic

* Owner page fixes

* Fixes on your projects and dapp select modal

* Successful vote message

* Feat/staking v3 improvements4 (#1089)

* Unstake from unregistered

* usePeriod hook

* era lengths

* Owner page logic

* Owner page fixes

* Fixes on your projects and dapp select modal

* Successful vote message

* Leaderboard voting

* Group dApps by category

* Cleanup expired entries

* dApp page logic

* Minor Dapps component styling

* Select up to max number of staked contracts for voting

* Navigate to staking home if a dApp doesn't exists

* Add Shibuya Scope Style (#1078)

* add feature dApp area style

* add dapps list and data list area style

* add ad area style

* add Leaderboard area style

* move staking section to assets page

* update the your projects section style  on the assets page

* move css files

* add staking section style on the assets page

* add vote and stake page style

* adjust tvl text size

* add owner page style

* update astar ui

* remove dark theme style from the vote page

* update vote page style

* remove dark theme from dapp staking pages

* add project page style

* clean up

* add Leaderboard style

* update dapp style

* update lang

* add input search

* update

* update leaderboard style

* add category style

* add tier paging

* Small fix for loading a dApp

* Changed a way how to subscribe and handle protocol state

* clean up

* update dapps search logic

* remove operator from filter function

---------

Co-authored-by: Bobo <bobo.kovacevic@gmail.com>

* Show success messages and tier rewards (#1097)

* add feature dApp area style

* add dapps list and data list area style

* add ad area style

* add Leaderboard area style

* move staking section to assets page

* update the your projects section style  on the assets page

* move css files

* add staking section style on the assets page

* add vote and stake page style

* adjust tvl text size

* add owner page style

* update astar ui

* remove dark theme style from the vote page

* update vote page style

* remove dark theme from dapp staking pages

* add project page style

* clean up

* add Leaderboard style

* update dapp style

* update lang

* add input search

* Added success message to all calls

* update

* update leaderboard style

* add category style

* add tier paging

* Small fix for loading a dApp

* Changed a way how to subscribe and handle protocol state

* clean up

* update dapps search logic

* Show error message from canUnstake function

* Display tier daily rewards

---------

Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>

* dApp search bug fix, amount to be locked fix

* Build error fix

* Nomination transfer

* Disable Vote button if no stakes.

* Reward calculation fix, unlock

* v3 vote period style (#1098)

* remove the unnecessary div from assets page

* adjust vote page style

* add hover color to search, selector

* update vote page style

* add animated vote button

* add vote period hero

* update dapps slide style

* update leaderboard text

* update vote page column order

* Show nomination transfer info on Voting page

* feat: added EVM supports (#1102)

* Vote with EVM

* Fetch rewards for evm account

* feat: updated V3 via EVM logic (#1101)

* feat: updated claimUnstakeAndUnlock

* fix: clean up

* feat: added EVM calls

* fix: link to the vote page

* fix: clean up

* fix: conflicts (2)

* fix: claimUnstakeAndUnlock fn

* Build errors fix

* Build error fix 2

* Fix for initial loading of ledger and stakerInfo

* Ledger subscription fix

* Removed gas estimation

* refactor: added batch methods

* Remove senderSs58Account from hook since address mapping logic is moved to the service

* Disable canUnstake

* Linter fix

---------

Co-authored-by: Bobo <bobo.kovacevic@gmail.com>

* EVM unlock fix

* fix: added todo comment

* GetTier bug fix and removed some comments

* fix: removed unused files

* Comments cleanup

* Gas price provider fix

* Message subscriptions, check value before assignment.

* Nomination transfer bug fix, styling and translations

* Nomination transfer amount, total stake

* Leaderboard fix, multiplier removed

* Staker reward calculation optimisation

* Clam banner text update for Shibuya

* Voting period countdown

* Current period day and canConfirm fixes

* feat: update project page styles (#1109)

* add project icon background

* add project icon background to the owner page

* update all vote/stake button background

* fix app height

* move the register button to the assets page

* fix assets page container

* remove the license section from the project page

* made the header scroll

* add small dapp header

* fix v2 style

* remove the register banner from the assets page for now

* fix vote page layout

* fix vote period background

* adjust small header style and heart icon button

* update maintenance mode style

* update

* feat: add migrate support style (#1114)

* add migrate support style

* fix lang file

* Hide migration support for now

* feat: added staker and bonus rewards APR (#1113)

* feat: added useAprV3

* wip: staker rewards

* wip: staker rewards (2)

* wip: staker rewards (3)

* wip: staker rewards (4)

* wip: staker rewards (5)

* wip: staker rewards (6)

* wip: staker rewards (7)

* wip: staker rewards (8)

* feat: added basic rewards in the voting section

* fix: clean up

* fix: refactor

* feat: added bonus APR

* fix: clean up

* fix: set the periodsPerCycle from network name temporarily

* fix: set the periodsPerCycle from network name temporarily (2)

---------

Co-authored-by: impelcrypto <impelcrypto@gmail.com>
Co-authored-by: Gregory Luneau <greg@astar.network>
Co-authored-by: impelcrypto <92044428+impelcrypto@users.noreply.github.com>
Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>
Co-authored-by: Kahori Razzell <kahorirazzell@Kahoris-MacBook-Pro.local>
Co-authored-by: kahonnohak <kahon.nohak@gmail.com>
Co-authored-by: Kahori <77480847+Kahonnohak@users.noreply.github.com>
bobo-k2 added a commit that referenced this pull request Jan 13, 2024
* Defined v3 project structure

* Stake, unstake skeletons

* Code organization improvements

* Get protocol state

* Protocol change notification message

* Lock and stake

* Read account ledger

* Unstake call

* unstake and unlock, claim staker

* Staker info

* Started with can stake logic

* Updated node types

* Staker reward calculation part 1

* Staker rewards calculation part 2

* dApp rewards calculation and claim

* Calculate and claim bonus rewards

* Calculate claim staker batch size fix

* Rewards fetch fix

* can claim methods

* Can Claim bug fix

* feat: Prevents Errors from Occuring (#1026)

* Prevents UnavailableStakeFunds

* rephrase

* Prevent tooManyStakedContracts, unclaimedRewardsFromPastPeriods

* less logs

* unstake Prevents UnstakeAmountTooLarge ZeroAmount Disabled

* UnclaimedRewardsFromPastPeriods

* feat: added top page (#1033)

* Vote mobile page and logic (#1036)

* Voting page created

* Voting page - part 1

* Vote logic

---------

Co-authored-by: impelcrypto <impelcrypto@gmail.com>

* Vote batch bug fixes

* vote and dictionary changes (#1037)

* vote and dictionary changes

* fix value and more

* vote checks

* Vote on multiple dApps  (#1046)

* FeatureDapp logic

* Search dApps

* Implemented stake on multiple dApps

* dApp tiers

* Switch periods on UI

* Removed separate link for staking v3

* Dapp rewards per period calculation

* feat: link to the project page (#1049)

* feat: link to the project page

* fix: display dapp data

* fix: clean up

* fix: clean up

* fix: clean up

* styles: added 'current tier' and 'total earned' (#1053)

* pulled latest main branch (#1057)

* merge the `release-hotfix` to `main` branch (#1025)

* fix: enables Snap on the production (#1024)

* Add a link to the docs (#1027)

* fix: words (#1028)

* fix: display the staking list for EVM accounts (#1030)

---------

Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>

* dApp fetching optimization (#1041)

* dApp fetching optimization

* An additional tiny optimization

* Update assets page layout (#956)

* Update assets page layout

* style update

* clean up

* replace transfer button to icon

* Align icon buttons on the right side

* Add navy-4 colour

* Update text color from default black to navy-1

* align token balance positions

* Adjust breakpoint for account section

* fix pointer events depends on screen size

* use i18n

* update asset search style

* Add faucet icon

* align token balance

* add reward animation

* remove static texts from account section

* Update AstarUI and replace icons

* remove claim button from reward section

* fix rewards section

* fix background image

* set max width

* update styles

* update delete button style

* move reward button next to account info

* Header style update

* update header color

* Add border color variation

* update to simple style

* remove old background image

* fix account icon size

* update sidebar size

* add border color for zKatana

* Update header icon styles

* update

* update style

* add icons

* Ads

* remove dynamic links

* update asset page style

* adjust border thickness 3px

* add background images

* add accout background

* update evm native token section style

* add ads style

* asset page wrapper space

* update header style

* add mobile nav

* Update styles

* add side ad area

* update Erx20Currency

* update account bg

* Add Rewards section

* Add rewards style

* update mobile nav

* update rewards style

* add mobile nav

* hide expand icon for mobile

* remove duplicated transfable

* display none

* revert

* Add assets list icon

* change-dark-bk

* add claim function

* fix mobile nav scroll

* update styles

* Remove transferable and comment out e2e test

* replace rewards section div to button

* add-account-images

* add shiden and testnet background

* Add transfer button for shibuya

* update native asset list style

* fix: updated rewards UI on the assets page (#1042)

* fix: fetch estimated rewards

* fix: updated rewards UI on the assets page

* fix: clean up

* fix: do not allow to select ZK network if the portal connects to native wallet

* fix: display background when the app is claiming rewards (#1045)

* fix: E2E test for new assets page  (#1044)

* fix: E2E test

* fix: E2E test (2)

* fix: remove --debug from 'playwright' command

* fix: include vesting amount in locked tokens (#1043)

* amend-style (#1047)

* fix: clean up

* fix: clean up

* use i18n

* clean up

* replace numers to endpointKey enum

* replace svg icons to astar ui

---------

Co-authored-by: Kahori Razzell <kahorirazzell@Kahoris-MacBook-Pro.local>
Co-authored-by: kahonnohak <kahon.nohak@gmail.com>
Co-authored-by: impelcrypto <92044428+impelcrypto@users.noreply.github.com>
Co-authored-by: impelcrypto <impelcrypto@gmail.com>
Co-authored-by: Kahori <77480847+Kahonnohak@users.noreply.github.com>

* fix-styling (#1054)

* merge 'release-hotfix' to 'main' (#1052)

* fix: enables Snap on the production (#1024)

* Add a link to the docs (#1027)

* fix: words (#1028)

* fix: display the staking list for EVM accounts (#1030)

* Ignore gas station (#1050)

* Ignore gas station

* Turned off Gas station everywhere

* Ignore another one gas station call

---------

Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>
Co-authored-by: Bobo <bobo.kovacevic@gmail.com>

* fix: resolved new assets page bugs (#1055)

* fix: close the modal after claiming EVM withdrawal

* fix: close the modal after claiming EVM withdrawal (2)

* fix: ModalVesting.vue

* fix: link to subscan for WASM projects

* feat: added Reserved section

* feat: added Reserved section (2)

* fix: words

* fix: refactor

---------

Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>
Co-authored-by: Bobo <bobo.kovacevic@gmail.com>
Co-authored-by: Kahori Razzell <kahorirazzell@Kahoris-MacBook-Pro.local>
Co-authored-by: kahonnohak <kahon.nohak@gmail.com>
Co-authored-by: Kahori <77480847+Kahonnohak@users.noreply.github.com>

* Staking panels and leaderboard (#1056)

* Get contract stake

* Initial leaderboard version

* voting call refactoring

* Tier rewards updates

* Leaderboard rendering fix

* My staking components

* Staking components logic done

* Re-lock unlocking chunks

* Unbonding modal

* Bonus rewards calculation bug fix

* Minor navigation refactoring

* Display total stake

* PropType fix

* Total stake calculation fix

* feat: added owner section on the assets page (#1059)

* merge the `release-hotfix` to `main` branch (#1025)

* fix: enables Snap on the production (#1024)

* Add a link to the docs (#1027)

* fix: words (#1028)

* fix: display the staking list for EVM accounts (#1030)

---------

Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>

* dApp fetching optimization (#1041)

* dApp fetching optimization

* An additional tiny optimization

* Update assets page layout (#956)

* Update assets page layout

* style update

* clean up

* replace transfer button to icon

* Align icon buttons on the right side

* Add navy-4 colour

* Update text color from default black to navy-1

* align token balance positions

* Adjust breakpoint for account section

* fix pointer events depends on screen size

* use i18n

* update asset search style

* Add faucet icon

* align token balance

* add reward animation

* remove static texts from account section

* Update AstarUI and replace icons

* remove claim button from reward section

* fix rewards section

* fix background image

* set max width

* update styles

* update delete button style

* move reward button next to account info

* Header style update

* update header color

* Add border color variation

* update to simple style

* remove old background image

* fix account icon size

* update sidebar size

* add border color for zKatana

* Update header icon styles

* update

* update style

* add icons

* Ads

* remove dynamic links

* update asset page style

* adjust border thickness 3px

* add background images

* add accout background

* update evm native token section style

* add ads style

* asset page wrapper space

* update header style

* add mobile nav

* Update styles

* add side ad area

* update Erx20Currency

* update account bg

* Add Rewards section

* Add rewards style

* update mobile nav

* update rewards style

* add mobile nav

* hide expand icon for mobile

* remove duplicated transfable

* display none

* revert

* Add assets list icon

* change-dark-bk

* add claim function

* fix mobile nav scroll

* update styles

* Remove transferable and comment out e2e test

* replace rewards section div to button

* add-account-images

* add shiden and testnet background

* Add transfer button for shibuya

* update native asset list style

* fix: updated rewards UI on the assets page (#1042)

* fix: fetch estimated rewards

* fix: updated rewards UI on the assets page

* fix: clean up

* fix: do not allow to select ZK network if the portal connects to native wallet

* fix: display background when the app is claiming rewards (#1045)

* fix: E2E test for new assets page  (#1044)

* fix: E2E test

* fix: E2E test (2)

* fix: remove --debug from 'playwright' command

* fix: include vesting amount in locked tokens (#1043)

* amend-style (#1047)

* fix: clean up

* fix: clean up

* use i18n

* clean up

* replace numers to endpointKey enum

* replace svg icons to astar ui

---------

Co-authored-by: Kahori Razzell <kahorirazzell@Kahoris-MacBook-Pro.local>
Co-authored-by: kahonnohak <kahon.nohak@gmail.com>
Co-authored-by: impelcrypto <92044428+impelcrypto@users.noreply.github.com>
Co-authored-by: impelcrypto <impelcrypto@gmail.com>
Co-authored-by: Kahori <77480847+Kahonnohak@users.noreply.github.com>

* fix-styling (#1054)

* merge 'release-hotfix' to 'main' (#1052)

* fix: enables Snap on the production (#1024)

* Add a link to the docs (#1027)

* fix: words (#1028)

* fix: display the staking list for EVM accounts (#1030)

* Ignore gas station (#1050)

* Ignore gas station

* Turned off Gas station everywhere

* Ignore another one gas station call

---------

Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>
Co-authored-by: Bobo <bobo.kovacevic@gmail.com>

* fix: resolved new assets page bugs (#1055)

* fix: close the modal after claiming EVM withdrawal

* fix: close the modal after claiming EVM withdrawal (2)

* fix: ModalVesting.vue

* fix: link to subscan for WASM projects

* feat: added Reserved section

* feat: added Reserved section (2)

* fix: words

* fix: refactor

* fix: display the amount of estimated rewards for Shibuya (#1058)

* feat: added owner page

* feat: added your-project section

* feat: resolve errors when the app connected to Astar

* feat: resolve errors when the app connected to Astar (2)

* feat: updated owner section

* fix: clean up

* fix: link to the owner page

---------

Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>
Co-authored-by: Bobo <bobo.kovacevic@gmail.com>
Co-authored-by: Kahori Razzell <kahorirazzell@Kahoris-MacBook-Pro.local>
Co-authored-by: kahonnohak <kahon.nohak@gmail.com>
Co-authored-by: Kahori <77480847+Kahonnohak@users.noreply.github.com>

* Staking v3 data (#1064)

* Data list component and refactoring

* Leader board properly assign tiers ans style improvements

* Day of a period calculation fix

* Prevent multiple dapps data loading

* Update src/App.vue

Co-authored-by: impelcrypto <92044428+impelcrypto@users.noreply.github.com>

---------

Co-authored-by: impelcrypto <92044428+impelcrypto@users.noreply.github.com>

* Compatibility issues fix (#1075)

* Refresh TVL on unstake

* Compatibility issues fix

* feat: maxUnlockingChunks (#1071)

* maxUnlockingChunks

* using getDapp method

* Remove commented

* feat: added owner section (#1079)

* feat: added rewards section

* feat: added edit section

* fix: refactor

* fix: i18

* fix: copy the project page components to the staking-v3 folder (#1085)

* fix: copy project page components to staking-v3 folder

* fix: updated astar.yml

* fix: rollback the endpoint in astar.yml

* Owner page logic and unstake from unregistered (#1088)

* Unstake from unregistered

* usePeriod hook

* era lengths

* Owner page logic

* Owner page fixes

* Fixes on your projects and dapp select modal

* Successful vote message

* Feat/staking v3 improvements4 (#1089)

* Unstake from unregistered

* usePeriod hook

* era lengths

* Owner page logic

* Owner page fixes

* Fixes on your projects and dapp select modal

* Successful vote message

* Leaderboard voting

* Group dApps by category

* Cleanup expired entries

* dApp page logic

* Minor Dapps component styling

* Select up to max number of staked contracts for voting

* Navigate to staking home if a dApp doesn't exists

* Add Shibuya Scope Style (#1078)

* add feature dApp area style

* add dapps list and data list area style

* add ad area style

* add Leaderboard area style

* move staking section to assets page

* update the your projects section style  on the assets page

* move css files

* add staking section style on the assets page

* add vote and stake page style

* adjust tvl text size

* add owner page style

* update astar ui

* remove dark theme style from the vote page

* update vote page style

* remove dark theme from dapp staking pages

* add project page style

* clean up

* add Leaderboard style

* update dapp style

* update lang

* add input search

* update

* update leaderboard style

* add category style

* add tier paging

* Small fix for loading a dApp

* Changed a way how to subscribe and handle protocol state

* clean up

* update dapps search logic

* remove operator from filter function

---------

Co-authored-by: Bobo <bobo.kovacevic@gmail.com>

* Show success messages and tier rewards (#1097)

* add feature dApp area style

* add dapps list and data list area style

* add ad area style

* add Leaderboard area style

* move staking section to assets page

* update the your projects section style  on the assets page

* move css files

* add staking section style on the assets page

* add vote and stake page style

* adjust tvl text size

* add owner page style

* update astar ui

* remove dark theme style from the vote page

* update vote page style

* remove dark theme from dapp staking pages

* add project page style

* clean up

* add Leaderboard style

* update dapp style

* update lang

* add input search

* Added success message to all calls

* update

* update leaderboard style

* add category style

* add tier paging

* Small fix for loading a dApp

* Changed a way how to subscribe and handle protocol state

* clean up

* update dapps search logic

* Show error message from canUnstake function

* Display tier daily rewards

---------

Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>

* dApp search bug fix, amount to be locked fix

* Build error fix

* Nomination transfer

* Disable Vote button if no stakes.

* Reward calculation fix, unlock

* v3 vote period style (#1098)

* remove the unnecessary div from assets page

* adjust vote page style

* add hover color to search, selector

* update vote page style

* add animated vote button

* add vote period hero

* update dapps slide style

* update leaderboard text

* update vote page column order

* Show nomination transfer info on Voting page

* feat: added EVM supports (#1102)

* Vote with EVM

* Fetch rewards for evm account

* feat: updated V3 via EVM logic (#1101)

* feat: updated claimUnstakeAndUnlock

* fix: clean up

* feat: added EVM calls

* fix: link to the vote page

* fix: clean up

* fix: conflicts (2)

* fix: claimUnstakeAndUnlock fn

* Build errors fix

* Build error fix 2

* Fix for initial loading of ledger and stakerInfo

* Ledger subscription fix

* Removed gas estimation

* refactor: added batch methods

* Remove senderSs58Account from hook since address mapping logic is moved to the service

* Disable canUnstake

* Linter fix

---------

Co-authored-by: Bobo <bobo.kovacevic@gmail.com>

* EVM unlock fix

* fix: added todo comment

* GetTier bug fix and removed some comments

* fix: removed unused files

* Comments cleanup

* Gas price provider fix

* Message subscriptions, check value before assignment.

* Nomination transfer bug fix, styling and translations

* Nomination transfer amount, total stake

* Leaderboard fix, multiplier removed

* Staker reward calculation optimisation

* Clam banner text update for Shibuya

* Voting period countdown

* Current period day and canConfirm fixes

* feat: update project page styles (#1109)

* add project icon background

* add project icon background to the owner page

* update all vote/stake button background

* fix app height

* move the register button to the assets page

* fix assets page container

* remove the license section from the project page

* made the header scroll

* add small dapp header

* fix v2 style

* remove the register banner from the assets page for now

* fix vote page layout

* fix vote period background

* adjust small header style and heart icon button

* update maintenance mode style

* update

* feat: add migrate support style (#1114)

* add migrate support style

* fix lang file

* Hide migration support for now

* feat: added staker and bonus rewards APR (#1113)

* feat: added useAprV3

* wip: staker rewards

* wip: staker rewards (2)

* wip: staker rewards (3)

* wip: staker rewards (4)

* wip: staker rewards (5)

* wip: staker rewards (6)

* wip: staker rewards (7)

* wip: staker rewards (8)

* feat: added basic rewards in the voting section

* fix: clean up

* fix: refactor

* feat: added bonus APR

* fix: clean up

* fix: set the periodsPerCycle from network name temporarily

* fix: set the periodsPerCycle from network name temporarily (2)

* Update to support v3 registration.

* Styling fix and cleanup

* URL fix

* Bug fix

* Typo fix

* Show number of staker on the owner page

* Fixed fetching staker info

---------

Co-authored-by: impelcrypto <impelcrypto@gmail.com>
Co-authored-by: Gregory Luneau <greg@astar.network>
Co-authored-by: impelcrypto <92044428+impelcrypto@users.noreply.github.com>
Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>
Co-authored-by: Kahori Razzell <kahorirazzell@Kahoris-MacBook-Pro.local>
Co-authored-by: kahonnohak <kahon.nohak@gmail.com>
Co-authored-by: Kahori <77480847+Kahonnohak@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants