Skip to content

Commit

Permalink
hotfix: merge 'main' to 'release-hotfix' branch (#808)
Browse files Browse the repository at this point in the history
* hotfix: merge release-hotfix to main (#799)

* add workflow for release-hotfix

* add on push specific branch

* remove automatic push process

* set inputs on workflow

* add specific branch on dispatch

* Discord link update (#745)

* Create s3-hotfix.yml

* Update s3-hotfix.yml

* Update s3-hotfix.yml

* hotfix: added Injective assets (ATOM and INJ) on EVM assets page (#759)

* feat: added ATOM and INJ on EVM assets page

* fix: fetch token data from cbridge API

* Update release-hotfix branch (#787)

* Fixed claim tooltip text (#747)

* Create s3-staging.yml

* Create s3-production.yml

* Create s3-hotfix.yml

* Update s3-hotfix.yml

* Update s3-hotfix.yml

* Update s3-hotfix.yml

* Release hotfix merge to master (#746)

* add workflow for release-hotfix

* add on push specific branch

* remove automatic push process

* set inputs on workflow

* add specific branch on dispatch

* Discord link update (#745)

* Create s3-hotfix.yml

* Update s3-hotfix.yml

* Update s3-hotfix.yml

---------

Co-authored-by: Will <[email protected]>
Co-authored-by: Ehsan <[email protected]>

* add nft menu on sidebar (#749)

* add nft menu on sidebar

* add customized balloon

* clean up

* Fix total dApps count (#751)

* feat: updated theme color (#741)

* feat: updated theme color on Assets page

* feat: updated theme color on Dashboard page

* feat: updated theme color on dApp staking page

* feat: updated sidebar

* fix: tests

* update css

* update css

* update detail css

* feat: updated header background

* fix: updated hero position on dApp staking page

* update css on feedback

* update detail css

* updates on addItemcard

* update color on tags

* update colors

* feat: updated dark theme

* update uilib & colors

* styles: changed astar-blue-dark to astar-blue

* styles: updated Ecosystem icon

* fix: conflicts

* fix: updated styles

* fix: updated header

* fix: updated modals

* fix: updated play icon

* fix: updated styles on transfer assets page

* fix: updated ui liv

---------

Co-authored-by: Will <[email protected]>

* Fix: Use XcmV2WeightLimit in InterlayXcmRepository.ts (#756)

* feat: updated connect wallet drawer (#750)

* feat: updated theme color on Assets page

* feat: updated theme color on Dashboard page

* feat: updated theme color on dApp staking page

* feat: updated sidebar

* fix: tests

* update css

* update css

* update detail css

* feat: updated astar-ui

* feat: updated astar-ui (2)

* feat: updated network modal

* feat: updated 'ip-input' class

* update css on feedback

* update detail css

* updates on addItemcard

* update color on tags

* feat: updated AccountModal logic

* feat: updated account drawer

* feat: updated disconnect button

* feat: updated tests

* fix: test

* fix: conflicts (2)

* fix: store selected address data

* feat: updated drawer

* feat: updated wallet logic

* refactor: clean up

* fix: changed 'disconnect' button position

* feat: store selected theme to local storage

* feat: updated modal drawer

* feat: updated modal drawer

---------

Co-authored-by: Will <[email protected]>

* Added github action for broken links (#761)

* Added github action for broken links

* build and check

* e2e tests with  Zombienet (#752)

* Transfer tokens test

* CI integration

* Use env variable po pass BASE_URL to test script

* yaml fix

* Actions script fix

* Another action script fix

* yet another try

* hardcoded versions

* collator version fix

* Links fix

* Github action fix

* It may run now on CI

* Fixed test runner script

* Add asset to a node

* Moved Zombienet tests and configuration to separate folder.

* Stake test

* Increase Playwright test timeout

* Tests and node setup fixes

* Minor fixes

* All tests run stable

* Updated staking test with input validation test

* release hotfix to main (#760)

* add workflow for release-hotfix

* add on push specific branch

* remove automatic push process

* set inputs on workflow

* add specific branch on dispatch

* Discord link update (#745)

* Create s3-hotfix.yml

* Update s3-hotfix.yml

* Update s3-hotfix.yml

* hotfix: added Injective assets (ATOM and INJ) on EVM assets page (#759)

* feat: added ATOM and INJ on EVM assets page

* fix: fetch token data from cbridge API

---------

Co-authored-by: Will <[email protected]>
Co-authored-by: Bobo <[email protected]>
Co-authored-by: Ehsan <[email protected]>

* fix: send non-native tokens with max amount (#768)

* feat: updated XCM logic to V3 for Shiden, Statemine and Kusama (#758)

* wip: KSM xcm V3

* feat: update sdk-core

* feat: updated XCM logic for Kusama to V3

* feat: updated XCM V3 logic for Shiden

* fix: removed console.log

* fix: updated logic for statemine

* fix: updated subscan link for ctust

* feat: updated Bitfrost version to V3

* feat: updated XCM logic for Phala

* refactor: clean up

* fix: enabled XCM deposit/withdrawal on Shiden (#774)

* fix: enabled XCM deposit/withdrawal on Shiden

* test

* test: lint

* fix: clean up

* Update broken-links.yml (#777)

* removed quasar from broken link report (#767)

* dAapp staking e2e tests (#769)

* Unbond test

* Re-stake on/off test

* Claim rewards test, playwright config updates

* On chain check if claim executed

* Added Metamask extension

* Metamask wallet creation

* Trying to fix heap out of memory

* One more try

* One more try to fix CI out of memory

* On more try to fix out of memory error

* Heap size fix

* command fix

* What to say?

* Metamask removed

* Update pull-request-preview.yml

* Pushing commit to rerun ci

* setting up yarn

* Added Metamask back

* Test run on ubuntu-latest

* tsconfig exclude pattern fix

* Linter fixes

---------

Co-authored-by: Ehsan <[email protected]>
Co-authored-by: Nikhil Ranjan <[email protected]>

* feat: added 'help' button on header (#772)

* fix: display EVM withdraw when users have balance in withdrawal

* fix: added help button on header

* fix: removed release note on the template.md

* fix: test

* fix: test (2)

* fix: display ModalConectionTrouble when app is loading

* fix: reset the staking tab after changing accounts (#779)

* Change warning on EVM local transfer (#783)

* update warning message

* update css & only visible on EVM input

* show prev warning

* only visible isH160

* update warning message

* fix: modified header styling for mobile devices (#782)

* fix: updated connect button

* fix: added separator at the top of assets page for mobile devices

* fix: updated header background for mobile devices

* fix: updated margin size inheader

---------

Co-authored-by: Bobo <[email protected]>
Co-authored-by: Ehsan <[email protected]>
Co-authored-by: Will <[email protected]>
Co-authored-by: Brendon Votteler <[email protected]>
Co-authored-by: Nikhil Ranjan <[email protected]>

* refactor: updated hotfix branch to V0.0.32 (#791)

* Fixed claim tooltip text (#747)

* Create s3-staging.yml

* Create s3-production.yml

* Create s3-hotfix.yml

* Update s3-hotfix.yml

* Update s3-hotfix.yml

* Update s3-hotfix.yml

* Release hotfix merge to master (#746)

* add workflow for release-hotfix

* add on push specific branch

* remove automatic push process

* set inputs on workflow

* add specific branch on dispatch

* Discord link update (#745)

* Create s3-hotfix.yml

* Update s3-hotfix.yml

* Update s3-hotfix.yml

---------

Co-authored-by: Will <[email protected]>
Co-authored-by: Ehsan <[email protected]>

* add nft menu on sidebar (#749)

* add nft menu on sidebar

* add customized balloon

* clean up

* Fix total dApps count (#751)

* feat: updated theme color (#741)

* feat: updated theme color on Assets page

* feat: updated theme color on Dashboard page

* feat: updated theme color on dApp staking page

* feat: updated sidebar

* fix: tests

* update css

* update css

* update detail css

* feat: updated header background

* fix: updated hero position on dApp staking page

* update css on feedback

* update detail css

* updates on addItemcard

* update color on tags

* update colors

* feat: updated dark theme

* update uilib & colors

* styles: changed astar-blue-dark to astar-blue

* styles: updated Ecosystem icon

* fix: conflicts

* fix: updated styles

* fix: updated header

* fix: updated modals

* fix: updated play icon

* fix: updated styles on transfer assets page

* fix: updated ui liv

---------

Co-authored-by: Will <[email protected]>

* Fix: Use XcmV2WeightLimit in InterlayXcmRepository.ts (#756)

* feat: updated connect wallet drawer (#750)

* feat: updated theme color on Assets page

* feat: updated theme color on Dashboard page

* feat: updated theme color on dApp staking page

* feat: updated sidebar

* fix: tests

* update css

* update css

* update detail css

* feat: updated astar-ui

* feat: updated astar-ui (2)

* feat: updated network modal

* feat: updated 'ip-input' class

* update css on feedback

* update detail css

* updates on addItemcard

* update color on tags

* feat: updated AccountModal logic

* feat: updated account drawer

* feat: updated disconnect button

* feat: updated tests

* fix: test

* fix: conflicts (2)

* fix: store selected address data

* feat: updated drawer

* feat: updated wallet logic

* refactor: clean up

* fix: changed 'disconnect' button position

* feat: store selected theme to local storage

* feat: updated modal drawer

* feat: updated modal drawer

---------

Co-authored-by: Will <[email protected]>

* Added github action for broken links (#761)

* Added github action for broken links

* build and check

* e2e tests with  Zombienet (#752)

* Transfer tokens test

* CI integration

* Use env variable po pass BASE_URL to test script

* yaml fix

* Actions script fix

* Another action script fix

* yet another try

* hardcoded versions

* collator version fix

* Links fix

* Github action fix

* It may run now on CI

* Fixed test runner script

* Add asset to a node

* Moved Zombienet tests and configuration to separate folder.

* Stake test

* Increase Playwright test timeout

* Tests and node setup fixes

* Minor fixes

* All tests run stable

* Updated staking test with input validation test

* release hotfix to main (#760)

* add workflow for release-hotfix

* add on push specific branch

* remove automatic push process

* set inputs on workflow

* add specific branch on dispatch

* Discord link update (#745)

* Create s3-hotfix.yml

* Update s3-hotfix.yml

* Update s3-hotfix.yml

* hotfix: added Injective assets (ATOM and INJ) on EVM assets page (#759)

* feat: added ATOM and INJ on EVM assets page

* fix: fetch token data from cbridge API

---------

Co-authored-by: Will <[email protected]>
Co-authored-by: Bobo <[email protected]>
Co-authored-by: Ehsan <[email protected]>

* fix: send non-native tokens with max amount (#768)

* feat: updated XCM logic to V3 for Shiden, Statemine and Kusama (#758)

* wip: KSM xcm V3

* feat: update sdk-core

* feat: updated XCM logic for Kusama to V3

* feat: updated XCM V3 logic for Shiden

* fix: removed console.log

* fix: updated logic for statemine

* fix: updated subscan link for ctust

* feat: updated Bitfrost version to V3

* feat: updated XCM logic for Phala

* refactor: clean up

* fix: enabled XCM deposit/withdrawal on Shiden (#774)

* fix: enabled XCM deposit/withdrawal on Shiden

* test

* test: lint

* fix: clean up

* Update broken-links.yml (#777)

* removed quasar from broken link report (#767)

* dAapp staking e2e tests (#769)

* Unbond test

* Re-stake on/off test

* Claim rewards test, playwright config updates

* On chain check if claim executed

* Added Metamask extension

* Metamask wallet creation

* Trying to fix heap out of memory

* One more try

* One more try to fix CI out of memory

* On more try to fix out of memory error

* Heap size fix

* command fix

* What to say?

* Metamask removed

* Update pull-request-preview.yml

* Pushing commit to rerun ci

* setting up yarn

* Added Metamask back

* Test run on ubuntu-latest

* tsconfig exclude pattern fix

* Linter fixes

---------

Co-authored-by: Ehsan <[email protected]>
Co-authored-by: Nikhil Ranjan <[email protected]>

* feat: added 'help' button on header (#772)

* fix: display EVM withdraw when users have balance in withdrawal

* fix: added help button on header

* fix: removed release note on the template.md

* fix: test

* fix: test (2)

* fix: display ModalConectionTrouble when app is loading

* fix: reset the staking tab after changing accounts (#779)

* Change warning on EVM local transfer (#783)

* update warning message

* update css & only visible on EVM input

* show prev warning

* only visible isH160

* update warning message

* fix: modified header styling for mobile devices (#782)

* fix: updated connect button

* fix: added separator at the top of assets page for mobile devices

* fix: updated header background for mobile devices

* fix: updated margin size inheader

* Automatically create PR on regular and hotfix release (#781)

* Fix for tests who are failing from time to time (#785)

* Return Dwellir endpoint to the portal (#788)

* feat: updated claim logic for ledger accounts (#765)

* feat: updated claim logic for ledger account

* refactor: clean up

* debug: log transport

* debug: log 2

* feat: test log

* feat: test log 2

* feat: test log 3

* feat: test log 4

* feat: test log 5

* feat: test log 6

* refactor: removed console logs

* refactor: clean up

* fix: remove HID popup

* fix: remove HID popup (2)

* refactor: clean up

* test: see console

* refacotr: clean up

* Deployment scripts fix (#790)

---------

Co-authored-by: Bobo <[email protected]>
Co-authored-by: Ehsan <[email protected]>
Co-authored-by: Will <[email protected]>
Co-authored-by: Brendon Votteler <[email protected]>
Co-authored-by: Nikhil Ranjan <[email protected]>

* fix: the way detect the ledger connection (#795)

* fix: detect ledger connection

* refactor: clean up

* test

* feat: update logic

* fix: fixed conflicts in release-hotfix branch (#800)

* Fixed claim tooltip text (#747)

* Create s3-staging.yml

* Create s3-production.yml

* Create s3-hotfix.yml

* Update s3-hotfix.yml

* Update s3-hotfix.yml

* Update s3-hotfix.yml

* Release hotfix merge to master (#746)

* add workflow for release-hotfix

* add on push specific branch

* remove automatic push process

* set inputs on workflow

* add specific branch on dispatch

* Discord link update (#745)

* Create s3-hotfix.yml

* Update s3-hotfix.yml

* Update s3-hotfix.yml

---------

Co-authored-by: Will <[email protected]>
Co-authored-by: Ehsan <[email protected]>

* add nft menu on sidebar (#749)

* add nft menu on sidebar

* add customized balloon

* clean up

* Fix total dApps count (#751)

* feat: updated theme color (#741)

* feat: updated theme color on Assets page

* feat: updated theme color on Dashboard page

* feat: updated theme color on dApp staking page

* feat: updated sidebar

* fix: tests

* update css

* update css

* update detail css

* feat: updated header background

* fix: updated hero position on dApp staking page

* update css on feedback

* update detail css

* updates on addItemcard

* update color on tags

* update colors

* feat: updated dark theme

* update uilib & colors

* styles: changed astar-blue-dark to astar-blue

* styles: updated Ecosystem icon

* fix: conflicts

* fix: updated styles

* fix: updated header

* fix: updated modals

* fix: updated play icon

* fix: updated styles on transfer assets page

* fix: updated ui liv

---------

Co-authored-by: Will <[email protected]>

* Fix: Use XcmV2WeightLimit in InterlayXcmRepository.ts (#756)

* feat: updated connect wallet drawer (#750)

* feat: updated theme color on Assets page

* feat: updated theme color on Dashboard page

* feat: updated theme color on dApp staking page

* feat: updated sidebar

* fix: tests

* update css

* update css

* update detail css

* feat: updated astar-ui

* feat: updated astar-ui (2)

* feat: updated network modal

* feat: updated 'ip-input' class

* update css on feedback

* update detail css

* updates on addItemcard

* update color on tags

* feat: updated AccountModal logic

* feat: updated account drawer

* feat: updated disconnect button

* feat: updated tests

* fix: test

* fix: conflicts (2)

* fix: store selected address data

* feat: updated drawer

* feat: updated wallet logic

* refactor: clean up

* fix: changed 'disconnect' button position

* feat: store selected theme to local storage

* feat: updated modal drawer

* feat: updated modal drawer

---------

Co-authored-by: Will <[email protected]>

* Added github action for broken links (#761)

* Added github action for broken links

* build and check

* e2e tests with  Zombienet (#752)

* Transfer tokens test

* CI integration

* Use env variable po pass BASE_URL to test script

* yaml fix

* Actions script fix

* Another action script fix

* yet another try

* hardcoded versions

* collator version fix

* Links fix

* Github action fix

* It may run now on CI

* Fixed test runner script

* Add asset to a node

* Moved Zombienet tests and configuration to separate folder.

* Stake test

* Increase Playwright test timeout

* Tests and node setup fixes

* Minor fixes

* All tests run stable

* Updated staking test with input validation test

* release hotfix to main (#760)

* add workflow for release-hotfix

* add on push specific branch

* remove automatic push process

* set inputs on workflow

* add specific branch on dispatch

* Discord link update (#745)

* Create s3-hotfix.yml

* Update s3-hotfix.yml

* Update s3-hotfix.yml

* hotfix: added Injective assets (ATOM and INJ) on EVM assets page (#759)

* feat: added ATOM and INJ on EVM assets page

* fix: fetch token data from cbridge API

---------

Co-authored-by: Will <[email protected]>
Co-authored-by: Bobo <[email protected]>
Co-authored-by: Ehsan <[email protected]>

* fix: send non-native tokens with max amount (#768)

* feat: updated XCM logic to V3 for Shiden, Statemine and Kusama (#758)

* wip: KSM xcm V3

* feat: update sdk-core

* feat: updated XCM logic for Kusama to V3

* feat: updated XCM V3 logic for Shiden

* fix: removed console.log

* fix: updated logic for statemine

* fix: updated subscan link for ctust

* feat: updated Bitfrost version to V3

* feat: updated XCM logic for Phala

* refactor: clean up

* fix: enabled XCM deposit/withdrawal on Shiden (#774)

* fix: enabled XCM deposit/withdrawal on Shiden

* test

* test: lint

* fix: clean up

* Update broken-links.yml (#777)

* removed quasar from broken link report (#767)

* dAapp staking e2e tests (#769)

* Unbond test

* Re-stake on/off test

* Claim rewards test, playwright config updates

* On chain check if claim executed

* Added Metamask extension

* Metamask wallet creation

* Trying to fix heap out of memory

* One more try

* One more try to fix CI out of memory

* On more try to fix out of memory error

* Heap size fix

* command fix

* What to say?

* Metamask removed

* Update pull-request-preview.yml

* Pushing commit to rerun ci

* setting up yarn

* Added Metamask back

* Test run on ubuntu-latest

* tsconfig exclude pattern fix

* Linter fixes

---------

Co-authored-by: Ehsan <[email protected]>
Co-authored-by: Nikhil Ranjan <[email protected]>

* feat: added 'help' button on header (#772)

* fix: display EVM withdraw when users have balance in withdrawal

* fix: added help button on header

* fix: removed release note on the template.md

* fix: test

* fix: test (2)

* fix: display ModalConectionTrouble when app is loading

* fix: reset the staking tab after changing accounts (#779)

* Change warning on EVM local transfer (#783)

* update warning message

* update css & only visible on EVM input

* show prev warning

* only visible isH160

* update warning message

* fix: modified header styling for mobile devices (#782)

* fix: updated connect button

* fix: added separator at the top of assets page for mobile devices

* fix: updated header background for mobile devices

* fix: updated margin size inheader

* Automatically create PR on regular and hotfix release (#781)

* Fix for tests who are failing from time to time (#785)

* Return Dwellir endpoint to the portal (#788)

* feat: updated claim logic for ledger accounts (#765)

* feat: updated claim logic for ledger account

* refactor: clean up

* debug: log transport

* debug: log 2

* feat: test log

* feat: test log 2

* feat: test log 3

* feat: test log 4

* feat: test log 5

* feat: test log 6

* refactor: removed console logs

* refactor: clean up

* fix: remove HID popup

* fix: remove HID popup (2)

* refactor: clean up

* test: see console

* refacotr: clean up

* Deployment scripts fix (#790)

* Update index.template.html (#792)

---------

Co-authored-by: Bobo <[email protected]>
Co-authored-by: Ehsan <[email protected]>
Co-authored-by: Will <[email protected]>
Co-authored-by: Brendon Votteler <[email protected]>
Co-authored-by: Nikhil Ranjan <[email protected]>
Co-authored-by: Josip Š <[email protected]>

---------

Co-authored-by: Will <[email protected]>
Co-authored-by: Bobo <[email protected]>
Co-authored-by: Ehsan <[email protected]>
Co-authored-by: Brendon Votteler <[email protected]>
Co-authored-by: Nikhil Ranjan <[email protected]>
Co-authored-by: Josip Š <[email protected]>

* Add Gridlock Wallet to connection options (#786)

* Add Gridlock Wallet to connection options

* Source Gridlock as polkadot-js

* fix: modified the position for EVM withdrawal (#798)

* fix: updated the postition for EVM withdrawal

* fix: clean up

* Create firebase-backup.yml

* Add dApp Twitter share button (#797)

* Add dApp Twitter share button

* Use twitter:image instead of og:image

* Use both og and twitter

* Roll back dynamic og and twitter image changes.

* Tweet text update

* Typo fix

* Share button test

* Add subwallet campaign (#802)

* add subwallet campaign

* update subwallet

* added md and json files (#763)

* Added dynamic links in assets page (#775)

* Added dynamic links

* banner01

* Links

* responsive

* Fix as per reviw

* i18n

* Fix

* fix

* Using the last post of astar blog as the 4th card (#780)

* Using the last post of astar blog as the 4th card

* Fix for subsocial card not showing at first

* Check for no or empty result

---------

Co-authored-by: Bobo <[email protected]>

* link prod

* fix scrolling styling

* update detail css

* update detail styling

* Updated decentralised link

* feat: added decentralised banner (#803)

* feat: added banner

* feat: updated styles

* refactor: updated file name

* fix: divider size

* fix: styling

---------

Co-authored-by: Gregory Luneau <[email protected]>
Co-authored-by: Bobo <[email protected]>
Co-authored-by: Will <[email protected]>
Co-authored-by: impelcrypto <[email protected]>

* update bootnodes dns (#784)

* update bootnodes dns

* update astar bootnode 2 address

---------

Co-authored-by: bLd75 <[email protected]>

* Replace hero image (#805)

* update hero image

* remove max-width on panel

* Rocstar settings & EVM url update (#659)

* rocstar settings

* make isFaucet false when isRocstar true

* fix shibuyas icon url

* fix evm url for rocstar

* fix: URL for decentralized portal (#806)

* fix: URL for decentralized portal

* decentralized link fix

---------

Co-authored-by: Nikhil Ranjan <[email protected]>

* fix: modified stylings for small screen devices (#807)

* fix: input box size for small screen devices

* fix: loading staking information

* fix: initial state of isLoading in useClaimAll

* refactor: clean up

* fix: fetch unclaimed rewards

* fix: align the buttons on assets page for mobile devices

* fix: theme switch icon when light theme for mobile screen devices

* fix: round up the number of total page on On-Chain Data panel

---------

Co-authored-by: Will <[email protected]>
Co-authored-by: Bobo <[email protected]>
Co-authored-by: Ehsan <[email protected]>
Co-authored-by: Brendon Votteler <[email protected]>
Co-authored-by: Nikhil Ranjan <[email protected]>
Co-authored-by: Josip Š <[email protected]>
Co-authored-by: Rares Munteanu <[email protected]>
Co-authored-by: Gregory Luneau <[email protected]>
Co-authored-by: bLd75 <[email protected]>
  • Loading branch information
10 people authored May 25, 2023
1 parent ed19cc3 commit 700c617
Show file tree
Hide file tree
Showing 56 changed files with 2,999 additions and 300 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/broken-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
with:
args: --verbose --exclude-path ./node_modules/ "./**/*.js" "./**/*.ts" "./**/*.html" "./**/*.scss"
args: --verbose --exclude-path ./node_modules/ "./**/*.js" "./**/*.ts" "./**/*.html" "./**/*.scss" "./**/*.json" "./**/*.md"

- name: Create Issue From File
if: env.lychee_exit_code != 0
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/firebase-backup.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
on:
schedule:
- cron: "*/15 * * * *"
name: Firestore backup
jobs:
backup:
runs-on: ubuntu-latest
steps:
- uses: lfdm/firestore-backup-gh-action
with:
gcloudAuth: ${{ secrets.FIREBASE_BACKUP_GCLOUD_AUTH }}
projectId: ${{ secrets.gcloud_project_id }}
storageBucket: gs://astarnetwork-a4924.appspot.com
collectionIds:
3 changes: 3 additions & 0 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template>
<div>
<decentralized-banner />
<dashboard-layout>
<router-view v-slot="{ Component }">
<keep-alive>
Expand Down Expand Up @@ -38,6 +39,7 @@ import 'reflect-metadata';
import '@polkadot/api-augment';
import { defineComponent, computed, watch } from 'vue';
import DashboardLayout from 'layouts/DashboardLayout.vue';
import DecentralizedBanner from 'src/components/common/decentralized-banner.vue';
import { useStore } from 'src/store';
import ModalLoading from 'components/common/ModalLoading.vue';
import AlertBox from 'components/common/AlertBox.vue';
Expand All @@ -64,6 +66,7 @@ export default defineComponent({
AlertBox,
CookiePolicy,
NotificationStack,
DecentralizedBanner,
},
setup() {
useAppRouter();
Expand Down
335 changes: 144 additions & 191 deletions src/assets/img/astar_hero.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions src/assets/img/banner/banner01.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,822 changes: 1,822 additions & 0 deletions src/assets/img/banner/banner02.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
343 changes: 343 additions & 0 deletions src/assets/img/banner/banner03.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/img/banner/banner04.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions src/assets/img/ic_subwallet.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/logo-gridlock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 26 additions & 14 deletions src/components/assets/Assets.vue
Original file line number Diff line number Diff line change
@@ -1,25 +1,32 @@
<template>
<div v-if="!isLoading" class="wrapper--assets">
<div class="separator--top">
<div class="separator--top container--account">
<div class="separator" />
</div>
<div class="container--assets">
<div>
<span class="text--xl">
{{ $t(isH160 ? 'assets.astarEvmAccount' : 'assets.astarNativeAccount') }}
</span>
<div class="container--account">
<div class="title--account">
<span class="text--xl">
{{ $t(isH160 ? 'assets.astarEvmAccount' : 'assets.astarNativeAccount') }}
</span>
</div>
<account
:ttl-erc20-amount="evmAssets.ttlEvmUsdAmount"
:ttl-native-xcm-usd-amount="ttlNativeXcmUsdAmount"
:is-loading-erc20-amount="isLoading"
:is-loading-xcm-assets-amount="isLoadingXcmAssetsAmount"
/>
</div>
<account
:ttl-erc20-amount="evmAssets.ttlEvmUsdAmount"
:ttl-native-xcm-usd-amount="ttlNativeXcmUsdAmount"
:is-loading-erc20-amount="isLoading"
:is-loading-xcm-assets-amount="isLoadingXcmAssetsAmount"
/>
<div>
<div class="separator" />
<span class="text--xl">{{ $t('assets.assets') }}</span>
<div class="row--links">
<dynamic-links />
</div>
<div>
<div class="container--account">
<div class="separator" />
</div>
<span class="title--assets text--xl">{{ $t('assets.assets') }}</span>
</div>
<div class="container--asset-list">
<div v-if="isH160">
<evm-asset-list :tokens="evmAssets.assets" />
</div>
Expand All @@ -29,10 +36,14 @@
</div>
</div>
</div>
<div class="column--links">
<dynamic-links />
</div>
</div>
</template>
<script lang="ts">
import Account from 'src/components/assets/Account.vue';
import DynamicLinks from 'src/components/assets/DynamicLinks.vue';
import EvmAssetList from 'src/components/assets/EvmAssetList.vue';
import XcmNativeAssetList from 'src/components/assets/XcmNativeAssetList.vue';
import XvmNativeAssetList from 'src/components/assets/XvmNativeAssetList.vue';
Expand All @@ -48,6 +59,7 @@ import { computed, defineComponent, ref, watch, watchEffect, onUnmounted } from
export default defineComponent({
components: {
Account,
DynamicLinks,
EvmAssetList,
XcmNativeAssetList,
XvmNativeAssetList,
Expand Down
99 changes: 99 additions & 0 deletions src/components/assets/DynamicLinks.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<template>
<div class="wrapper">
<div class="wrapper--banners">
<div
v-for="(t, index) in items"
:key="index"
class="card"
:style="`background-image: url('${t.background}'); background-size: cover; background-position: center;`"
@click="goToLink(t.link)"
>
<div class="card--info">
<div class="txt--title" :class="index === 0 ? 'txt--bold' : ''">
{{ t.title }}
</div>
<div v-if="t.subtitle" class="txt--subtitle">{{ t.subtitle }}</div>
</div>
</div>
</div>
</div>
</template>
<script lang="ts">
import { defineComponent, ref, watch } from 'vue';
import { truncate } from '@astar-network/astar-sdk-core';
import linksData from 'src/data/dynamic_links.json';
import { useI18n } from 'vue-i18n';
import { useQuery } from '@vue/apollo-composable';
import gql from 'graphql-tag';
interface Data {
background: string;
title: string;
subtitle: string;
link: string;
}
export default defineComponent({
components: {},
setup() {
const { t } = useI18n();
const banners = [
require('/src/assets/img/banner/banner01.svg'),
require('/src/assets/img/banner/banner02.svg'),
require('/src/assets/img/banner/banner03.svg'),
];
// The subsocial space where the news updates come from: https://polkaverse.com/10802
const astarSpace = 10802;
const items = ref<Data[]>([]);
const { result, error } = useQuery(gql`
query PostsBySpaceId {
posts(where: { space: { id_eq: "${astarSpace}" }, AND: { hidden_not_eq: true } }, orderBy: id_DESC, limit: 1) {
background: image
title
link: slug
}
}
`);
items.value = linksData.map((item, index) => ({
background: banners[index],
title: t(item.title),
subtitle: t(item.subtitle),
link: item.link,
}));
watch(
[result, error],
async () => {
if (result.value) {
const item = result.value.posts.map((x: Data) => {
return {
background: `https://ipfs.subsocial.network/ipfs/${x.background}`,
title: '', // x.title,
subtitle: '',
link: `https://astar.network/blog/${x.link}`,
};
});
item?.length > 0 && items.value.push(item[0]);
}
},
{ immediate: true }
);
const goToLink = (link: string): void => {
window.open(link, '_blank');
};
return {
truncate,
items,
goToLink,
};
},
});
</script>
<style lang="scss" scoped>
@import './styles/dynamic-links.scss';
</style>
4 changes: 3 additions & 1 deletion src/components/assets/EvmAssetList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ export default defineComponent({
const bal = ref<number>(0);
const balUsd = ref<number>(0);
const isShibuya = ref<boolean>(false);
const isRocstar = ref<boolean>(false);
const isFaucet = ref<boolean>(false);
const isSearch = ref<boolean>(false);
const search = ref<string>('');
Expand Down Expand Up @@ -267,7 +268,8 @@ export default defineComponent({
const balWei = await $web3.value!.eth.getBalance(currentAccount.value);
bal.value = Number(ethers.utils.formatEther(balWei));
isShibuya.value = nativeTokenSymbol.value === 'SBY';
isFaucet.value = isShibuya.value || faucetBalRequirement > bal.value;
isRocstar.value = nativeTokenSymbol.value === 'RSTR';
isFaucet.value = isRocstar ? false : isShibuya.value || faucetBalRequirement > bal.value;
if (nativeTokenUsd) {
balUsd.value = nativeTokenUsd * bal.value;
}
Expand Down
Loading

0 comments on commit 700c617

Please sign in to comment.