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

Feat: add gift list page #33

Merged
merged 4 commits into from
Jan 5, 2024
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Feat: details page for unclaimed gifts
  • Loading branch information
sokolova-an committed Jan 4, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 489c5ea7da9d661b2ff09a1864964a1b36d53d7e
2 changes: 2 additions & 0 deletions src/common/routing/paths.ts
Original file line number Diff line number Diff line change
@@ -7,7 +7,9 @@ export const Paths = {
ONBOARDING_IMPORT_WALLET: '/onboarding/import-wallet',

DASHBOARD: '/dashboard',

GIFTS: '/gifts',
GIFT_DETAILS: '/gifts/gift-details',

TRANSFER: '/transfer',
TRANSFER_SELECT_TOKEN: '/transfer/select-token',
42 changes: 42 additions & 0 deletions src/pages/gifts/gift-details.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
'use client';
import { useEffect, useState } from 'react';
import { useRouter } from 'next/router';
import { WebApp } from '@twa-dev/types';

import { useTelegram } from '@common/providers/telegramProvider';
import { Paths } from '@/common/routing';
import { createTgLink } from '@/common/telegram';
import GiftDetails from '@/screens/gifts/GiftDetails';
import { TgLink } from '@/common/telegram/types';
import Image from 'next/image';

export default function GiftPage() {
const router = useRouter();
const { BackButton, MainButton, webApp } = useTelegram();
const [link, setLink] = useState<TgLink | null>(null);
const searchParams = router.query;

useEffect(() => {
BackButton?.show();
MainButton?.hide();

const callback = async () => {
router.push(Paths.GIFTS);
};
BackButton?.onClick(callback);
setLink(createTgLink(searchParams.seed as string, searchParams.symbol as string));

return () => {
BackButton?.hide();
BackButton?.offClick(callback);
};
}, []);

// TODO change image
return (
<div className="min-h-screen p-4 flex flex-col items-center gap-3">
<Image src="/images/gift.svg" alt="gift" width={300} height={300} className="mb-3" />
<GiftDetails link={link} webApp={webApp as WebApp} />
</div>
);
}
53 changes: 27 additions & 26 deletions src/pages/gifts/index.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
'use client';
import { ReactElement, useEffect, useState } from 'react';
import { useRouter } from 'next/router';
import Link from 'next/link';

import { useTelegram } from '@common/providers/telegramProvider';
import { Paths } from '@/common/routing';
import { BodyText, GiftPlate, Layout, TitleText } from '@/components';
import { BodyText, GiftPlate, Layout, Shimmering, TitleText } from '@/components';
import { useBalances } from '@/common/balances/BalanceProvider';
import { getGifts } from '@/common/utils/gift';
import { Gift } from '@/common/types';

// TODO add loading state for unclaimed and claimed
// TODO improve loading state for unclaimed and claimed
export default function GiftPage() {
const router = useRouter();
const { BackButton, MainButton } = useTelegram();
const { getGiftsBalance } = useBalances();
const [unclaimedGifts, setUnclaimedGifts] = useState<Gift[]>([]);
const [claimedGifts, setClaimedGifts] = useState<Gift[]>([]);
const [loading, setLoading] = useState(true);

useEffect(() => {
BackButton?.show();
@@ -29,13 +31,14 @@ export default function GiftPage() {
const mapGifts = getGifts();
if (!mapGifts) return;

for (const [key, value] of mapGifts) {
mapGifts.forEach((value, key) => {
(async function () {
const [unclaimed, claimed] = await getGiftsBalance(value, key);
setUnclaimedGifts((prev) => [...prev, ...unclaimed]);
setClaimedGifts((prev) => [...prev, ...claimed]);
setLoading(false);
})();
}
});

return () => {
BackButton?.hide();
@@ -44,31 +47,29 @@ export default function GiftPage() {
}, []);

return (
<div className="min-h-screen p-4">
<>
<TitleText className="mb-4" align="left">
Gifts
</TitleText>
{!!unclaimedGifts.length && (
<>
<BodyText className="text-text-hint mb-2" align="left">
Unclaimed
</BodyText>
{unclaimedGifts.map((gift) => (
<GiftPlate gift={gift} key={gift.timestamp} />
))}
</>
)}
{!!claimedGifts.length && (
<>
<BodyText className="text-text-hint mb-2" align="left">
Claimed
</BodyText>
{claimedGifts.map((gift) => (
<GiftPlate gift={gift} key={gift.timestamp} />
))}
</>
)}
</div>
<BodyText className="text-text-hint mb-2" align="left">
Unclaimed
</BodyText>
{loading && <Shimmering width={200} height={20} />}
{!!unclaimedGifts.length &&
unclaimedGifts.map((gift) => (
<Link
href={{ pathname: Paths.GIFT_DETAILS, query: { seed: gift.secret, symbol: gift.chainAsset?.symbol } }}
key={gift.timestamp}
>
<GiftPlate gift={gift} />
</Link>
))}
<BodyText className="text-text-hint mb-2" align="left">
Claimed
</BodyText>
{loading && <Shimmering width={200} height={20} />}
{!!claimedGifts.length && claimedGifts.map((gift) => <GiftPlate gift={gift} key={gift.timestamp} />)}
</>
);
}

19 changes: 4 additions & 15 deletions src/pages/transfer/create-gift.tsx
Original file line number Diff line number Diff line change
@@ -2,18 +2,18 @@
import { ReactElement, useEffect, useState } from 'react';
import { useRouter } from 'next/router';
import { Player } from '@lottiefiles/react-lottie-player';
import { Button } from '@nextui-org/react';
import { WebApp } from '@twa-dev/types';

import { useTelegram } from '@common/providers/telegramProvider';
import { useGlobalContext } from '@/common/providers/contextProvider';
import { Paths } from '@/common/routing';
import { BodyText, HeadlineText, Layout } from '@/components';
import { HeadlineText, Layout } from '@/components';
import GiftDetails from '@/screens/gifts/GiftDetails';
import { useExtrinsicProvider } from '@/common/extrinsicService/ExtrinsicProvider';
import { handleSend } from '@/common/utils/balance';
import { ChainId, TrasferAsset } from '@/common/types';
import { createGiftWallet } from '@/common/wallet';
import { createTgLink, navigateTranferById } from '@/common/telegram';
import { createTgLink } from '@/common/telegram';
import { TgLink } from '@/common/telegram/types';
import { backupGifts } from '@/common/utils/gift';

@@ -61,18 +61,7 @@ export default function CreateGiftPage() {
Creating your gift..
</HeadlineText>
) : (
<>
<Button fullWidth={false} color="primary" onClick={() => navigator.clipboard.writeText(link.url)}>
Copy link
</Button>
<BodyText className="text-text-hint" align="center">
Now you can send this link anyone who you needed to claim funds. When they will open it, the gift will
marked as claimed
</BodyText>
<Button color="primary" onClick={() => navigateTranferById(webApp as WebApp, link)}>
Share with your contact
</Button>
</>
<GiftDetails link={link} webApp={webApp as WebApp} />
)}
</div>
);
2 changes: 1 addition & 1 deletion src/screens/dashboard/main/DashboardMain.tsx
Original file line number Diff line number Diff line change
@@ -88,7 +88,7 @@ export const DashboardMain = () => {
}

return (
<div className="min-h-screen flex flex-col p-4 break-all">
<div className="flex flex-col break-all">
<div className="grid grid-cols-[auto,1fr,auto] gap-2 mb-6">
<Avatar src={user?.photo_url} className="w-10 h-10" name={user?.first_name[0]} />
<CaptionText className="self-center">Hello, {user?.first_name || 'friend'}</CaptionText>
30 changes: 30 additions & 0 deletions src/screens/gifts/GiftDetails.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { Button, Snippet } from '@nextui-org/react';
import { WebApp } from '@twa-dev/types';

import { BodyText } from '@/components';
import { navigateTranferById } from '@/common/telegram';
import { TgLink } from '@/common/telegram/types';

type GiftDetailsProps = {
link: TgLink | null;
webApp: WebApp;
};

export default function GiftDetails({ link, webApp }: GiftDetailsProps) {
if (!link) return;

return (
<>
<Snippet color="primary" hideSymbol size="sm" classNames={{ pre: ['text-wrap w-[300px] overflow-auto'] }}>
{link.url}
</Snippet>
<BodyText className="text-text-hint" align="center">
Now you can send this link anyone who you needed to claim funds. When they will open it, the gift will marked as
claimed
</BodyText>
<Button color="primary" onClick={() => navigateTranferById(webApp, link)}>
Share with your contact
</Button>
</>
);
}