Skip to content

Commit

Permalink
pulled latest main branch (#1057)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
6 people committed Nov 29, 2023
1 parent fafa2bd commit e3be666
Show file tree
Hide file tree
Showing 87 changed files with 5,974 additions and 2,029 deletions.
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ zombienet-macos
polkadot
astar-collator

# Chopstick binaries
db.sqlite

# Temp folder
*temp

# Chopstick binaries
db.sqlite*
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
"heroku-postbuild": "yarn install && yarn build",
"heroku-deploy": "git push heroku main",
"playwright:codegen": "npx playwright codegen http://localhost:8080",
"playwright": "BASE_URL='http://localhost:8080' ENDPOINT='ws://127.0.0.1:9944' npx playwright test --project=chromium --debug",
"playwright": "BASE_URL='http://localhost:8080' ENDPOINT='ws://127.0.0.1:9944' npx playwright test --project=chromium",
"playwright:ci": "node ./tests/chopsticks/start-chopsticks.js",
"generate:meta": "node ./node_modules/.bin/polkadot-types-from-chain --package sample-polkadotjs-typegen/interfaces/ --endpoint ./src/staking-v3/logic/astar.json --output ./src/staking-v3/logic/interfaces/temp",
"generate:defs": "node ./node_modules/.bin/polkadot-types-from-defs --package sample-polkadotjs-typegen/interfaces/ --input ./src/staking-v3/logic/interfaces/temp --endpoint ./src/staking-v3/logic/astar.json"
},
"dependencies": {
"@astar-network/astar-sdk-core": "^0.2.5",
"@astar-network/astar-ui": "^0.0.104",
"@astar-network/astar-ui": "^0.0.136",
"@astar-network/metamask-astar-adapter": "^0.5.4",
"@astar-network/metamask-astar-types": "^0.6.1",
"@ethersproject/bignumber": "^5.5.0",
Expand Down
Binary file added src/assets/img/account_bg_native.webp
Binary file not shown.
Binary file added src/assets/img/account_bg_shiden.webp
Binary file not shown.
Binary file added src/assets/img/account_bg_testnet.webp
Binary file not shown.
Binary file added src/assets/img/account_bg_testnet_zk.webp
Binary file not shown.
Binary file added src/assets/img/account_bg_zk.webp
Binary file not shown.
Binary file added src/assets/img/assets_bg_dark.webp
Binary file not shown.
Binary file added src/assets/img/assets_bg_dark_A.webp
Binary file not shown.
Binary file added src/assets/img/assets_bg_light.webp
Binary file not shown.
4 changes: 4 additions & 0 deletions src/assets/img/assets_icon_dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/img/assets_icon_light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/bg_common.webp
Binary file not shown.
1,152 changes: 1,152 additions & 0 deletions src/assets/img/icon_astar2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 49 additions & 0 deletions src/assets/img/icon_docs.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e3be666

Please sign in to comment.