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.

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

Feature/no identity flow #74

Merged
merged 9 commits into from
Mar 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/components/masa-interface/masa-interface.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const MasaInterface = ({
)
return 'createSoulname';

if (!identity?.identityId && scope?.includes('identity'))
if (isLoggedIn && !identity?.identityId && scope?.includes('identity'))
return 'createIdentity';

if (identity && !creditScores?.length && scope?.includes('credit-score'))
Expand All @@ -86,6 +86,7 @@ export const MasaInterface = ({
open={isModalOpen as boolean}
close={(): void => closeModal?.()}
setOpen={setModalOpen as (val: boolean) => void}
height={page === 'createIdentity' ? 340 : undefined}
>
{page === 'connector' ? pages[page]({ disableMetamask }) : pages[page]}
</ModalComponent>
Expand Down
5 changes: 4 additions & 1 deletion src/components/masa-interface/pages/connector/connector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ export const InterfaceConnector = ({
<h3 className="title">Select a wallet</h3>
<p>
By connecting your wallet, you agree to our{' '}
<a href="/terms-and-conditions">Terms of Service</a> and{' '}
<a href="https://app.masa.finance/terms-and-conditions">
Terms of Service
</a>{' '}
and{' '}
<a
href="https://www.masa.finance/privacy-policy"
target="_blank"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useMasa } from '../../../../provider';
import { MasaLoading } from '../../../masa-loading';

export const InterfaceCreateIdentity = (): JSX.Element => {
const { handlePurchaseIdentity, handleLogout, isLoading } = useMasa();
const { handlePurchaseIdentity, isLoading } = useMasa();

const createIdentity = useCallback(async () => {
await handlePurchaseIdentity?.();
Expand All @@ -13,22 +13,14 @@ export const InterfaceCreateIdentity = (): JSX.Element => {

return (
<div className="interface-create-identity">
<div>
<h3>It looks like you don't have an identity</h3>
<p>Create your identity to enable all its benefits</p>
</div>

<div>
<button className="masa-button" onClick={createIdentity}>
Create your identity!
</button>
<div
className="dont-have-a-wallet"
onClick={(): void => handleLogout?.()}
>
<p>I don't want to create an identity</p>
</div>
</div>
<h3 className="title">Hurray! 🎉</h3>
<p className="subtitle">
Congratulations you already have a Celo Domain Name in your wallet. You
must now mint a Celo Prosperity Passport.
</p>
<button className="masa-button" onClick={createIdentity}>
Get Prosperity Passport
</button>
</div>
);
};
4 changes: 3 additions & 1 deletion src/components/modal/modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,19 @@ export interface ModalProps {
open: boolean;
setOpen: (val: boolean) => void;
close: () => void;
height?: number;
}

export const ModalComponent = ({
children,
open,
close,
height,
}: ModalProps): JSX.Element => {
return (
<Rodal
data-cy="closeMasaModal"
height={615}
height={height ? height : 615}
width={550}
visible={open}
onClose={(): void => close()}
Expand Down
26 changes: 26 additions & 0 deletions src/components/modal/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,32 @@
}
}

.interface-create-identity {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 16px;

h3 {
font-size: 30px;
margin-bottom: 0;
}

p {
font-size: 18px;
text-align: center;
line-height: 24px;
color: rgba(0, 0, 0, 0.6);
}

button {
width: fit-content;
padding-left: 2rem;
padding-right: 2rem;
}
}

.interface-authenticate,
.interface-connected {
.title {
Expand Down
3 changes: 1 addition & 2 deletions src/provider/masa-context-provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ export const MasaContextProvider = ({
// soul names
const { soulnames, isSoulnamesLoading, reloadSoulnames } = useSoulnames(
masaInstance,
walletAddress,
identity
walletAddress
);

// credit scores
Expand Down
9 changes: 2 additions & 7 deletions src/provider/modules/soulnames/soulnames.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
import { useQuery } from 'react-query';
import { Masa, PaymentMethod, SoulNameDetails } from '@masa-finance/masa-sdk';
import { BigNumber } from 'ethers';
import { useCallback, useMemo } from 'react';
import { queryClient } from '../../masa-query-client';

export const useSoulnames = (
masa?: Masa,
walletAddress?: string,
identity?: {
identityId?: BigNumber | undefined;
address?: string | undefined;
}
walletAddress?: string
): {
soulnames: SoulNameDetails[] | undefined;
status: string;
Expand Down Expand Up @@ -38,7 +33,7 @@ export const useSoulnames = (
queryKey,
() => masa?.soulName.list(),
{
enabled: !!masa && !!walletAddress && !!identity?.identityId,
enabled: !!masa && !!walletAddress,
retry: false,
onSuccess: (soulNames?: SoulNameDetails[]) => {
if (masa?.config.verbose) {
Expand Down
2 changes: 1 addition & 1 deletion stories/masa.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const Component = (): JSX.Element => {

const handleConnect = useCallback(() => {
connect?.({
scope: ['auth', 'soulname'],
scope: ['auth', 'soulname', 'identity'],
callback: function () {
alert('hello hello connected');
},
Expand Down