Skip to content

Commit

Permalink
Lint fix
Browse files Browse the repository at this point in the history
  • Loading branch information
hide-on-bush-x committed Nov 9, 2022
1 parent 1da22b2 commit a90b0b1
Show file tree
Hide file tree
Showing 7 changed files with 89 additions and 97 deletions.
1 change: 0 additions & 1 deletion src/common/components/modal/index.tsx
@@ -1,7 +1,6 @@
import { Modal } from 'antd';
import React from 'react';


import './styles.css';

export interface ModalProps {
Expand Down
6 changes: 1 addition & 5 deletions src/common/helpers/provider/masa-context.tsx
Expand Up @@ -158,11 +158,7 @@ export const MasaContextProvider = ({ children }: MasaContextProviderProps) => {

const handlePurchaseSoulname = useCallback(
async (soulname, duration, paymentMethod) => {
await masaInstance?.identity.create(
soulname,
duration,
paymentMethod
);
await masaInstance?.identity.create(soulname, duration, paymentMethod);

await loadIdentity();
},
Expand Down
2 changes: 1 addition & 1 deletion src/common/helpers/provider/masa-provider.tsx
Expand Up @@ -5,7 +5,7 @@ import { MasaInterface } from '../../components/masa-interface';
import { useMetamask } from './use-metamask';

import '../../../../tailwind.css';
import 'antd/dist/antd.css'
import 'antd/dist/antd.css';

export const MasaProvider = ({ children }: any) => {
useMetamask();
Expand Down
9 changes: 4 additions & 5 deletions src/common/helpers/provider/use-masa.tsx
@@ -1,7 +1,6 @@
import { useContext } from "react";
import { MASA_CONTEXT } from "./masa-context";
import { useContext } from 'react';
import { MASA_CONTEXT } from './masa-context';

export const useMasa = () => {
return useContext(MASA_CONTEXT);
};

return useContext(MASA_CONTEXT);
};
114 changes: 57 additions & 57 deletions src/common/helpers/provider/use-metamask.ts
@@ -1,66 +1,66 @@
import { ethers } from "ethers";
import { useCallback, useEffect } from "react";
import { useMasa } from "./use-masa";
import { ethers } from 'ethers';
import { useCallback, useEffect } from 'react';
import { useMasa } from './use-masa';

//@ts-ignore
const provider = new ethers.providers.Web3Provider(window?.ethereum);

export const useMetamask = () => {
const { setProvider, masa } = useMasa();

useEffect(() => {
const connectWalletOnPageLoad = async () => {
if (localStorage?.getItem('isWalletConnected') === 'true') {
try {
connect();
} catch (ex) {
console.log(ex);
}
const { setProvider, masa } = useMasa();

useEffect(() => {
const connectWalletOnPageLoad = async () => {
if (localStorage?.getItem('isWalletConnected') === 'true') {
try {
connect();
} catch (ex) {
console.log(ex);
}
};
connectWalletOnPageLoad();
}, []);

const onConnect = () => {
localStorage.setItem('isWalletConnected', 'true');
}
};

const handleLogout = useCallback(async () => {
await masa?.session.logout();
}, [masa]);

const disconnect = useCallback(async () => {
await handleLogout();
localStorage.setItem('isWalletConnected', 'false');
setProvider?.(null);
}, [masa]);

useEffect(() => {
//@ts-ignore
window?.ethereum?.on('accountsChanged', async function (accounts) {
if (accounts.length === 0) {
await handleLogout();
disconnect();
connectWalletOnPageLoad();
}, []);

const onConnect = () => {
localStorage.setItem('isWalletConnected', 'true');
};

const handleLogout = useCallback(async () => {
await masa?.session.logout();
}, [masa]);

const disconnect = useCallback(async () => {
await handleLogout();
localStorage.setItem('isWalletConnected', 'false');
setProvider?.(null);
}, [masa]);

useEffect(() => {
//@ts-ignore
window?.ethereum?.on('accountsChanged', async function (accounts) {
if (accounts.length === 0) {
await handleLogout();
disconnect();
}
});
}, []);

const connect = () => {
//@ts-ignore
if (window.ethereum) {
provider.send('eth_requestAccounts', []).then(async () => {
console.log('ETH ACCOUNT');
await accountChangedHandler(provider.getSigner(0));
if (provider && setProvider) {
setProvider(provider.getSigner(0));
onConnect();
}
});
}, []);

const connect = () => {
//@ts-ignore
if (window.ethereum) {
provider.send('eth_requestAccounts', []).then(async () => {
console.log('ETH ACCOUNT');
await accountChangedHandler(provider.getSigner(0));
if (provider && setProvider) {
setProvider(provider.getSigner(0));
onConnect();
}
});
}
};
const accountChangedHandler = async (newAccount) => {
if (setProvider) setProvider(newAccount);
};

return { connect };
};
}
};
const accountChangedHandler = async (newAccount) => {
if (setProvider) setProvider(newAccount);
};

return { connect };
};
50 changes: 25 additions & 25 deletions src/config/colors.js
@@ -1,27 +1,27 @@
module.exports = {
white: '#FFF',
black: '#000',
skeleton: '#DEDEDE',
gray: '#8692A6',
gray2: '#F5F5F5',
gray3: '#BDBDBD',
gray4: '#696F79',
gray5: '#EFEFEF',
gray6: '#C7C7C7',
gray7: '#918e8e',
gray8: '#292929',
linkYellow: '#FFC01F',
blue: 'rgba(50, 130, 246, 0.8)',
// intent colors
default: '#8692A6',
primary: '#3282f6',
success: '#44C73B',
warning: '#C79C3B',
danger: '#BC2D00',
// charts
chartGreen: '#219653',
chartViolet: '#9B51E0',
white: '#FFF',
black: '#000',
skeleton: '#DEDEDE',
gray: '#8692A6',
gray2: '#F5F5F5',
gray3: '#BDBDBD',
gray4: '#696F79',
gray5: '#EFEFEF',
gray6: '#C7C7C7',
gray7: '#918e8e',
gray8: '#292929',
linkYellow: '#FFC01F',
blue: 'rgba(50, 130, 246, 0.8)',
// intent colors
default: '#8692A6',
primary: '#3282f6',
success: '#44C73B',
warning: '#C79C3B',
danger: '#BC2D00',
// charts
chartGreen: '#219653',
chartViolet: '#9B51E0',

// overlay
whiteOverlay: 'rgba(255,255,255,0.1)',
}
// overlay
whiteOverlay: 'rgba(255,255,255,0.1)',
};
4 changes: 1 addition & 3 deletions stories/masa.stories.tsx
@@ -1,8 +1,6 @@
// @ts-ignore
import React, { useCallback, useState } from 'react';
import {
MasaProvider,
} from '../src/common/helpers/provider/masa-provider';
import { MasaProvider } from '../src/common/helpers/provider/masa-provider';
import { Meta, Story } from '@storybook/react';
import { Button } from 'antd';
import { useMasa } from '../src/common/helpers/provider/use-masa';
Expand Down

0 comments on commit a90b0b1

Please sign in to comment.