From a609791cebf03a1a2ff1bfa164d84ed9b8eafe91 Mon Sep 17 00:00:00 2001 From: hide-on-bush-x Date: Wed, 1 Feb 2023 14:12:35 -0300 Subject: [PATCH 1/4] WIP: Network switch --- src/common/helpers/masa/index.ts | 20 +++++++++++++++++++ src/common/helpers/provider/masa-context.tsx | 3 +++ .../provider/modules/identity/identity.ts | 11 +++++++++- src/common/helpers/provider/use-metamask.ts | 16 +++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) diff --git a/src/common/helpers/masa/index.ts b/src/common/helpers/masa/index.ts index d4d93fe0..61eed9b6 100644 --- a/src/common/helpers/masa/index.ts +++ b/src/common/helpers/masa/index.ts @@ -2,6 +2,25 @@ import { environments, Masa } from '@masa-finance/masa-sdk'; import { ethers, Wallet } from 'ethers'; import { ArweaveConfig } from '../provider/masa-context'; +const getChainName = (chainId) => { + switch (chainId) { + case 1: + return 'mainnet'; + case 5: + return 'goerli'; + case 44787: + return 'alfajores'; + case 42220: + return 'celo'; + case 137: + return 'polygon'; + case 80001: + return 'mumbai'; + + default: + return 'goerli'; + } +}; export const createRandomWallet = (): Wallet | null => { console.info('Creating random wallet!'); const wallet = ethers.Wallet.createRandom(); @@ -37,6 +56,7 @@ export const createNewMasa = ( cookie: cookie || undefined, wallet: signer, apiUrl: environment.apiUrl, + network: getChainName(signer?.provider?._network?.chainId ?? 5), environment: environment.environment, arweave: { host: arweaveConfig?.host || 'arweave.net', diff --git a/src/common/helpers/provider/masa-context.tsx b/src/common/helpers/provider/masa-context.tsx index 56fdf8fc..f6a8f51f 100644 --- a/src/common/helpers/provider/masa-context.tsx +++ b/src/common/helpers/provider/masa-context.tsx @@ -96,7 +96,9 @@ export const MasaContextProvider = ({ handlePurchaseIdentity, isLoading: identityLoading, } = useIdentity(masaInstance, walletAddress); + const { soulnames } = useSoulnames(masaInstance, walletAddress, identity); + const { creditScores, isLoading: creditScoreLoading, @@ -163,6 +165,7 @@ export const MasaContextProvider = ({ }, [modalCallback, setModalOpen, loggedIn, isConnected]); useEffect(() => { + console.log('PROVIDER', { provider }); if (noWallet) { setMasaInstance( createNewMasa(undefined, environment, arweaveConfig, cookie) diff --git a/src/common/helpers/provider/modules/identity/identity.ts b/src/common/helpers/provider/modules/identity/identity.ts index f64aca8a..9c142668 100644 --- a/src/common/helpers/provider/modules/identity/identity.ts +++ b/src/common/helpers/provider/modules/identity/identity.ts @@ -2,11 +2,20 @@ import { useCallback } from 'react'; import { useQuery } from 'react-query'; import { queryClient } from '../../masa-provider'; +const AVAILABLE_NETWORKS = ['goerli', 'eth']; + export const useIdentity = function (masa, walletAddress) { + console.log('NETWORK', masa?.config.network); + const { data, status, isLoading, error } = useQuery( `identity-${walletAddress}`, () => masa.identity.load(walletAddress), - { enabled: !!masa && !!walletAddress } + { + enabled: + !!masa && + !!walletAddress && + AVAILABLE_NETWORKS.includes(masa?.config?.network), + } ); const handlePurchaseIdentity = useCallback(async () => { diff --git a/src/common/helpers/provider/use-metamask.ts b/src/common/helpers/provider/use-metamask.ts index ff930784..d939ef8b 100644 --- a/src/common/helpers/provider/use-metamask.ts +++ b/src/common/helpers/provider/use-metamask.ts @@ -92,6 +92,22 @@ export const useMetamask = ({ disable }: { disable?: boolean }) => { queryClient.invalidateQueries('wallet'); } }); + + //@ts-ignore + window?.ethereum?.on('networkChanged', async (accounts) => { + //@ts-ignore + const newProvider = new ethers.providers.Web3Provider(window?.ethereum); + if (newProvider) { + await newProvider.send('eth_requestAccounts', []); + + await accountChangedHandler(newProvider.getSigner(0)); + if (newProvider && setProvider) { + setProvider(newProvider.getSigner(0)); + onConnect(); + } + queryClient.invalidateQueries('wallet'); + } + }); } }, [handleLogout, disconnect, setProvider]); From f2ffb58045e4e956c2049ce2e81e7dca7e70123f Mon Sep 17 00:00:00 2001 From: hide-on-bush-x Date: Fri, 3 Feb 2023 13:10:23 -0300 Subject: [PATCH 2/4] New UI and session bug fix --- package.json | 3 +- .../pages/authenticate/index.tsx | 44 +++++++++++++---- .../masa-interface/pages/connected/index.tsx | 49 +++++-------------- .../masa-interface/pages/connector/index.tsx | 2 +- src/common/components/masa-loading/index.tsx | 3 +- src/common/components/modal/index.tsx | 3 +- src/common/components/modal/styles.scss | 42 ++++++++++++++-- src/common/components/spinner/index.ts | 1 + src/common/components/spinner/spinner.tsx | 15 ++++++ src/common/helpers/masa/index.ts | 2 +- src/common/helpers/provider/masa-context.tsx | 5 +- .../provider/modules/identity/identity.ts | 10 +--- .../provider/modules/session/session.ts | 3 +- src/common/helpers/provider/use-metamask.ts | 9 ++-- stories/masa.stories.tsx | 8 +-- styles.scss | 18 ++++++- yarn.lock | 13 +++-- 17 files changed, 147 insertions(+), 83 deletions(-) create mode 100644 src/common/components/spinner/index.ts create mode 100644 src/common/components/spinner/spinner.tsx diff --git a/package.json b/package.json index f15c1bc8..d74f2e97 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "author": "hide-on-bush", "dependencies": { "@auth0/auth0-react": "^1.12.0", - "@masa-finance/masa-sdk": "^1.2.0-alpha.5", + "@masa-finance/masa-sdk": "^1.2.0", "@rollup/plugin-commonjs": "^23.0.2", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-typescript": "^9.0.2", @@ -44,6 +44,7 @@ "node-sass": "^8.0.0", "react": "^18.2.0", "react-query": "^3.39.3", + "react-spinners": "^0.13.8", "rodal": "^2.0.0", "rollup-plugin-babel": "^4.4.0", "rollup-plugin-copy": "^3.4.0", diff --git a/src/common/components/masa-interface/pages/authenticate/index.tsx b/src/common/components/masa-interface/pages/authenticate/index.tsx index ec050740..9c48bd64 100644 --- a/src/common/components/masa-interface/pages/authenticate/index.tsx +++ b/src/common/components/masa-interface/pages/authenticate/index.tsx @@ -1,25 +1,51 @@ -import React from 'react'; +import React, { useMemo } from 'react'; import { useMasa } from '../../../../helpers/provider/use-masa'; +import { Spinner } from '../../../spinner'; export const InterfaceAuthenticate = () => { - const { handleLogin } = useMasa(); + const { handleLogin, walletAddress, identity, loading } = useMasa(); + const hasIdentity = useMemo(() => { + return identity && identity?.identityId; + }, [identity]); + const shortAddress = useMemo(() => { + return `${walletAddress?.substring(0, 2)}...${walletAddress?.substring( + walletAddress.length - 4, + walletAddress.length - 1 + )}`; + }, [walletAddress]); + + + if( loading ) { + return + } return (
-

Wallet connected!

-

- Now that you connected your wallet, you need to run through a little - authentication process, it wont take much and only needs a signature +

Wallet connected!

+

+ Your wallet is connected you can now create an account by minting a + Masa Soulbound Identity and Masa Soulname! +

+ +

+ You are connected with the following wallet + {shortAddress}

-
diff --git a/src/common/components/masa-interface/pages/connected/index.tsx b/src/common/components/masa-interface/pages/connected/index.tsx index ec23db36..bc31db80 100644 --- a/src/common/components/masa-interface/pages/connected/index.tsx +++ b/src/common/components/masa-interface/pages/connected/index.tsx @@ -1,50 +1,25 @@ -import React, { useEffect, useMemo } from 'react'; +import React, { useEffect } from 'react'; import { useMasa } from '../../../../helpers/provider/use-masa'; import { MasaLoading } from '../../../masa-loading'; +import { Spinner } from '../../../spinner'; export const InterfaceConnected = () => { - const { - handleLogout, - closeModal, - company, - soulnames, - loadSoulnames, - loading, - } = useMasa(); + const { company, loading, closeModal } = useMasa(); - useEffect(() => { - loadSoulnames?.(); - }, [loadSoulnames]); - - const name = useMemo(() => { - if (soulnames?.length) { - return soulnames[0].tokenDetails.sbtName; - } else { - return null; - } - }, [soulnames]); + useEffect(() => { + setTimeout(() => { + closeModal?.(); + }, 3000) + }, []) + if (loading) return ; return (
-

- Hello{name ? ', ' : '!'} {name} -

-

- Woo hoo! -
you have successfully connected your wallet. -

-
-
- - +

We are taking you to {company}

+ +
); diff --git a/src/common/components/masa-interface/pages/connector/index.tsx b/src/common/components/masa-interface/pages/connector/index.tsx index db919c4a..bf14bd0a 100644 --- a/src/common/components/masa-interface/pages/connector/index.tsx +++ b/src/common/components/masa-interface/pages/connector/index.tsx @@ -7,7 +7,7 @@ export const InterfaceConnector = ({ disable }: { disable?: boolean }) => { return (
-

Select a wallet

+

Select a wallet

By connecting your wallet, you agree to our Terms of Service{' '} and Privacy Policy diff --git a/src/common/components/masa-loading/index.tsx b/src/common/components/masa-loading/index.tsx index b7217463..43ff0b8e 100644 --- a/src/common/components/masa-loading/index.tsx +++ b/src/common/components/masa-loading/index.tsx @@ -1,9 +1,10 @@ import React from 'react'; +import { Spinner } from '../spinner'; export const MasaLoading = () => { return (

-

Loading...

+
); }; diff --git a/src/common/components/modal/index.tsx b/src/common/components/modal/index.tsx index 6ffa50e7..df005986 100644 --- a/src/common/components/modal/index.tsx +++ b/src/common/components/modal/index.tsx @@ -13,7 +13,8 @@ export interface ModalProps { export const ModalComponent = ({ children, open, close }: ModalProps) => { return ( close()} className="masa-rodal-container" diff --git a/src/common/components/modal/styles.scss b/src/common/components/modal/styles.scss index 5073d72f..b10d86e7 100644 --- a/src/common/components/modal/styles.scss +++ b/src/common/components/modal/styles.scss @@ -4,17 +4,21 @@ justify-content: center; align-items: center; + border-radius: 24px; + } .masa-modal { display: flex; flex-direction: column; align-items: flex-start; + box-sizing: border-box; - padding-top: 1em; + padding: 1.2em; width: 100%; height: 100%; + .masa-modal-container { width: 100%; height: 100%; @@ -71,7 +75,10 @@ flex-direction: row; justify-content: center; - padding-top: 2em; + text-align: center; + p { + font-size: 16px; + } } .masa-input { @@ -82,6 +89,11 @@ padding: 1em 1.2em; } + .authenticate-button { + margin: 20px 0; + font-weight: 500; + } + .input-row { display: flex; flex-direction: row; @@ -93,6 +105,7 @@ .spinner { width: 100%; + height: 100%; display: flex; justify-content: center; align-items: center; @@ -114,6 +127,29 @@ padding-top: 0; } } + + .interface-authenticate, .interface-connected { + .title { + text-align: center; + } + + .connected-wallet { + text-align: center; + font-size: 18px; + color: rgba(0, 0, 0, 0.6); + + &.with-wallet { + margin-top: 64px; + display: flex; + flex-direction: column; + span { + margin-top: 12px; + font-weight: 800; + color: #5987a6; + } + } + } + } } // RODAL STYLES @@ -148,7 +184,7 @@ z-index: 101; padding: 15px; background: #fff; - border-radius: 3px; + border-radius: 16px; box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2); } diff --git a/src/common/components/spinner/index.ts b/src/common/components/spinner/index.ts new file mode 100644 index 00000000..b2a4e980 --- /dev/null +++ b/src/common/components/spinner/index.ts @@ -0,0 +1 @@ +export { Spinner } from './spinner'; diff --git a/src/common/components/spinner/spinner.tsx b/src/common/components/spinner/spinner.tsx new file mode 100644 index 00000000..c75ba2d0 --- /dev/null +++ b/src/common/components/spinner/spinner.tsx @@ -0,0 +1,15 @@ +import React from 'react'; +import MoonLoader from 'react-spinners/MoonLoader'; + +export interface SpinnerProps { + /** Spinner color */ + color?: string; +} + +export function Spinner({ color = '#000' }: SpinnerProps) { + return ( +
+ +
+ ); +} diff --git a/src/common/helpers/masa/index.ts b/src/common/helpers/masa/index.ts index 61eed9b6..e42cf968 100644 --- a/src/common/helpers/masa/index.ts +++ b/src/common/helpers/masa/index.ts @@ -56,7 +56,7 @@ export const createNewMasa = ( cookie: cookie || undefined, wallet: signer, apiUrl: environment.apiUrl, - network: getChainName(signer?.provider?._network?.chainId ?? 5), + defaultNetwork: getChainName(signer?.provider?._network?.chainId ?? 5), environment: environment.environment, arweave: { host: arweaveConfig?.host || 'arweave.net', diff --git a/src/common/helpers/provider/masa-context.tsx b/src/common/helpers/provider/masa-context.tsx index f6a8f51f..6c1e758b 100644 --- a/src/common/helpers/provider/masa-context.tsx +++ b/src/common/helpers/provider/masa-context.tsx @@ -91,6 +91,7 @@ export const MasaContextProvider = ({ masaInstance, provider ); + const { identity, handlePurchaseIdentity, @@ -165,7 +166,7 @@ export const MasaContextProvider = ({ }, [modalCallback, setModalOpen, loggedIn, isConnected]); useEffect(() => { - console.log('PROVIDER', { provider }); + if (noWallet) { setMasaInstance( createNewMasa(undefined, environment, arweaveConfig, cookie) @@ -179,7 +180,7 @@ export const MasaContextProvider = ({ setMasaInstance(null); } } - }, [provider, noWallet]); + }, [provider, noWallet, walletAddress]); const context = { setProvider, diff --git a/src/common/helpers/provider/modules/identity/identity.ts b/src/common/helpers/provider/modules/identity/identity.ts index 9c142668..285a695c 100644 --- a/src/common/helpers/provider/modules/identity/identity.ts +++ b/src/common/helpers/provider/modules/identity/identity.ts @@ -2,21 +2,15 @@ import { useCallback } from 'react'; import { useQuery } from 'react-query'; import { queryClient } from '../../masa-provider'; -const AVAILABLE_NETWORKS = ['goerli', 'eth']; - export const useIdentity = function (masa, walletAddress) { - console.log('NETWORK', masa?.config.network); - const { data, status, isLoading, error } = useQuery( `identity-${walletAddress}`, () => masa.identity.load(walletAddress), { - enabled: - !!masa && - !!walletAddress && - AVAILABLE_NETWORKS.includes(masa?.config?.network), + enabled: !!masa && !!walletAddress, } ); + console.log('IDENTITYU', { data, error, ENABLED: !!masa && !!walletAddress }); const handlePurchaseIdentity = useCallback(async () => { await masa?.identity.create(); diff --git a/src/common/helpers/provider/modules/session/session.ts b/src/common/helpers/provider/modules/session/session.ts index 6fd64aab..1615782e 100644 --- a/src/common/helpers/provider/modules/session/session.ts +++ b/src/common/helpers/provider/modules/session/session.ts @@ -6,7 +6,7 @@ export const useSession = function (masa, walletAddress) { const { data, status, isLoading, error } = useQuery( `session-${walletAddress}`, () => masa.session.checkLogin(), - { enabled: !!masa && !!walletAddress } + { enabled: !!masa && !!walletAddress, } ); useEffect(() => { @@ -38,5 +38,6 @@ export const useSession = function (masa, walletAddress) { [masa] ); + return { session: data, login, logout, status, isLoading, error }; }; diff --git a/src/common/helpers/provider/use-metamask.ts b/src/common/helpers/provider/use-metamask.ts index d939ef8b..2c71f9cb 100644 --- a/src/common/helpers/provider/use-metamask.ts +++ b/src/common/helpers/provider/use-metamask.ts @@ -4,7 +4,7 @@ import { queryClient } from './masa-provider'; import { useMasa } from './use-masa'; export const useMetamask = ({ disable }: { disable?: boolean }) => { - const { setProvider, setMissingProvider, masa } = useMasa(); + const { setProvider, setMissingProvider, handleLogout } = useMasa(); const provider = useMemo(() => { if (typeof window !== 'undefined') { @@ -71,12 +71,9 @@ export const useMetamask = ({ disable }: { disable?: boolean }) => { localStorage.setItem('isWalletConnected', 'true'); }; - const handleLogout = useCallback(async () => { - await masa?.session.logout(); - }, [masa]); const disconnect = useCallback(async () => { - await handleLogout(); + await handleLogout?.(); localStorage.setItem('isWalletConnected', 'false'); setProvider?.(null); }, [handleLogout, setProvider]); @@ -87,7 +84,7 @@ export const useMetamask = ({ disable }: { disable?: boolean }) => { window?.ethereum?.on('accountsChanged', async (accounts) => { if (accounts.length === 0) { setProvider?.(null); - await handleLogout(); + await handleLogout?.(); await disconnect(); queryClient.invalidateQueries('wallet'); } diff --git a/stories/masa.stories.tsx b/stories/masa.stories.tsx index 670034d1..14f6af26 100644 --- a/stories/masa.stories.tsx +++ b/stories/masa.stories.tsx @@ -37,7 +37,7 @@ const Component = (props) => { const handleConect = useCallback(() => { connect?.({ - scope: ['identity'], + scope: [], callback: function () { alert('hello hello connected'); }, @@ -48,9 +48,6 @@ const Component = (props) => { queryClient.invalidateQueries('wallet'); }; - const create2FACode = () => { - handleGenerateGreen?.('+59895485057'); - }; const mintGreen = async () => { // todo }; @@ -62,7 +59,6 @@ const Component = (props) => { - {loggedIn && } ); @@ -71,7 +67,7 @@ const Component = (props) => { const Template: Story = (props) => { return ( <> - + diff --git a/styles.scss b/styles.scss index e27d3ccd..b7574fa2 100644 --- a/styles.scss +++ b/styles.scss @@ -71,22 +71,36 @@ font-size: 14px; } + .title { + font-family: Ezra; + font-size: 30px; + } + + .masa-spinner { + width: 100%; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + } + .masa-button { width: 100%; background: black; color: white; text-align: center; - padding: 1em 1.2em; + padding: 1.5em 1.2em; height: auto; border: none; transition: background 120ms ease-in-out; + border-radius: 4px; &:hover { - background: #000000CC; + background: #000000cc; } } } diff --git a/yarn.lock b/yarn.lock index c6101e86..689f0603 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2186,10 +2186,10 @@ dependencies: ethers "^5.6.9" -"@masa-finance/masa-sdk@^1.2.0-alpha.5": - version "1.2.0-alpha.5" - resolved "https://registry.yarnpkg.com/@masa-finance/masa-sdk/-/masa-sdk-1.2.0-alpha.5.tgz#e60df44094ae7ff0d9f7854cc6e8f696e09d5600" - integrity sha512-FE93kIY0sq3AVTC3UaDDUMF2b+BUzjakKbUz2wH1e8ma7/mKe/OUTTBNRGnS4GL89AufPrrxiJYrIRwOwRMk7w== +"@masa-finance/masa-sdk@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@masa-finance/masa-sdk/-/masa-sdk-1.2.0.tgz#3a08ca9b76760068ff81ce57cb217c91fb950cb0" + integrity sha512-c/eb0APx2WjckgoYuwlOoSVloMPX5DiYCnUrW4KSKtlyNCF3pNIQH4SD7a2w3enLKODyTzBpgeyDvmE72wM6Pw== dependencies: "@masa-finance/masa-contracts-identity" "^1.1.5" arweave "^1.12.4" @@ -13372,6 +13372,11 @@ react-shallow-renderer@^16.15.0: object-assign "^4.1.1" react-is "^16.12.0 || ^17.0.0 || ^18.0.0" +react-spinners@^0.13.8: + version "0.13.8" + resolved "https://registry.yarnpkg.com/react-spinners/-/react-spinners-0.13.8.tgz#5262571be0f745d86bbd49a1e6b49f9f9cb19acc" + integrity sha512-3e+k56lUkPj0vb5NDXPVFAOkPC//XyhKPJjvcGjyMNPWsBKpplfeyialP74G7H7+It7KzhtET+MvGqbKgAqpZA== + react-syntax-highlighter@^11.0.2: version "11.0.3" resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-11.0.3.tgz#de639b97b781c3f7056d1ee7b6573ea8ab741460" From f965fe115fa3195f7154064347a10a80728c4f20 Mon Sep 17 00:00:00 2001 From: hide-on-bush-x Date: Fri, 3 Feb 2023 13:14:03 -0300 Subject: [PATCH 3/4] Lint fix --- .../components/masa-interface/pages/authenticate/index.tsx | 7 +++---- .../components/masa-interface/pages/connected/index.tsx | 7 +++---- src/common/components/masa-loading/index.tsx | 2 +- src/common/components/modal/styles.scss | 5 ++--- src/common/components/spinner/spinner.tsx | 2 +- src/common/helpers/provider/masa-context.tsx | 1 - src/common/helpers/provider/modules/session/session.ts | 3 +-- src/common/helpers/provider/use-metamask.ts | 1 - 8 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/common/components/masa-interface/pages/authenticate/index.tsx b/src/common/components/masa-interface/pages/authenticate/index.tsx index 9c48bd64..8da8c1e3 100644 --- a/src/common/components/masa-interface/pages/authenticate/index.tsx +++ b/src/common/components/masa-interface/pages/authenticate/index.tsx @@ -15,9 +15,8 @@ export const InterfaceAuthenticate = () => { )}`; }, [walletAddress]); - - if( loading ) { - return + if (loading) { + return ; } return (
@@ -38,7 +37,7 @@ export const InterfaceAuthenticate = () => { className="masa-button authenticate-button" onClick={handleLogin} > - { loading ? "loading..." : hasIdentity ? "Sign in" : "Register"} + {loading ? 'loading...' : hasIdentity ? 'Sign in' : 'Register'}
diff --git a/src/common/components/masa-interface/pages/connected/index.tsx b/src/common/components/masa-interface/pages/connected/index.tsx index bc31db80..b6a216e9 100644 --- a/src/common/components/masa-interface/pages/connected/index.tsx +++ b/src/common/components/masa-interface/pages/connected/index.tsx @@ -6,13 +6,12 @@ import { Spinner } from '../../../spinner'; export const InterfaceConnected = () => { const { company, loading, closeModal } = useMasa(); - useEffect(() => { setTimeout(() => { closeModal?.(); - }, 3000) - }, []) - + }, 3000); + }, []); + if (loading) return ; return (
diff --git a/src/common/components/masa-loading/index.tsx b/src/common/components/masa-loading/index.tsx index 43ff0b8e..1aceaced 100644 --- a/src/common/components/masa-loading/index.tsx +++ b/src/common/components/masa-loading/index.tsx @@ -4,7 +4,7 @@ import { Spinner } from '../spinner'; export const MasaLoading = () => { return (
- +
); }; diff --git a/src/common/components/modal/styles.scss b/src/common/components/modal/styles.scss index b10d86e7..8ff4637d 100644 --- a/src/common/components/modal/styles.scss +++ b/src/common/components/modal/styles.scss @@ -5,7 +5,6 @@ justify-content: center; align-items: center; border-radius: 24px; - } .masa-modal { display: flex; @@ -18,7 +17,6 @@ width: 100%; height: 100%; - .masa-modal-container { width: 100%; height: 100%; @@ -128,7 +126,8 @@ } } - .interface-authenticate, .interface-connected { + .interface-authenticate, + .interface-connected { .title { text-align: center; } diff --git a/src/common/components/spinner/spinner.tsx b/src/common/components/spinner/spinner.tsx index c75ba2d0..528e427f 100644 --- a/src/common/components/spinner/spinner.tsx +++ b/src/common/components/spinner/spinner.tsx @@ -9,7 +9,7 @@ export interface SpinnerProps { export function Spinner({ color = '#000' }: SpinnerProps) { return (
- +
); } diff --git a/src/common/helpers/provider/masa-context.tsx b/src/common/helpers/provider/masa-context.tsx index 6c1e758b..b1d68559 100644 --- a/src/common/helpers/provider/masa-context.tsx +++ b/src/common/helpers/provider/masa-context.tsx @@ -166,7 +166,6 @@ export const MasaContextProvider = ({ }, [modalCallback, setModalOpen, loggedIn, isConnected]); useEffect(() => { - if (noWallet) { setMasaInstance( createNewMasa(undefined, environment, arweaveConfig, cookie) diff --git a/src/common/helpers/provider/modules/session/session.ts b/src/common/helpers/provider/modules/session/session.ts index 1615782e..6fd64aab 100644 --- a/src/common/helpers/provider/modules/session/session.ts +++ b/src/common/helpers/provider/modules/session/session.ts @@ -6,7 +6,7 @@ export const useSession = function (masa, walletAddress) { const { data, status, isLoading, error } = useQuery( `session-${walletAddress}`, () => masa.session.checkLogin(), - { enabled: !!masa && !!walletAddress, } + { enabled: !!masa && !!walletAddress } ); useEffect(() => { @@ -38,6 +38,5 @@ export const useSession = function (masa, walletAddress) { [masa] ); - return { session: data, login, logout, status, isLoading, error }; }; diff --git a/src/common/helpers/provider/use-metamask.ts b/src/common/helpers/provider/use-metamask.ts index 2c71f9cb..3479cc22 100644 --- a/src/common/helpers/provider/use-metamask.ts +++ b/src/common/helpers/provider/use-metamask.ts @@ -71,7 +71,6 @@ export const useMetamask = ({ disable }: { disable?: boolean }) => { localStorage.setItem('isWalletConnected', 'true'); }; - const disconnect = useCallback(async () => { await handleLogout?.(); localStorage.setItem('isWalletConnected', 'false'); From 84d11d357601ac379654775fc3f06c13a71a3839 Mon Sep 17 00:00:00 2001 From: hide-on-bush-x Date: Fri, 3 Feb 2023 13:14:13 -0300 Subject: [PATCH 4/4] Lint fix" --- stories/masa.stories.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stories/masa.stories.tsx b/stories/masa.stories.tsx index 14f6af26..c6c754af 100644 --- a/stories/masa.stories.tsx +++ b/stories/masa.stories.tsx @@ -67,7 +67,7 @@ const Component = (props) => { const Template: Story = (props) => { return ( <> - +