Skip to content

fix: connection modal overrides gsw selection modal #175

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

Merged
merged 3 commits into from
May 3, 2022
Merged

fix: connection modal overrides gsw selection modal #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
108ecbb
fix
May 3, 2022
071bbc0
Merge branch 'dev' into fix/connection-modal-override-gsw-modal
May 3, 2022
bcc9b89
Merge branch 'dev' into fix/connection-modal-override-gsw-modal
May 3, 2022
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
4 changes: 2 additions & 2 deletions src/libs/starknet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {getStarknet} from 'get-starknet-wallet';
import {getStarknet, connect as getStarknetWallet} from 'get-starknet-wallet';
import * as starknet from 'starknet';

export {starknet, getStarknet};
export {starknet, getStarknet, getStarknetWallet};
7 changes: 5 additions & 2 deletions src/providers/WalletsProvider/wallets-hooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {useCallback, useContext, useEffect, useState} from 'react';

import {ChainInfo, ChainType, WalletErrorType, WalletStatus} from '../../enums';
import {useEnvs} from '../../hooks';
import {getStarknet} from '../../libs';
import {getStarknet, getStarknetWallet} from '../../libs';
import {useTransfer} from '../TransferProvider';
import {WalletsContext} from './wallets-context';

Expand Down Expand Up @@ -70,8 +70,11 @@ export const useStarknetWallet = () => {

const connect = async walletConfig => {
try {
const wallet = await getStarknetWallet();
if (!wallet) {
return;
}
setStatus(WalletStatus.CONNECTING);
const wallet = getStarknet();
const enabled = await wallet
.enable(!autoConnect && {showModal: true})
.then(address => !!address?.length);
Expand Down