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

Feat add wallet package 4 #390

Merged
merged 9 commits into from
Aug 21, 2023
Merged

Feat add wallet package 4 #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c9e9630
wallet context
rubenmarcus Aug 21, 2023
caa52f7
setup wallet debug
rubenmarcus Aug 21, 2023
08f8f34
add extra support to wallet
rubenmarcus Aug 21, 2023
d0e501d
fix merges
rubenmarcus Aug 21, 2023
916ad76
fix merges
rubenmarcus Aug 21, 2023
3fb20ab
debug
rubenmarcus Aug 21, 2023
c7d2244
debug
rubenmarcus Aug 21, 2023
83a318a
resolve merge
rubenmarcus Aug 21, 2023
540349c
providers
rubenmarcus Aug 21, 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
31 changes: 22 additions & 9 deletions packages/react/src/WalletContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,23 +106,36 @@ export const WalletContextProvider: React.FC<{ children: React.ReactNode; networ
};


useEffect(() => {


const setupMintbaseWallet = async () => await setupWalletSelector({
const setupMintbaseWallet = async () => {
const res = await setupWalletSelector({
network: network,
debug: mbjs.keys.debugMode,
modules: [
...additionalWallets,
],
});

setWalletMb(res);

if (isMintbaseWallet) {
console.log(res, 'selector')

return res;
};


useEffect(() => {

const mbSelector = setupMintbaseWallet();

setWalletMb(mbSelector);
if (isMintbaseWallet) {

setupMintbaseWallet().catch((err: Error) => {
if (err || err.message.length > 0) {
setErrorMessage((err as Error).message);
}
});

}


Expand All @@ -146,7 +159,7 @@ export const WalletContextProvider: React.FC<{ children: React.ReactNode; networ
return () => {
window.removeEventListener('mbWalletLogin', handleUsernameChange);
};
}, [setup]);
}, []);


// call setup on wallet selector
Expand Down Expand Up @@ -228,7 +241,7 @@ export const WalletContextProvider: React.FC<{ children: React.ReactNode; networ
disconnect,
signMessage,
}),
[selector, modal, accounts, isMintbaseWallet, isConnected, mbWalletUsername],
[selector, modal, accounts, isMintbaseWallet, isConnected, mbWalletUsername, mbWalletSelector],
);

return (
Expand Down
2 changes: 1 addition & 1 deletion packages/wallet/src/wallet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ export class MintbaseWallet {
if (urlParams?.accountId) {
this._initializeWalletState({ accountId: urlParams?.accountId, publicKey: urlParams?.publicKey || '' });

console.log({ accountId: urlParams?.accountId, publicKey: urlParams?.publicKey }, this.getAccounts(), '{publickKey: publicKey, accountId: accountId, active: true}');
console.log({ accountId: urlParams?.accountId, publicKey: urlParams?.publicKey }, '{publickKey: publicKey, accountId: accountId, active: true}');

return [{ accountId: urlParams?.accountId, publicKey: urlParams?.publicKey }]

Expand Down
Loading