Skip to content

Commit

Permalink
Update release-hotfix branch (#787)
Browse files Browse the repository at this point in the history
* 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 <korea651@hanmail.net>
Co-authored-by: Ehsan <ehsan.hajian@gmail.com>

* 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 <korea651@hanmail.net>

* 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 <korea651@hanmail.net>

* 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 <korea651@hanmail.net>
Co-authored-by: Bobo <bobo.kovacevic@gmail.com>
Co-authored-by: Ehsan <ehsan.hajian@gmail.com>

* 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 <ehsan.hajian@gmail.com>
Co-authored-by: Nikhil Ranjan <niklabh811@gmail.com>

* 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 <bobo.kovacevic@gmail.com>
Co-authored-by: Ehsan <ehsan.hajian@gmail.com>
Co-authored-by: Will <korea651@hanmail.net>
Co-authored-by: Brendon Votteler <bvotteler@users.noreply.github.com>
Co-authored-by: Nikhil Ranjan <niklabh811@gmail.com>
  • Loading branch information
6 people committed May 13, 2023
1 parent 2619bf9 commit 6d28632
Show file tree
Hide file tree
Showing 1,168 changed files with 293,853 additions and 1,365 deletions.
4 changes: 3 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@
/node_modules
.eslintrc.js
babel.config.js
/src-ssr
/src-ssr
/tests/polkadot_wallet
/tests/metamask_wallet
5 changes: 0 additions & 5 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@
- [ ] documentation changes
- [ ] tested on mobile devices

**Release notes:**

- (ex: feat: updated dApp staking to V2)
- (ex: fix: modified styling bugs on the Assets page)

**This pull request makes the following changes:**

**Adds**
Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/broken-links.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Broken Links

on:
repository_dispatch:
workflow_dispatch:
schedule:
- cron: '0 0 1 * *' # Trigger the workflow every month

jobs:
build_and_check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
- run: yarn && yarn build

- name: Link Checker
id: lychee
uses: lycheeverse/lychee-action@v1.7.0
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
with:
args: --verbose --exclude-path ./node_modules/ "./**/*.js" "./**/*.ts" "./**/*.html" "./**/*.scss"

- name: Create Issue From File
if: env.lychee_exit_code != 0
uses: peter-evans/create-issue-from-file@v4
with:
title: Link Checker Report
content-filepath: ./lychee/out.md
labels: report, automated issue
37 changes: 34 additions & 3 deletions .github/workflows/pull-request-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,21 @@
# https://github.com/firebase/firebase-tools

name: Create Firebase Hosting Preview on PR
'on': pull_request
on:
pull_request:
inputs:
astar_tag:
description: 'Release tag version for astar collator'
required: true
default: '4.47.1'
polkadot_tag:
description: 'Release tag version for polkadot relay chain'
required: true
default: '0.9.37'
zombienet_tag:
description: 'Release tag version for zombinet tool'
required: true
default: '1.3.35'
jobs:
build_and_preview:
if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
Expand All @@ -14,6 +28,7 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 18
- run: npm install -g yarn
- run: yarn && yarn build
- id: deploy_firebase_hosting_channel
uses: FirebaseExtended/action-hosting-deploy@v0
Expand All @@ -27,6 +42,20 @@ jobs:
needs: build_and_preview
steps:
- uses: actions/checkout@v3
- name: Download pre-built linux collator binary
run: |
wget https://github.com/AstarNetwork/Astar/releases/download/v4.47.1/astar-collator-v4.47.1-ubuntu-x86_64.tar.gz
tar -xvf astar-collator-*-ubuntu-x86_64.tar.gz
chmod +x ./astar-collator
- name: Download Polkadot relay chain binary
run: |
wget https://github.com/paritytech/polkadot/releases/download/v0.9.37/polkadot
chmod +x ./polkadot
- name: Download Zombinet testing binary
run: |
wget https://github.com/paritytech/zombienet/releases/download/v1.3.35/zombienet-linux-x64
chmod +x ./zombienet-linux-x64
- uses: actions/setup-node@v3
with:
node-version: 18
Expand All @@ -35,10 +64,12 @@ jobs:
- name: Install Playwright Browsers
run: npx playwright install --with-deps
- name: Run Playwright tests
run: BASE_URL='${{needs.build_and_preview.outputs.output1}}' HEADLESS='true' npx playwright test --project=chromium
# run: BASE_URL='${{needs.build_and_preview.outputs.output1}}' HEADLESS='true' ENDPOINT='ws://127.0.0.1:50001' npx playwright test --project=chromium
run: BASE_URL='${{needs.build_and_preview.outputs.output1}}' yarn playwright:ci
# working-directory: ./tests
- uses: actions/upload-artifact@v3
if: always()
with:
name: playwright-report
path: playwright-report/
retention-days: 30
retention-days: 30
28 changes: 28 additions & 0 deletions .github/workflows/s3-production.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Deploy to S3-Production
'on':
workflow_dispatch:
inputs:
ref:
description: 'Release Tag or branch'
required: true
default: 'v0.0.1'

jobs:
build_and_deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
ref: '${{ github.event.inputs.ref }}'
- uses: actions/setup-node@v3
with:
node-version: 18
- run: yarn && yarn build
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ secrets.AWS_REGION }}
- name: Deploy app build to S3 bucket
run: aws s3 sync ./dist/spa s3://astar-apps --delete
22 changes: 22 additions & 0 deletions .github/workflows/s3-staging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Deploy to S3 Staging
'on':
push:
branches:
- main
jobs:
build_and_deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
with:
node-version: 18
- run: yarn && yarn build
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ secrets.AWS_REGION }}
- name: Deploy app build to S3 bucket
run: aws s3 sync ./dist/spa s3://astar-apps-staging --delete
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,9 @@ yarn-error.log*
/test-results/
/playwright-report/
/playwright/.cache/

# Zombienet binaries
zombienet-macos
polkadot
astar-collator

9 changes: 9 additions & 0 deletions .lycheeignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Ignore all files
file://.*

# Twitter its API does not like us
https://twitter.com/*

# quasar
https://*.quasar.dev/*
https://quasar.dev/*
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

<div align="center">

[![Publish Application](https://github.com/AstarNetwork/astar-apps/actions/workflows/firebase-hosting-merge.yml/badge.svg)](https://github.com/AstarNetwork/astar-apps/actions/workflows/firebase-hosting-merge.yml)
[![License](https://img.shields.io/github/license/AstarNetwork/astar-apps?color=green)](https://github.com/AstarNetwork/astar-apps/master/LICENSE)
[![License](https://img.shields.io/github/license/AstarNetwork/astar-apps?color=green)](https://github.com/AstarNetwork/astar-apps/blob/main/LICENSE)
<br />
[![Twitter URL](https://img.shields.io/twitter/follow/AstarNetwork?style=social)](https://twitter.com/AstarNetwork)
[![Twitter URL](https://img.shields.io/twitter/follow/ShidenNetwork?style=social)](https://twitter.com/ShidenNetwork)
Expand Down Expand Up @@ -33,3 +32,4 @@ yarn dev
# build the project
yarn build
```

13 changes: 8 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"description": "Astar Portal is the hub of a multi-chain, one-stop platform for managing assets and dApp Staking - build2earn protocol.",
"productName": "Astar Portal - Astar & Shiden Network",
"author": "Astar Network",
"private": true,
"private": false,
"license": "GPL-3.0-only",
"scripts": {
"dev": "quasar dev",
"build": "yarn run build:spa",
Expand All @@ -20,11 +21,13 @@
"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' npx playwright test --project=chromium --debug"
"playwright": "BASE_URL='http://localhost:8080' npx playwright test --project=chromium --debug",
"playwright:ci": "./zombienet-linux-x64 test -p native ./tests/zombienet/e2e.zndsl",
"playwright:cimacos": "./zombienet-macos test -p native ./tests/zombienet/e2e.zndsl"
},
"dependencies": {
"@astar-network/astar-sdk-core": "^0.2.2",
"@astar-network/astar-ui": "^0.0.77",
"@astar-network/astar-sdk-core": "^0.2.3",
"@astar-network/astar-ui": "^0.0.91",
"@ethersproject/bignumber": "^5.5.0",
"@polkadot/api": "^9.13.6",
"@polkadot/api-contract": "^9.13.6",
Expand Down Expand Up @@ -131,7 +134,7 @@
"last 5 Opera versions"
],
"engines": {
"node": "18.x",
"node": ">=18.x",
"yarn": ">=1.22.0"
},
"browser": {
Expand Down
62 changes: 62 additions & 0 deletions playwright-report/index.html

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,26 @@ import { defineConfig, devices } from '@playwright/test';
export default defineConfig({
testDir: './tests',
/* Maximum time one test can run for. */
timeout: 60 * 1000,
timeout: 240 * 1000,
expect: {
/**
* Maximum time expect() should wait for the condition to be met.
* For example in `await expect(locator).toHaveText();`
*/
timeout: 30000,
timeout: 60000,
},
/* Run tests in files in parallel */
fullyParallel: true,
/* Fail the build on CI if you accidentally left test.only in the source code. */
forbidOnly: !!process.env.CI,
/* Retry on CI only */
retries: process.env.CI ? 2 : 0,
/* Opt out of parallel tests on CI. */
/*
Limit workers to 1 because tests depends on a single Zombienet instance.
It shouldn't be like that but spawning Zombienet for every test is time consuming.
workers: process.env.CI ? 1 : undefined,
*/
workers: 1,
/* Reporter to use. See https://playwright.dev/docs/test-reporters */
reporter: 'html',
/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
Expand Down
4 changes: 2 additions & 2 deletions public/index.template.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ function initSplashText() {
}

if (!isLightClientConenction()) {
document.getElementById('splash').remove();
document.getElementById('splash')?.remove();
return;
} else {
document.getElementById('overlay').remove();
document.getElementById('overlay')?.remove();
}

const intervalId = setInterval(() => {
Expand Down
3 changes: 3 additions & 0 deletions src/components/assets/Assets.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<template>
<div v-if="!isLoading" class="wrapper--assets">
<div class="separator--top">
<div class="separator" />
</div>
<div class="container--assets">
<div>
<span class="text--xl">
Expand Down
2 changes: 2 additions & 0 deletions src/components/assets/EvmAssetList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
</div>
</div>

<div class="separator" />

<div class="container">
<div class="row">
<div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/assets/NativeAssetList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
</div>
</div>

<div class="row--bg--extend row--details-native bg--accent">
<div v-if="numEvmDeposit" class="row--bg--extend row--details-native bg--accent">
<div class="row__left">
<span class="text--md">{{ $t('assets.yourEvmDeposit') }}</span>
</div>
Expand Down
12 changes: 8 additions & 4 deletions src/components/assets/styles/account.scss
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
}

.column__address {
color: $gray-4;
@media (min-width: $md) {
margin-left: 42px;
}
Expand All @@ -107,7 +108,7 @@
.text--total-balance {
font-size: 16px;
font-weight: 700;
color: $gray-5;
color: $navy-1;
}

.row__icons {
Expand All @@ -128,7 +129,7 @@
}

.text--warning-bold {
color: $gray-5;
color: $navy-1;
font-weight: 700;
}

Expand All @@ -138,13 +139,16 @@
}

.text--warning {
color: $gray-5;
color: $navy-1;
list-style-type: initial;
}

.body--dark {
.column__address {
color: $gray-3;
}
.text--switch-account {
color: $astar-blue-dark;
color: $astar-blue;
}
.text--total-balance {
color: $gray-1;
Expand Down
2 changes: 1 addition & 1 deletion src/components/assets/styles/asset-list-xcm.scss
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@

.body--dark {
.container--explorer-icon {
stroke: $astar-blue-dark;
stroke: $astar-blue;
&:hover {
stroke: white;
}
Expand Down
Loading

0 comments on commit 6d28632

Please sign in to comment.