Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/broken-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
- run: yarn && yarn build

- name: Link Checker
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-to-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
- run: yarn && yarn build
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.x]
node-version: [20.x]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
Expand All @@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.x]
node-version: [20.x]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
Expand All @@ -41,7 +41,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.x]
node-version: [20.x]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull-request-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
- run: npm install -g yarn
- run: yarn && yarn build
- id: deploy_firebase_hosting_channel
Expand All @@ -49,7 +49,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
- name: Install dependencies
run: yarn install --immutable --immutable-cache --check-cache
- name: Install Playwright Browsers
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/s3-hotfix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
token: ${{ env.GH_TOKEN }}
- uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
- run: yarn && yarn build
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/s3-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20

- name: install dependencies & build
run: yarn && yarn build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/s3-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
- run: yarn && yarn build
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
Expand Down
21 changes: 19 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
"luxon": "^2.5.2",
"marked": "^4.0.15",
"path": "^0.12.7",
"polkasafe": "^1.4.4",
"quasar": "^2.12.7",
"reflect-metadata": "^0.1.13",
"secp256k1": "^4.0.2",
Expand Down Expand Up @@ -138,11 +137,29 @@
"last 5 Opera versions"
],
"engines": {
"node": ">=18.x",
"node": ">=20.x",
"yarn": ">=1.22.0"
},
"browser": {
"crypto": false,
"stream": false
},
"resolutions": {
"@polkadot/api": "16.4.2",
"@polkadot/api-augment": "16.4.2",
"@polkadot/api-base": "16.4.2",
"@polkadot/api-contract": "16.4.2",
"@polkadot/api-derive": "16.4.2",
"@polkadot/types": "16.4.2",
"@polkadot/types-augment": "16.4.2",
"@polkadot/types-codec": "16.4.2",
"@polkadot/types-create": "16.4.2",
"@polkadot/types-known": "16.4.2",
"@polkadot/rpc-augment": "16.4.2",
"@polkadot/rpc-core": "16.4.2",
"@polkadot/rpc-provider": "16.4.2",
"@polkadot/util": "13.5.3",
"@polkadot/util-crypto": "13.5.3",
"@polkadot/keyring": "13.5.3"
}
}
4 changes: 0 additions & 4 deletions src/assets/img/logo-polkasafe-black.svg

This file was deleted.

27 changes: 2 additions & 25 deletions src/components/assets/Account.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,7 @@
:native-address="unifiedAccount?.nativeAddress"
:icon-url="unifiedAccount?.avatarUrl"
/>
<img
v-else-if="iconWallet"
width="24"
:src="iconWallet"
alt="wallet-icon"
:class="multisig && 'img--polkasafe-account'"
/>
<img v-else-if="iconWallet" width="24" :src="iconWallet" alt="wallet-icon" />
</div>

<div>
Expand Down Expand Up @@ -101,14 +95,6 @@
</div>
</div>

<div v-if="multisig" class="row--details-signatory">
<div class="column-account-name">
<img v-if="iconWallet" width="24" :src="signatoryIconWallet" alt="wallet-icon" />
<span class="text--accent">{{
$t('assets.theSignatory', { account: multisig.signatory.name })
}}</span>
</div>
</div>
<modal-lockdrop-warning
v-if="isLockdropAccount && !isH160"
:is-modal="isModalLockdropWarning"
Expand All @@ -125,7 +111,7 @@ import { $api } from 'src/boot/api';
import ModalLockdropWarning from 'src/components/assets/modals/ModalLockdropWarning.vue';
import AuIcon from 'src/components/header/modals/account-unification/AuIcon.vue';
import { endpointKey, providerEndpoints } from 'src/config/chainEndpoints';
import { SupportWallet, supportWalletObj } from 'src/config/wallets';
import { SupportWallet } from 'src/config/wallets';
import {
useAccount,
useAccountUnification,
Expand Down Expand Up @@ -171,7 +157,6 @@ export default defineComponent({
const {
currentAccount,
currentAccountName,
multisig,
showAccountUnificationModal,
isAccountUnification,
} = useAccount();
Expand Down Expand Up @@ -211,11 +196,6 @@ export default defineComponent({
return Number(balUsd.value) + addAmount;
});

const signatoryIconWallet = computed<string>(() => {
// @ts-ignore
return multisig.value ? supportWalletObj[multisig.value.signatory.source].img : '';
});

const copyAddress = () => {
copy(currentAccount.value);
store.dispatch('general/showAlertMsg', {
Expand Down Expand Up @@ -329,9 +309,6 @@ export default defineComponent({
isSkeleton,
totalBal,
ETHEREUM_EXTENSION,
multisig,
supportWalletObj,
signatoryIconWallet,
isAccountUnification,
unifiedAccount,
isAccountUnified,
Expand Down
5 changes: 2 additions & 3 deletions src/components/assets/transfer/Information.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</a>
</div>
</div>
<div v-if="isHistory && !isMultisig" id="history" class="container--information">
<div v-if="isHistory" id="history" class="container--information">
<div class="row--title">
<astar-icon-history size="20" />
<span>{{ $t('assets.transferPage.recentHistory') }}</span>
Expand Down Expand Up @@ -146,7 +146,7 @@ export default defineComponent({
const txHistories = ref<RecentHistory[]>([]);
const lztTxHistories = ref<RecentLzHistory[]>([]);
const isLoadingTxHistories = ref<boolean>(true);
const { senderSs58Account, isMultisig, currentAccount } = useAccount();
const { senderSs58Account, currentAccount } = useAccount();
const { currentNetworkName, isAstarZkEvm } = useNetworkInfo();
const isH160 = computed<boolean>(() => store.getters['general/isH160Formatted']);

Expand Down Expand Up @@ -225,7 +225,6 @@ export default defineComponent({
txHistories,
isLoadingTxHistories,
socialUrl,
isMultisig,
lztTxHistories,
HistoryTxType,
ccipExplorerUrl,
Expand Down
11 changes: 2 additions & 9 deletions src/components/assets/transfer/LocalTransfer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,7 @@
</div>
</div>
<div class="box__row">
<img
v-if="iconWallet"
width="24"
:src="iconWallet"
alt="wallet-icon"
:class="multisig && 'img--polkasafe'"
/>
<img v-if="iconWallet" width="24" :src="iconWallet" alt="wallet-icon" />
<div class="column--wallet-address">
<div class="column--wallet-name">
<span class="text--title">{{ currentAccountName }}</span>
Expand Down Expand Up @@ -228,7 +222,7 @@ export default defineComponent({
},
setup(props) {
const { iconWallet } = useWalletIcon();
const { currentAccount, currentAccountName, multisig, isLockdropAccount } = useAccount();
const { currentAccount, currentAccountName, isLockdropAccount } = useAccount();
const { nativeTokenSymbol, networkNameSubstrate, isSupportAuTransfer, isZkEvm } =
useNetworkInfo();
const t = computed<Asset>(() => props.token);
Expand Down Expand Up @@ -283,7 +277,6 @@ export default defineComponent({
isRequiredCheck,
isTransferNativeToken,
isNativeToEvm,
multisig,
isZkEvm,
networkNameSubstrate,
isSupportAuTransfer,
Expand Down
6 changes: 2 additions & 4 deletions src/components/assets/transfer/MobileNavigator.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<astar-icon-group :size="size" />
<span>{{ $t('assets.transferPage.faq') }}</span>
</button>
<button v-if="!isMultisig" class="circle--button" @click="scrollTo('history')">
<button class="circle--button" @click="scrollTo('history')">
<astar-icon-history :size="size" />
<span>{{ $t('assets.transferPage.recentHistory') }}</span>
</button>
Expand All @@ -17,14 +17,13 @@
</div>
</template>
<script lang="ts">
import { useAccount, useBreakpoints } from 'src/hooks';
import { useBreakpoints } from 'src/hooks';
import { defineComponent, computed } from 'vue';

export default defineComponent({
setup() {
const { screenSize, width } = useBreakpoints();
const size = computed(() => (width.value > screenSize.sm ? '24' : '21'));
const { isMultisig } = useAccount();
const scrollTo = (id: string): void => {
const el = document.getElementById(id);
el && el.scrollIntoView({ behavior: 'smooth' });
Expand All @@ -33,7 +32,6 @@ export default defineComponent({
return {
screenSize,
size,
isMultisig,
scrollTo,
};
},
Expand Down
11 changes: 2 additions & 9 deletions src/components/assets/transfer/XvmTokenTransfer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,7 @@
</div>
</div>
<div class="box__row">
<img
v-if="iconWallet"
width="24"
:src="iconWallet"
alt="wallet-icon"
:class="multisig && 'img--polkasafe'"
/>
<img v-if="iconWallet" width="24" :src="iconWallet" alt="wallet-icon" />
<div class="column--wallet-address">
<div class="column--wallet-name">
<span class="text--title">{{ currentAccountName }}</span>
Expand Down Expand Up @@ -162,7 +156,7 @@ export default defineComponent({
},
setup(props) {
const { iconWallet } = useWalletIcon();
const { currentAccount, currentAccountName, multisig } = useAccount();
const { currentAccount, currentAccountName } = useAccount();
const { nativeTokenSymbol } = useNetworkInfo();
const t = computed<Erc20Token>(() => props.token);
const {
Expand Down Expand Up @@ -201,7 +195,6 @@ export default defineComponent({
selectedTip,
isH160,
isRequiredCheck,
multisig,
setSelectedTip,
transferAsset,
toMaxAmount,
Expand Down
10 changes: 1 addition & 9 deletions src/components/common/Notification/NotificationBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,7 @@
<div v-if="!isCopiedType">
<div class="message">{{ alertMsg }}</div>
<astar-button v-if="isSuccessType && explorerUrl" class="btn--check" @click="goToSubscan">
{{
$t(
alertMsg === AlertMsg.SUCCESS_MULTISIG
? 'toast.approveOnPolkasafe'
: 'toast.checkYourTransactions'
)
}}
{{ $t('toast.checkYourTransactions') }}
</astar-button>
</div>
</div>
Expand All @@ -43,7 +37,6 @@
import { AlertType } from 'src/store/general/state';
import { useI18n } from 'vue-i18n';
import { defineComponent, toRefs, PropType, computed, ref } from 'vue';
import { AlertMsg } from 'src/modules/toast';
import { navigateInNewTab } from 'src/util-general';

export default defineComponent({
Expand Down Expand Up @@ -102,7 +95,6 @@ export default defineComponent({
isSuccessType,
isCopiedType,
showCloseBtn,
AlertMsg,
goToSubscan,
close,
};
Expand Down
Loading
Loading