Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge the release-hotfix to main branch #1025

Merged
merged 4 commits into from
Nov 23, 2023
Merged

merge the release-hotfix to main branch #1025

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7edaf8d
fix: enables Snap on the production (#1024)
impelcrypto Nov 15, 2023
2aa60f2
Add a link to the docs (#1027)
ayumitk Nov 15, 2023
168f981
fix: words (#1028)
impelcrypto Nov 15, 2023
9613a72
fix: display the staking list for EVM accounts (#1030)
impelcrypto Nov 16, 2023
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
13 changes: 2 additions & 11 deletions src/components/header/modals/ModalConnectWallet.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
<button
v-for="(wallet, index) in nativeWallets"
:key="index"
:disabled="checkIsDisabledWallet(wallet.source) || isZkEvm"
:disabled="isZkEvm"
class="box__row--wallet box--hover--active"
:class="currentWallet === wallet.source && 'border--active'"
@click="!checkIsDisabledWallet(wallet.source) && setSubstrateWalletModal(wallet.source)"
@click="setSubstrateWalletModal(wallet.source)"
>
<div class="box--img">
<img :src="wallet.img" />
Expand Down Expand Up @@ -172,7 +172,6 @@ import { initiatePolkdatodSnap } from 'src/modules/snap';
import { useStore } from 'src/store';
import { SubstrateAccount } from 'src/store/general/state';
import { PropType, computed, defineComponent, ref } from 'vue';
import { productionOrigin } from 'src/links';

export default defineComponent({
props: {
Expand Down Expand Up @@ -224,13 +223,6 @@ export default defineComponent({
props.setCloseModal();
};

const checkIsDisabledWallet = (source: SupportWallet): boolean => {
if (source === SupportWallet.Snap && window.location.origin === productionOrigin) {
return true;
}
return false;
};

const nativeWallets = computed(() => {
return supportWallets
.map((it) => {
Expand Down Expand Up @@ -327,7 +319,6 @@ export default defineComponent({
setEvmWalletModal,
disconnectAccount,
setPolkasafeModal,
checkIsDisabledWallet,
setAccountUnificationModal,
currentNetworkIdx,
endpointKey,
Expand Down
2 changes: 1 addition & 1 deletion src/modules/snap/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export interface SnapConfig {
unit?: UnitConfiguration;
}

export const snapId = process.env.DEV ? 'local:http://localhost:8081' : 'npm:@astar-network/snap';
export const snapId = 'npm:@astar-network/snap';

export async function enablePolkadotSnap(
config: SnapConfig = { networkName: 'shibuya' },
Expand Down
Loading