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

Update assets page layout #956

Merged
merged 101 commits into from
Nov 24, 2023
Merged

Update assets page layout #956

merged 101 commits into from
Nov 24, 2023

Conversation

ayumitk
Copy link
Contributor

@ayumitk ayumitk commented Oct 4, 2023

Pull Request Summary

ref: #922

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:

Changes

  • (ex: Change document B)

To-dos

  • Basic layout and style update
  • Reward animation
  • Use i18n
  • Merge account unification
  • Add to/remove from favourite button

@ayumitk
Copy link
Contributor Author

ayumitk commented Oct 4, 2023

268000190-077600b6-2007-4e2d-8eb5-93ae24b42941

@github-actions
Copy link

github-actions bot commented Oct 4, 2023

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

https://astar-apps--pr956-feat-assets-page-lay-yrusjbfj.web.app

(expires Fri, 01 Dec 2023 01:54:58 GMT)

🔥 via Firebase Hosting GitHub Action 🌎

Sign: dd76fe72958fe2910fef9d53f0b4539b82b849db

@ayumitk ayumitk self-assigned this Oct 4, 2023
@Kahonnohak
Copy link
Contributor

Thanks Ayumi!

  • Would it be possible to align all token amounts including ASTR? no preference of where but aligning with ASTR balance might make sense
  • Could you also align the right side icons please?
  • Also shall we use "Send" icon for ASTR transfer?
Screenshot 2023-10-05 at 12 00 00
  • I have added a new colour #141E3E directly written sorry... later please add as Navy-4

  • Some texts are default Black but please change them to Navy-1

  • When it has the mobile header shall we use the mobile account style?

Screenshot 2023-10-05 at 12 03 14
  • Now really want to change some icons BUT lets move on... I think after those changes we can invite Roy and Bobo to review this. There are funny behaviours at this moment but lets ask them to fix those. You could take a look at Reward animation.

Thanks

@ayumitk
Copy link
Contributor Author

ayumitk commented Oct 5, 2023

@Kahonnohak

Would it be possible to align all token amounts including ASTR? no preference of where but aligning with ASTR balance might make sense

I aligned all token positions by the right side of symbols, but do you think style A or B would be better?

Current A B
assets-current align-assets-a align-assets-b

@ayumitk
Copy link
Contributor Author

ayumitk commented Oct 5, 2023

@Kahonnohak When the balance is 0, I need a faucet icon now. So I searched for faucet in Flaticon (image attached), but I think these are too complicated. Do you have any idea about it?

Screenshot 2023-10-05 at 12 52 55 PM Screenshot 2023-10-05 at 12 57 28 PM

@Kahonnohak
Copy link
Contributor

THANK YOU! Yes I meant A, is much easier to see numbers, although showing desimal are different each tokens... still A is good. Thank you so much.

And faucet..! forgotten about it. Let's go with this:
https://fonts.google.com/icons?selected=Material+Symbols+Rounded:water_drop:FILL@0;wght@300;GRAD@0;opsz@24&icon.query=water&icon.set=Material+Symbols&icon.style=Rounded
Screenshot 2023-10-05 at 21 39 29

@ayumitk
Copy link
Contributor Author

ayumitk commented Oct 6, 2023

@Kahonnohak I adjusted all of the above and added an animation for the Reward circle. Please review it

@Kahonnohak
Copy link
Contributor

Nice work!! Lets review at creative sync later x

@Kahonnohak
Copy link
Contributor

Small favour for now sorry, but can we see background fixed at top version? what do you think?

@ayumitk
Copy link
Contributor Author

ayumitk commented Oct 7, 2023

Hi @bobo-k2 @impelcrypto could you add logic for the following buttons?

  1. Unify account
  2. Add to/remove from favorite
Screenshot 2023-10-06 at 6 28 40 PM

@impelcrypto
Copy link
Member

@ayumitk

Unify account

  • Maybe implement it after merging this PR?

Add to/remove from favorite

  • Maybe you store the data in localstorage like I did for txHistories. So the data object includes address { network: { favoriteCoin } } Please check this file.

image

@ayumitk
Copy link
Contributor Author

ayumitk commented Oct 7, 2023

@impelcrypto Ah localstorage! thank you

@ayumitk
Copy link
Contributor Author

ayumitk commented Nov 21, 2023

@impelcrypto @Kahonnohak I've added a transfer button for shibuya in this commit.

@impelcrypto
Copy link
Member

impelcrypto commented Nov 22, 2023

@ayumitk

@impelcrypto @Kahonnohak I've added a transfer button for shibuya in this commit.

Looks good. I think the 'expend' icon is missing for mobile devices, or is this according to the figma design?
https://gyazo.com/3a46a2124127c3e2017bc993a88595e8

@Kahonnohak
Copy link
Contributor

Kahonnohak commented Nov 22, 2023

@ayumitk

@impelcrypto @Kahonnohak I've added a transfer button for shibuya in this commit.

Looks good. I think the 'expend' icon is missing for mobile devices, or is this according to the figma design? https://gyazo.com/3a46a2124127c3e2017bc993a88595e8

Oh sorry I missed this and it looks like the locked balance is missing the vesting tokens - commented on Slack

Screenshot 2023-11-22 at 09 33 50

@Kahonnohak Kahonnohak self-requested a review November 23, 2023 12:34
Copy link
Contributor

@Kahonnohak Kahonnohak left a comment

Choose a reason for hiding this comment

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

LGTM!! Thank you so much for the great work!

Copy link
Member

@impelcrypto impelcrypto left a comment

Choose a reason for hiding this comment

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

LGTM

@ayumitk Let's move some icons to Astar-UI later.
Also, please check my commit suggestions.

src/components/assets/Account.vue Outdated Show resolved Hide resolved
src/components/assets/Account.vue Outdated Show resolved Hide resolved
src/components/assets/Account.vue Outdated Show resolved Hide resolved
src/components/assets/Account.vue Outdated Show resolved Hide resolved
src/components/assets/Account.vue Outdated Show resolved Hide resolved
};

const bg = computed<String>(() => {
if (currentNetworkIdx.value === 0) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Use endpointKey enum instead numbers

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed it in this commit

@@ -167,6 +156,20 @@ export default defineComponent({
window.removeEventListener(event, handler);
});

const isDarkTheme = computed<boolean>(() => store.getters['general/theme'] === 'DARK');
Copy link
Contributor

Choose a reason for hiding this comment

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

We have this line in so many places in our codebase. What do you think moving the line to some hook? It doesn't need to be in this PR

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Let me work on this in another PR. I'll do it next week

</q-tooltip>
</div>

<!-- <div>
Copy link
Contributor

Choose a reason for hiding this comment

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

Delete if not needed

@@ -97,6 +106,13 @@ export default defineComponent({
search.value = event.target.value;
};

const store = useStore();
const isDarkTheme = computed<boolean>(() => store.getters['general/theme'] === 'DARK');
Copy link
Contributor

Choose a reason for hiding this comment

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

Already commented above

class="btn btn--sm"
@click="handleModalFaucet({ isOpen: true })"
<path
d="M11.9 17.61C11.18 17.66 10.36 17.44 9.47999 16.95C8.62999 16.47 8.07999 15.61 7.86999 14.4C7.81999 14.16 7.71999 13.97 7.55999 13.83C7.19999 13.51 6.63999 13.54 6.31999 13.91C6.13999 14.12 6.07999 14.37 6.13999 14.68C6.45999 16.39 7.23999 17.63 8.45999 18.37C9.55999 19.04 10.64 19.37 11.69 19.37C11.79 19.37 11.89 19.37 11.99 19.37C12.24 19.35 12.44 19.25 12.6 19.09C12.77 18.92 12.85 18.72 12.85 18.48C12.85 18.21 12.76 17.99 12.57 17.82C12.39 17.66 12.16 17.59 11.89 17.61H11.9Z"
Copy link
Contributor

Choose a reason for hiding this comment

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

Does it make sense to create svg file instead hadrdcoding path in the component? If we move svg to a separate file we have a reusable component

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've moved svg icon to Astar UI and replaced it in this commit

xmlns="http://www.w3.org/2000/svg"
>
<path
d="M14.6048 7.37424C14.6048 6.60107 14.3463 5.98007 13.8292 5.51124C13.3121 5.04242 12.6296 4.80801 11.7817 4.80801C11.2448 4.80801 10.7689 4.91756 10.3539 5.13666C9.93891 5.35577 9.58069 5.68563 9.27922 6.12624C9.10147 6.37715 8.86397 6.52541 8.56672 6.57103C8.26946 6.61665 8.00974 6.54402 7.78755 6.35315C7.623 6.21028 7.52901 6.03109 7.50559 5.8156C7.48217 5.60011 7.53232 5.39573 7.65602 5.20244C8.13165 4.4833 8.71987 3.93644 9.42068 3.56187C10.1215 3.18729 10.9085 3 11.7817 3C13.1761 3 14.3111 3.39919 15.1867 4.19757C16.0622 4.99593 16.5 6.03562 16.5 7.31663C16.5 7.99494 16.3547 8.61653 16.064 9.18139C15.7734 9.74627 15.2779 10.3541 14.5777 11.0048C13.9219 11.599 13.4745 12.0814 13.2355 12.4518C12.9965 12.8221 12.8578 13.2384 12.8194 13.7007C12.7809 13.9672 12.6704 14.1893 12.4879 14.3669C12.3053 14.5446 12.0855 14.6335 11.8285 14.6335C11.5715 14.6335 11.3517 14.5455 11.1691 14.3697C10.9866 14.1938 10.8953 13.9774 10.8953 13.7205C10.8953 13.0938 11.0385 12.5208 11.325 12.0015C11.6114 11.4823 12.091 10.9237 12.7636 10.3258C13.4818 9.69555 13.9682 9.16971 14.2228 8.74831C14.4775 8.32691 14.6048 7.86889 14.6048 7.37424ZM11.7817 20C11.3985 20 11.0685 19.8616 10.7917 19.5849C10.5149 19.3082 10.3765 18.9783 10.3765 18.5954C10.3765 18.2124 10.5149 17.8825 10.7917 17.6058C11.0685 17.3291 11.3985 17.1907 11.7817 17.1907C12.1648 17.1907 12.4948 17.3291 12.7716 17.6058C13.0485 17.8825 13.1869 18.2124 13.1869 18.5954C13.1869 18.9783 13.0485 19.3082 12.7716 19.5849C12.4948 19.8616 12.1648 20 11.7817 20Z"
Copy link
Contributor

Choose a reason for hiding this comment

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

svg path, see the comment above

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've moved svg icon to Astar UI and replaced it in this commit

@ayumitk
Copy link
Contributor Author

ayumitk commented Nov 24, 2023

Let's move some icons to Astar-UI later.

@impelcrypto I've moved svg icon to Astar UI and replaced them in this commit

Copy link
Contributor

@bobo-k2 bobo-k2 left a comment

Choose a reason for hiding this comment

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

LGTM

@Kahonnohak Kahonnohak merged commit b14ccb9 into main Nov 24, 2023
6 checks passed
@Kahonnohak Kahonnohak deleted the feat/assets-page-layout-update branch November 24, 2023 11:08
impelcrypto added a commit that referenced this pull request Nov 29, 2023
* 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>
impelcrypto added a commit that referenced this pull request Nov 30, 2023
* 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>
gluneau added a commit that referenced this pull request Nov 30, 2023
* 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>

---------

Co-authored-by: impelcrypto <92044428+impelcrypto@users.noreply.github.com>
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>
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