Skip to content

Commit

Permalink
properly type green methods
Browse files Browse the repository at this point in the history
refactor
  • Loading branch information
H34D committed Feb 13, 2023
1 parent 395d0de commit 4a50e95
Show file tree
Hide file tree
Showing 54 changed files with 59 additions and 32 deletions.
1 change: 0 additions & 1 deletion src/common/helpers/hooks/index.ts

This file was deleted.

4 changes: 0 additions & 4 deletions src/common/helpers/index.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/common/helpers/masa/index.ts

This file was deleted.

2 changes: 0 additions & 2 deletions src/common/index.ts

This file was deleted.

File renamed without changes.
File renamed without changes.
@@ -1,5 +1,5 @@
import React, { useMemo } from 'react';
import { useMasa } from '../../helpers';
import { useMasa } from '../../provider';
import { ModalComponent } from '../modal';
import {
InterfaceAuthenticate,
Expand Down
@@ -1,5 +1,5 @@
import React, { useCallback, useMemo, useState } from 'react';
import { useMasa } from '../../../../helpers';
import { useMasa } from '../../../../provider';
import { Spinner } from '../../../spinner';

export const InterfaceAuthenticate = (): JSX.Element => {
Expand All @@ -19,7 +19,7 @@ export const InterfaceAuthenticate = (): JSX.Element => {

const handleClipboard = useCallback(() => {
if (walletAddress) {
navigator.clipboard.writeText(walletAddress);
void navigator.clipboard.writeText(walletAddress);
setCopied(true);
}
}, [walletAddress]);
Expand Down
@@ -1,5 +1,5 @@
import React, { useEffect } from 'react';
import { useMasa } from '../../../../helpers';
import { useMasa } from '../../../../provider';
import { MasaLoading } from '../../../masa-loading';
import { Spinner } from '../../../spinner';

Expand Down
@@ -1,5 +1,5 @@
import React from 'react';
import { useMetamask } from '../../../../helpers';
import { useMetamask } from '../../../../provider';

export const InterfaceConnector = ({
disable,
Expand Down
@@ -1,5 +1,5 @@
import React, { useCallback, useState } from 'react';
import { useMasa } from '../../../../helpers';
import { useMasa } from '../../../../provider';
import { MasaLoading } from '../../../masa-loading';

export const InterfaceCreateCreditScore = (): JSX.Element => {
Expand Down
@@ -1,5 +1,5 @@
import React, { useCallback } from 'react';
import { useMasa } from '../../../../helpers';
import { useMasa } from '../../../../provider';
import { MasaLoading } from '../../../masa-loading';

export const InterfaceCreateIdentity = (): JSX.Element => {
Expand Down
@@ -1,7 +1,7 @@
import React, { useCallback, useMemo } from 'react';
import { useMasa } from '../../../../helpers';
import { useMasa } from '../../../../provider';
import { MasaLoading } from '../../../masa-loading';
import { Network } from '../../../../helpers/utils/networks';
import { Network } from '../../../../helpers';

export const InterfaceSwitchChain = (): JSX.Element => {
const { network, loading, switchNetwork, SupportedNetworks } = useMasa();
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions src/common/helpers/utils/index.ts → src/helpers/index.ts
@@ -1 +1,2 @@
export * from './masa';
export * from './networks';
File renamed without changes.
File renamed without changes.
5 changes: 3 additions & 2 deletions src/index.tsx
@@ -1,2 +1,3 @@
export { loadIdentityContracts, addresses } from '@masa-finance/masa-sdk';
export * from './common';
export * from './components';
export * from './helpers';
export * from './provider';
Expand Up @@ -4,4 +4,5 @@ export * from './masa-provider';
export * from './masa-query-client';
export * from './use-masa';
export * from './use-metamask';
export * from './use-debounce';
export * from './modules';
@@ -1,6 +1,6 @@
import { EnvironmentName, Masa } from '@masa-finance/masa-sdk';
import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { createNewMasa } from '../masa';
import { createNewMasa, Network, SupportedNetworks } from '../helpers';
import {
useCreditScores,
useGreen,
Expand All @@ -11,7 +11,6 @@ import {
} from './modules';
import { ethers } from 'ethers';
import { MASA_CONTEXT, MasaShape } from './masa-context';
import { Network, SupportedNetworks } from '../utils/networks';

export interface ArweaveConfig {
port?: string;
Expand Down
@@ -1,12 +1,14 @@
import React, { createContext } from 'react';
import {
BaseResult,
CreateGreenResult,
ICreditScore,
IGreen,
Masa,
SoulNameDetails,
} from '@masa-finance/masa-sdk';
import { BigNumber, ethers } from 'ethers';
import { Network } from '../utils/networks';
import { Network } from '../helpers';

export const MASA_CONTEXT = createContext<MasaShape>({});

Expand Down Expand Up @@ -54,8 +56,16 @@ export interface MasaShape {
}[]
| undefined;
greenLoading?: boolean;
handleCreateGreen?: (phoneNumber: string, code: string) => void;
handleGenerateGreen?: (phoneNumber: string) => void;
handleCreateGreen?: (
phoneNumber: string,
code: string
) => Promise<CreateGreenResult | undefined>;
handleGenerateGreen?: (phoneNumber: string) => Promise<
| (BaseResult & {
status: string;
})
| undefined
>;
chain?: null | ethers.providers.Network;
switchNetwork?: (chainId: number) => void;
SupportedNetworks?: { [index: number]: Network };
Expand Down
Expand Up @@ -5,11 +5,11 @@ import {
import React from 'react';
import { QueryClientProvider } from 'react-query';

import { MasaInterface } from '../../components';
import { useMetamask } from './use-metamask';
import { queryClient } from './masa-query-client';

import '../../../../styles.scss';
import '../../styles.scss';
import { MasaInterface } from '../components';

export const MasaProvider = ({
children,
Expand Down
File renamed without changes.
File renamed without changes.
@@ -1,7 +1,12 @@
import { useCallback, useMemo } from 'react';
import { useQuery } from 'react-query';
import { queryClient } from '../../masa-query-client';
import { IGreen, Masa } from '@masa-finance/masa-sdk';
import {
BaseResult,
CreateGreenResult,
IGreen,
Masa,
} from '@masa-finance/masa-sdk';
import { BigNumber } from 'ethers';

export const useGreen = (
Expand All @@ -21,8 +26,16 @@ export const useGreen = (
metadata?: IGreen | undefined;
}[]
| undefined;
handleGenerateGreen: (phoneNumber: string) => void;
handleCreateGreen: (phoneNumber: string, code: string) => void;
handleGenerateGreen: (phoneNumber: string) => Promise<
| (BaseResult & {
status: string;
})
| undefined
>;
handleCreateGreen: (
phoneNumber: string,
code: string
) => Promise<CreateGreenResult | undefined>;
status: string;
isLoading: boolean;
error: unknown;
Expand All @@ -41,7 +54,10 @@ export const useGreen = (
});

const handleCreateGreen = useCallback(
async (phoneNumber: string, code: string) => {
async (
phoneNumber: string,
code: string
): Promise<CreateGreenResult | undefined> => {
const response = await masa?.green.create(phoneNumber, code);

await queryClient.invalidateQueries(queryKey);
Expand All @@ -52,7 +68,14 @@ export const useGreen = (
);

const handleGenerateGreen = useCallback(
async (phoneNumber: string) => {
async (
phoneNumber: string
): Promise<
| (BaseResult & {
status: string;
})
| undefined
> => {
let response;
if (masa) {
response = await masa?.green.generate(phoneNumber);
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -38,7 +38,7 @@ export const useWallet = (
}, [provider]);

useEffect(() => {
loadChainId();
void loadChainId();
}, [loadChainId, setChain]);

return {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 4a50e95

Please sign in to comment.