merge main into feat/add-disclaimer

.github/workflows/s3-hotfix.yml

@@ -34,6 +34,6 @@ jobs:
         with:
           title: 'Merge release-hotfix to main'
           body: 'This is an auto-generated PR to merge release-hotfix to main'
-          branch: main
-          base: release-hotfix
+          branch: release-hotfix
+          base: main
           delete-branch: false

.github/workflows/s3-production.yml

@@ -26,11 +26,14 @@ jobs:
           aws-region: ${{ secrets.AWS_REGION }}
       - name: Deploy app build to S3 bucket
         run: aws s3 sync ./dist/spa  s3://astar-apps --delete
+      - name: Run 4everland deploy
+        run: |
+          curl "${{ secrets.HOOK_4EVERLAND }}"
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v5
         with:
           title: 'Merge main to release-hotfix'
           body: 'This is an auto-generated PR to merge main to release-hotfix'
-          branch: release-hotfix
-          base: main
+          branch: main
+          base: release-hotfix
           delete-branch: false

README.md

@@ -40,7 +40,7 @@ For E2E testing, we utilize [chopsticks](https://github.com/AcalaNetwork/chopsti
 ### Setup chopsticks
 
 ```bash
-npx @acala-network/chopsticks@latest xcm -p=tests/chopsticks/astar.yml -p=tests/chopsticks/shiden.yml
+npx @acala-network/chopsticks@latest xcm -p=tests/chopsticks/astar.yml -p=tests/chopsticks/acala.yml -r=tests/chopsticks/polkadot.yml
 ```
 
 ### Running tests locally in debug mode

jest.config.js

@@ -6,9 +6,9 @@ module.exports = {
     __DEV__: true,
     // TODO: Remove if resolved natively
     // See https://github.com/vuejs/vue-jest/issues/175
-    'vue-jest': {
-      pug: { doctype: 'html' },
-    },
+    // 'vue-jest': {
+    //   pug: { doctype: 'html' },
+    // },
   },
   // noStackTrace: true,
   // bail: true,
@@ -66,10 +66,10 @@ module.exports = {
     //  (async) .babelrc, .babelrc.js, package.json, babel.config.js
     //  (sync) .babelrc, .babelrc.js, babel.config.js, package.json
     // https://github.com/tleunen/find-babel-config/issues/33
-    '.*\\.vue$': 'vue-jest',
+    // '.*\\.vue$': 'vue-jest',
     '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$':
       'jest-transform-stub',
   },
   transformIgnorePatterns: [`node_modules/(?!(${esModules}))`],
-  snapshotSerializers: ['<rootDir>/node_modules/jest-serializer-vue'],
+  // snapshotSerializers: ['<rootDir>/node_modules/jest-serializer-vue'],
 };

package.json

@@ -21,12 +21,12 @@
     "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:8000' npx playwright test --project=chromium --debug",
+    "playwright": "BASE_URL='http://localhost:8080' ENDPOINT='ws://127.0.0.1:9944' npx playwright test --project=chromium --debug",
     "playwright:ci": "node ./tests/chopsticks/start-chopsticks.js"
   },
   "dependencies": {
-    "@astar-network/astar-sdk-core": "^0.2.4",
-    "@astar-network/astar-ui": "^0.0.91",
+    "@astar-network/astar-sdk-core": "^0.2.5",
+    "@astar-network/astar-ui": "^0.0.93",
     "@ethersproject/bignumber": "^5.5.0",
     "@polkadot/api": "^10.9.1",
     "@polkadot/api-contract": "^10.9.1",
@@ -44,8 +44,8 @@
     "@polkadot/vue-identicon": "^3.5.1",
     "@polkadot/wasm-crypto": "^7.2.1",
     "@polkadot/x-randomvalues": "^12.3.2",
-    "@quasar/app": "^3.2.3",
-    "@quasar/extras": "^1.12.0",
+    "@quasar/app-webpack": "^3.9.2",
+    "@quasar/extras": "^1.16.5",
     "@vue/apollo-composable": "^4.0.0-beta.4",
     "animate.css": "^4.1.1",
     "apr-tools": "^0.1.3",
@@ -61,13 +61,14 @@
     "highcharts": "^10.0.0",
     "highcharts-vue": "^1.4.0",
     "inversify": "^6.0.1",
+    "jest": "^29.6.1",
     "keccak": "^3.0.2",
     "lodash-es": "^4.17.21",
-    "luxon": "^2.1.1",
+    "luxon": "^2.5.2",
     "marked": "^4.0.15",
     "path": "^0.12.7",
-    "polkasafe": "^1.1.9",
-    "quasar": "^2.3.3",
+    "polkasafe": "^1.1.10",
+    "quasar": "^2.12.3",
     "query-string": "^7.1.0",
     "reflect-metadata": "^0.1.13",
     "secp256k1": "^4.0.2",
@@ -77,8 +78,9 @@
     "stream": "^0.0.2",
     "v-odometer": "^2.0.1",
     "validator": "^13.7.0",
-    "vue-i18n": "^9.0.0-beta.0",
+    "vue-i18n": "^9.2.2",
     "vue-js-progress": "^1.0.2",
+    "vue-router": "^4.0.0",
     "vue3-autocounter": "^1.0.6",
     "vue3-click-away": "^1.2.4",
     "vue3-dropzone": "^0.0.7",
@@ -93,9 +95,9 @@
     "@playwright/test": "^1.31.0",
     "@polkadot/ts": "^0.4.22",
     "@quasar/quasar-app-extension-apollo": "^2.0.0-beta.5",
-    "@quasar/quasar-app-extension-qmarkdown": "^2.0.0-alpha.8",
-    "@quasar/quasar-app-extension-testing": "^2.0.1",
-    "@quasar/quasar-app-extension-testing-unit-jest": "^3.0.0-alpha.6",
+    "@quasar/quasar-app-extension-qmarkdown": "^2.0.0-beta.10",
+    "@quasar/quasar-app-extension-testing": "^2.1.0",
+    "@quasar/quasar-app-extension-testing-unit-jest": "^3.0.0-beta.5",
     "@tailwindcss/custom-forms": "^0.2.1",
     "@tailwindcss/postcss7-compat": "^2.0.3",
     "@types/bn.js": "^5.1.0",

src/apollo/index.ts

@@ -1,6 +1,6 @@
 import type { ApolloClientOptions } from '@apollo/client/core';
 import { createHttpLink, InMemoryCache } from '@apollo/client/core';
-import type { BootFileParams } from '@quasar/app';
+import { BootFileParams } from '@quasar/app-webpack';
 
 export /* async */ function getClientOptions(
   /* {app, router, ...} */ options?: Partial<BootFileParams<any>>

src/boot/i18n.ts

@@ -9,6 +9,7 @@ const languageCode = localStorage.getItem(LOCAL_STORAGE.SELECTED_LANGUAGE);
 const i18n = createI18n({
   locale: languageCode || 'en-US',
   fallbackLocale: 'en-US',
+  legacy: false,
   messages,
 });
 

src/boot/portalV2.ts

@@ -1,11 +1,10 @@
-import { computed } from 'vue';
+import { $api } from 'boot/api';
 import { boot } from 'quasar/wrappers';
 import buildDependencyContainer from 'src/v2/app.container';
-import { endpointKey } from 'src/config/chainEndpoints';
+import { getProviderIndex } from 'src/config/chainEndpoints';
+import { ASTAR_CHAIN } from 'src/config/chain';
 
-export default boot(({ store }) => {
-  const networkIdx = computed(() => store.getters['general/networkIdx']);
-  const network = <endpointKey>networkIdx.value;
-
-  buildDependencyContainer(network);
+export default boot(async () => {
+  const systemChain = (await $api!.rpc.system.chain()).toString() as ASTAR_CHAIN;
+  buildDependencyContainer(getProviderIndex(systemChain));
 });

src/components/assets/NativeAssetList.vue

@@ -263,7 +263,7 @@ export default defineComponent({
     const isModalFaucet = ref<boolean>(false);
     const isModalEvmWithdraw = ref<boolean>(false);
     const isModalVesting = ref<boolean>(false);
-    const bal = ref<number | null>(null);
+    const bal = ref<number>(0);
     const balUsd = ref<number | null>(null);
     const vestingTtl = ref<number>(0);
     const lockInDappStaking = ref<number>(0);

src/components/assets/transfer/XcmBridge.vue

@@ -97,6 +97,7 @@
             </div>
             <div class="box__column--input-amount">
               <input
+                id="amount"
                 :value="amount"
                 inputmode="decimal"
                 type="number"

src/components/common/LocaleChanger.vue

@@ -1,47 +1,49 @@
 <template>
-  <div class="tw-relative tw-inline-block tw-rounded-lg tw-bg-black">
-    <select v-model="$i18n.locale" class="select-language" placeholder="Regular input">
-      <option v-for="(lang, i) in langs" :key="`Lang${i}`" :value="lang.code">
-        {{ lang.text }}
-      </option>
-    </select>
-
-    <div
-      class="
-        icon--select
-        tw-absolute tw-inset-y-0 tw-right-0 tw-flex tw-items-center tw-px-2 tw-pointer-events-none
-      "
-    >
-      <svg class="tw-w-4 tw-h-4 tw-fill-current" viewBox="0 0 20 20">
-        <path
-          d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"
-          clip-rule="evenodd"
-          fill-rule="evenodd"
-        ></path>
-      </svg>
-    </div>
-  </div>
+  <q-select
+    v-model="selectedLang"
+    filled
+    :options="langs"
+    option-value="code"
+    option-label="text"
+    :hide-dropdown-icon="false"
+  >
+    <template #append>
+      <q-icon name="language" />
+    </template>
+  </q-select>
 </template>
 
 <script lang="ts">
 import { LOCAL_STORAGE } from 'src/config/localStorage';
 import { languagesSelector } from 'src/i18n';
-import { defineComponent, watch } from 'vue';
+import { defineComponent, watch, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 export default defineComponent({
   data() {
     const { locale } = useI18n();
+    const selectedLang = ref(languagesSelector[0]);
 
     watch(
       [locale],
       () => {
+        selectedLang.value =
+          languagesSelector.find((lang) => lang.code === locale.value) || languagesSelector[0];
+        console.log(selectedLang.value);
+      },
+      { immediate: true }
+    );
+
+    watch(
+      [selectedLang],
+      () => {
+        locale.value = selectedLang.value.code;
         localStorage.setItem(LOCAL_STORAGE.SELECTED_LANGUAGE, locale.value);
       },
       { immediate: false }
     );
 
-    return { langs: languagesSelector };
+    return { langs: languagesSelector, selectedLang };
   },
 });
 </script>
@@ -55,7 +57,7 @@ export default defineComponent({
 .select-language {
   background: #d3d6dc;
   color: $navy-1;
-  width: 95px;
+  width: 100%;
   height: 36px;
   padding-left: 15px;
   appearance: none;
@@ -72,14 +74,22 @@ export default defineComponent({
     background: #fff;
   }
 }
+</style>
 
-.body--dark {
-  .select-language {
-    background: #9d9ccc;
-    color: black;
-  }
-  .icon--select {
-    color: black;
-  }
+<style lang="scss">
+.q-select {
+  font-size: 16px;
+}
+
+.q-menu {
+  font-size: 16px;
+}
+
+.q-field__native {
+  color: $gray-1;
+}
+
+.q-icon {
+  color: $gray-4;
 }
 </style>

src/components/common/Validators.spec.ts

@@ -1,4 +1,3 @@
-import { describe, expect, it } from '@jest/globals';
 import { isEmailValid, isUrlValid } from './Validators';
 
 describe('isEmailValid', () => {

src/components/dapp-staking/dapp/ProjectDetails.vue

@@ -106,6 +106,18 @@
         </div>
         <div class="row--social-icons">
           <div v-for="(it, index) in communities" :key="index">
+            <button v-if="it.type === CommunityType.GitHub" class="box--share btn--primary">
+              <div class="icon--social">
+                <a :href="it.handle" target="_blank" rel="noopener noreferrer">
+                  <astar-icon-base viewBox="0 0 512 512" :icon-name="CommunityType.GitHub">
+                    <astar-icon-github />
+                  </astar-icon-base>
+                </a>
+              </div>
+              <q-tooltip>
+                <span class="text--tooltip">{{ $t('common.github') }}</span>
+              </q-tooltip>
+            </button>
             <button v-if="it.type === CommunityType.Discord" class="box--share btn--primary">
               <div class="icon--social">
                 <a :href="it.handle" target="_blank" rel="noopener noreferrer">

src/components/dapp-staking/my-staking/OnChainData.vue

@@ -13,7 +13,7 @@
                 :key="index"
                 v-close-popup
                 clickable
-                @click="filterBy = item"
+                @click="changeFilter(item)"
               >
                 <q-item-section>
                   <q-item-label>{{ $t(item) }}</q-item-label>
@@ -232,7 +232,6 @@ export default defineComponent({
 
           return '';
         }
-        return '0';
       } catch (error) {
         return '0';
       }
@@ -317,8 +316,17 @@ export default defineComponent({
       }, 700);
     };
 
+    const changeFilter = (filter: Filter): void => {
+      filterBy.value = filter;
+      page.value = 1;
+      changePage(false);
+    };
+
     watchEffect(setDataArray);
-    watchEffect(handlePageUpdate);
+
+    // The below cause problem with not showing the data (after uplift to a new Quasar version) when accessing the page directly
+    // watchEffect(handlePageUpdate);
+
     watch(
       [currentNetworkName],
       async () => {
@@ -347,6 +355,7 @@ export default defineComponent({
       getBorderStyle,
       Filter,
       goDappPageLink,
+      changeFilter,
     };
   },
 });

src/components/dapp-staking/register/components/Community.vue

@@ -73,6 +73,13 @@ export default defineComponent({
     const data = reactive<NewDappItem>(props.dapp);
     const isModalAddCommunity = ref<boolean>(false);
     const availableCommunities = ref<CommunityDefinition[]>([
+      {
+        type: CommunityType.GitHub,
+        handle: '',
+        iconName: SocialIcon.Github,
+        label: t('dappStaking.modals.community.githubAccount'),
+        validateHandle: (x) => validateUrl(x),
+      },
       {
         type: CommunityType.Discord,
         handle: '',

src/components/header/modals/ModalConnectWallet.vue

@@ -285,7 +285,6 @@ export default defineComponent({
     };
 
     const setSubstrateWalletModal = async (source: string): Promise<void> => {
-      handleExtensions();
       await closeModal();
       props.setWalletModal(source);
     };