Merge branch 'master' into wallet-fixes

This commit is contained in:
Jordan Sexton 2021-08-25 18:17:25 -05:00
commit 4808690afc
1 changed files with 2 additions and 2 deletions

View File

@ -1,4 +1,4 @@
import { useConnection, useStore, useWalletModal } from '@oyster/common';
import { useConnection, useStore, useWalletModal, WalletSigner } from '@oyster/common';
import { useWallet } from '@solana/wallet-adapter-react';
import { Button } from 'antd';
import { useCallback, useEffect, useState } from 'react';
@ -7,6 +7,7 @@ import { saveAdmin } from '../../actions/saveAdmin';
import { useMeta } from '../../contexts';
import { WhitelistedCreator } from '../../models/metaplex';
import { SetupVariables } from '../../components/SetupVariables';
import { WalletAdapter } from '@solana/wallet-adapter-base';
export const SetupView = () => {
const [isInitalizingStore, setIsInitalizingStore] = useState(false);
@ -50,7 +51,6 @@ export const SetupView = () => {
// TODO: process errors
// Fack to reload meta
await setStoreForOwner(undefined);
await setStoreForOwner(wallet.publicKey.toBase58());