From e2ac38a7b4faef3e262b81074c090e86ff295600 Mon Sep 17 00:00:00 2001
From: 0xmegalodon
Date: Wed, 31 Jan 2024 07:14:10 +0700
Subject: [PATCH 11/50] add tooltip & login
---
src/modules/PublicSale/BuyForm/index.tsx | 5 ++++-
src/modules/PublicSale/leaderBoardVisual/index.tsx | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/modules/PublicSale/BuyForm/index.tsx b/src/modules/PublicSale/BuyForm/index.tsx
index 352557ad5..f76487d04 100644
--- a/src/modules/PublicSale/BuyForm/index.tsx
+++ b/src/modules/PublicSale/BuyForm/index.tsx
@@ -24,6 +24,8 @@ import { PUBLIC_SALE_END } from '@/modules/Whitelist';
import NumberScale from '@/components/NumberScale';
import { GuestCodeHere } from '../depositModal/deposit.guest.code';
import LoginTooltip from '@/modules/PublicSale/depositModal/login.tooltip';
+import { useAppSelector } from '@/stores/hooks';
+import { commonSelector } from '@/stores/states/common/selector';
interface FormValues {
tokenAmount: string;
@@ -83,6 +85,7 @@ const PrivateSaleForm = ({ vcInfo }: { vcInfo?: VCInfo }) => {
}, []);
const timeIntervalSummary = useRef(undefined);
+ const { needReload } = useAppSelector(commonSelector);
useEffect(() => {
getContributeInfo();
@@ -97,7 +100,7 @@ const PrivateSaleForm = ({ vcInfo }: { vcInfo?: VCInfo }) => {
return () => {
clearInterval(timeIntervalSummary.current);
};
- }, [token]);
+ }, [token, needReload]);
const getContributeInfo = async () => {
const res = await getPublicSaleSummary();
diff --git a/src/modules/PublicSale/leaderBoardVisual/index.tsx b/src/modules/PublicSale/leaderBoardVisual/index.tsx
index 23caa2e2e..52c8d41fa 100644
--- a/src/modules/PublicSale/leaderBoardVisual/index.tsx
+++ b/src/modules/PublicSale/leaderBoardVisual/index.tsx
@@ -13,7 +13,7 @@ import AvatarItem from '@/modules/PublicSale/leaderBoardVisual/AvatarItem';
import AnimatedText from '@/modules/PublicSale/leaderBoardVisual/FloatTexts';
import { useSelector } from 'react-redux';
import { LEADER_BOARD_MODE } from '@/modules/PublicSale/leaderBoardSwitch';
-import { setAnimatedLatestContributors, setNeedCheckDeposit } from '@/stores/states/common/reducer';
+import { requestReload, setAnimatedLatestContributors, setNeedCheckDeposit } from '@/stores/states/common/reducer';
import AuthenStorage from '@/utils/storage/authen.storage';
import useWindowSize from '@/hooks/useWindowSize';
@@ -141,6 +141,7 @@ const LeaderBoardVisual = (props: IProps) => {
if (newRes?.length > 0) {
latestContributors.current = [...newRes].concat(latestContributors.current);
+ dispatch(requestReload());
}
animatedLatestContributors.current = newRes || [];
dispatch(setAnimatedLatestContributors(newRes || []));
From 2b2af582db7f352f1f5b7a8ee659e0860fe7e12c Mon Sep 17 00:00:00 2001
From: camewell <130561684+camewell071@users.noreply.github.com>
Date: Wed, 31 Jan 2024 09:44:38 +0700
Subject: [PATCH 12/50] chore: update ui
---
package.json | 1 +
.../activities/components/NakaCountDown.tsx | 6 ++---
.../components/TradeNakaWinnersPopup.tsx | 25 ++++++++++++-------
src/modules/PublicSale/activities/index.tsx | 7 +++---
yarn.lock | 12 +++++++++
5 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/package.json b/package.json
index 327afd114..f1b98166a 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
"react-final-form": "^6.5.9",
"react-google-recaptcha-v3": "^1.10.1",
"react-hot-toast": "^2.4.1",
+ "react-jazzicon": "^1.0.4",
"react-modal-video": "^2.0.1",
"react-player": "^2.14.1",
"react-qr-code": "^2.0.12",
diff --git a/src/modules/PublicSale/activities/components/NakaCountDown.tsx b/src/modules/PublicSale/activities/components/NakaCountDown.tsx
index cf94c9b79..148102757 100644
--- a/src/modules/PublicSale/activities/components/NakaCountDown.tsx
+++ b/src/modules/PublicSale/activities/components/NakaCountDown.tsx
@@ -28,13 +28,13 @@ const NakaCountDown = React.memo(() => {
{!!bestPNL?.winner ? (
- Top PNL
+ Top 1 PNL
{
if (!bestPNL?.winner?.twitter_username) return;
window.open(`https://twitter.com/${bestPNL?.winner?.twitter_username}`, '_blank');
}}>
- {formatString(bestPNL?.winner?.twitter_name || bestPNL?.winner?.address , 6)} +{formatCurrency(bestPNL?.winner?.realized_pnl || '0', 0, 5, 'TC', false)} BTC
+ {formatString(bestPNL?.winner?.twitter_name || bestPNL?.winner?.address , 6)} +{formatCurrency(bestPNL?.winner?.realized_pnl || '0', 0, 5)} BTC
) : (
@@ -49,7 +49,7 @@ const NakaCountDown = React.memo(() => {
)}
- Rewards
+ Reward
${bestPNL.reward}
diff --git a/src/modules/PublicSale/activities/components/TradeNakaWinnersPopup.tsx b/src/modules/PublicSale/activities/components/TradeNakaWinnersPopup.tsx
index 0e0521084..7cddc0aee 100644
--- a/src/modules/PublicSale/activities/components/TradeNakaWinnersPopup.tsx
+++ b/src/modules/PublicSale/activities/components/TradeNakaWinnersPopup.tsx
@@ -15,6 +15,7 @@ import { useAppSelector } from '@/stores/hooks';
import { coinPricesSelector } from '@/stores/states/common/selector';
import { Coin } from '@/stores/states/common/types';
import BigNumber from 'bignumber.js';
+import Jazzicon, { jsNumberForAddress } from 'react-jazzicon';
interface IProps extends IBaseModalProps {
}
@@ -47,6 +48,7 @@ const TradeNakaWinnersPopup = ({ isShow, onHide }: IProps) => {
config,
label: USER,
render(row: TopWinner) {
+ const name = row?.twitter_name || row?.twitter_username;
return (
{
}}
maxW="170px"
>
-
+ {!!name ? (
+
+ ) : (
+
+ )}
+
{row?.twitter_username ? formatName(row?.twitter_username || '-', 17) : (row?.address || '').slice(0, 8)}
);
diff --git a/src/modules/PublicSale/activities/index.tsx b/src/modules/PublicSale/activities/index.tsx
index f98a7771d..c0b052b00 100644
--- a/src/modules/PublicSale/activities/index.tsx
+++ b/src/modules/PublicSale/activities/index.tsx
@@ -69,15 +69,16 @@ Good luck and have fun!
link: 'https://nakachain.xyz/app',
},
{
- title: 'View winners',
+ title: 'Winners',
type: 'action',
onPress: () => {
onOpenNakaWinners()
}
},
],
- desc: 'Experience on-chain BRC-20 perpetual trading with Naka Chain - the Bitcoin L2 for BRC-20 DeFi powered by BVM' +
- ' For the first time, you can go long and short on BRC-20 tokens on a decentralized platform',
+ desc: 'NakaChain is a low-cost and lightning-fast Bitcoin Layer 2 blockchain designed for DeFi apps, enabling the payment of gas fees in Bitcoin. It’s powered by BVM with these modules: Bitcoin for security, Polygon for data availability, and Optimism for execution.' +
+ '
On the second day of awesomeness, challenge yourself to dominate the market by trading futures on BRC-20 tokens\' prices. The top gainer will be rewarded every hour.' +
+ '
On the first day of BVM’s launch, you’ll play incredibly fun games. These are the first fully on-chain on Bitcoin. Both the game logic and game states are stored on-chain.
@@ -62,6 +74,7 @@ Good luck and have fun!
tag: 'Day 2',
title: 'BRC-20 Perpetual Futures on Bitcoin',
src: 'public-sale/playGame.png',
+ type: ActivityType.Day2,
ctas: [
{
title: 'Trade on Naka',
@@ -85,6 +98,7 @@ Good luck and have fun!
tag: 'Day 3',
title: 'Modular on Bitcoin',
src: 'public-sale/playGame.png',
+ type: ActivityType.Day3,
ctas: [
{
title: 'Play with modular blocks',
@@ -99,6 +113,7 @@ Good luck and have fun!
tag: 'Day 4',
title: 'Fully on-chain poker on Bitcoin',
src: 'public-sale/playGame.png',
+ type: ActivityType.Day4,
ctas: [
{
title: 'Play games on Arcade',
@@ -111,6 +126,7 @@ Good luck and have fun!
{
key: 4,
tag: 'Day 5',
+ type: ActivityType.Day5,
title: 'Running Bitcoin',
src: 'public-sale/playGame.png',
ctas: [
@@ -125,6 +141,7 @@ Good luck and have fun!
{
key: 5,
tag: 'Day 6',
+ type: ActivityType.Day6,
title: 'Running Bitcoin',
src: 'public-sale/playGame.png',
ctas: [
@@ -139,6 +156,7 @@ Good luck and have fun!
{
key: 6,
tag: 'Day 7',
+ type: ActivityType.Day7,
title: 'AI x Bitcoin',
src: 'public-sale/playGame.png',
desc: 'Details of Day 7 will be provided as soon as Day 6 is completed.',
@@ -218,8 +236,8 @@ Good luck and have fun!
}
};
- const renderItem = (item: GameItemProps, index: number) => {
- const isDisable = index > currentDay.diffDay;
+ const renderItem = (item: GameItemProps) => {
+ const isDisable = item.key > currentDay.diffDay;
const title = isDisable ? item.title : item.title;
return (
@@ -263,7 +281,7 @@ Good luck and have fun!
className={styles.itemWrapper_desc}
dangerouslySetInnerHTML={{ __html: item.desc }}
/>
- {currentDay.diffDay === expandIndex && expandIndex === index && index === 1 && (
+ {currentDay.diffDay === expandIndex && expandIndex === item.key && item.key === 1 && (
)}
From e15bb416d50dbd7731ab6f59074a636f923c9259 Mon Sep 17 00:00:00 2001
From: 0xmegalodon
Date: Wed, 31 Jan 2024 11:24:40 +0700
Subject: [PATCH 26/50] add tooltip & login
---
src/modules/PublicSale/activities/index.tsx | 1 +
src/modules/PublicSale/activities/styles.module.scss | 9 +++++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/modules/PublicSale/activities/index.tsx b/src/modules/PublicSale/activities/index.tsx
index c0b052b00..34950f376 100644
--- a/src/modules/PublicSale/activities/index.tsx
+++ b/src/modules/PublicSale/activities/index.tsx
@@ -228,6 +228,7 @@ Good luck and have fun!
justifyContent={'space-between'}
className={cs(styles.itemWrapper_header, {
[styles.itemWrapper_header__active]: isExpanded,
+ [styles.itemWrapper_header__disable]: isDisable,
})}
>
Date: Wed, 31 Jan 2024 11:28:14 +0700
Subject: [PATCH 27/50] uopdate
---
src/modules/PublicSale/raffleButton/index.tsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/modules/PublicSale/raffleButton/index.tsx b/src/modules/PublicSale/raffleButton/index.tsx
index ebd28b289..0a1fdcf24 100644
--- a/src/modules/PublicSale/raffleButton/index.tsx
+++ b/src/modules/PublicSale/raffleButton/index.tsx
@@ -43,7 +43,7 @@ const RaffleButton = ({ className }: any) => {
AuthenStorage.getAuthenKey() || AuthenStorage.getGuestAuthenKey();
const handleShareTw = () => {
- const url = `https://twitter.com/BVMnetwork/status/1752174033100226567`;
+ const url = `https://twitter.com/BVMnetwork/status/1752546771560239400`;
window.open(url, '_blank');
joinRafflePrograme(programeInfo?.id as number);
@@ -256,7 +256,7 @@ const RaffleButton = ({ className }: any) => {
From eabe3b6887dc3c2829e0a7bf1be557a7ff691fe9 Mon Sep 17 00:00:00 2001
From: camewell <130561684+camewell071@users.noreply.github.com>
Date: Wed, 31 Jan 2024 11:43:22 +0700
Subject: [PATCH 28/50] chore: update copy
---
src/modules/PublicSale/activities/index.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/PublicSale/activities/index.tsx b/src/modules/PublicSale/activities/index.tsx
index 18d0f9634..be87a1b1e 100644
--- a/src/modules/PublicSale/activities/index.tsx
+++ b/src/modules/PublicSale/activities/index.tsx
@@ -90,7 +90,7 @@ Good luck and have fun!
},
],
desc: 'NakaChain is a low-cost and lightning-fast Bitcoin Layer 2 blockchain designed for DeFi apps, enabling the payment of gas fees in Bitcoin. It’s powered by BVM with these modules: Bitcoin for security, Polygon for data availability, and Optimism for execution.' +
- '
On the second day of awesomeness, challenge yourself to dominate the market by trading futures on BRC-20 tokens\' prices. The top gainer will be rewarded every 2 hours.' +
+ '
On the second day of awesomeness, challenge yourself to dominate the market by trading futures on BRC-20 tokens\' prices. Every two hours, the top gainer will earn $250 in Bitcoin.\n' +
'
Total rewards: $3,000',
},
{
From 29487c77e47bb53c1522839db4eb5122b3af496e Mon Sep 17 00:00:00 2001
From: camewell <130561684+camewell071@users.noreply.github.com>
Date: Wed, 31 Jan 2024 11:52:12 +0700
Subject: [PATCH 29/50] chore: update code
---
src/modules/PublicSale/activities/index.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/PublicSale/activities/index.tsx b/src/modules/PublicSale/activities/index.tsx
index be87a1b1e..66f19c732 100644
--- a/src/modules/PublicSale/activities/index.tsx
+++ b/src/modules/PublicSale/activities/index.tsx
@@ -172,7 +172,7 @@ Good luck and have fun!
.toNumber();
// Case naka start at 4h UTC
- if (diffDay === 1 && dayjs.utc().hour() < 4) {
+ if (diffDay === ActivityType.Day2 && dayjs.utc().hour() < 4) {
diffDay = 0;
}
From d7ab63b8bab64e4703e4f01a09f84676dda3637f Mon Sep 17 00:00:00 2001
From: camewell <130561684+camewell071@users.noreply.github.com>
Date: Wed, 31 Jan 2024 11:52:31 +0700
Subject: [PATCH 30/50] chore: update text
---
src/modules/Whitelist/leaderBoard/index.tsx | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/modules/Whitelist/leaderBoard/index.tsx b/src/modules/Whitelist/leaderBoard/index.tsx
index 622f24545..bbc1e6842 100644
--- a/src/modules/Whitelist/leaderBoard/index.tsx
+++ b/src/modules/Whitelist/leaderBoard/index.tsx
@@ -930,7 +930,6 @@ const LeaderBoard = (props: IProps) => {
{/* {*/}
- {/* console.log('SANG TEST: ');*/}
{/* refParams.current = {*/}
{/* ...refParams.current,*/}
{/* page: refParams.current.page + 1,*/}
From edd0e72837048ff578179aeb41e8d86fe72210e1 Mon Sep 17 00:00:00 2001
From: 0xmegalodon
Date: Wed, 31 Jan 2024 12:03:48 +0700
Subject: [PATCH 31/50] add tooltip & login
---
.../PublicSale/leaderBoardVisual/index.tsx | 2 +-
src/modules/PublicSale/raffleButton/index.tsx | 29 ++++++++++++-------
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/modules/PublicSale/leaderBoardVisual/index.tsx b/src/modules/PublicSale/leaderBoardVisual/index.tsx
index 50ba1d250..f39f7c836 100644
--- a/src/modules/PublicSale/leaderBoardVisual/index.tsx
+++ b/src/modules/PublicSale/leaderBoardVisual/index.tsx
@@ -198,7 +198,7 @@ const LeaderBoardVisual = (props: IProps) => {
listRender.map((item, index) => {
return <>
+ isYou={user?.twitter_id === item?.twitter_id} key={item?.twitter_id || item?.twitter_username}/>
{
item?.lastRender &&
diff --git a/src/modules/PublicSale/raffleButton/index.tsx b/src/modules/PublicSale/raffleButton/index.tsx
index 597830b47..b8d65b2ba 100644
--- a/src/modules/PublicSale/raffleButton/index.tsx
+++ b/src/modules/PublicSale/raffleButton/index.tsx
@@ -1,6 +1,4 @@
import {
- Box,
- Button,
Center,
Flex,
Popover,
@@ -19,7 +17,6 @@ import React, { useEffect, useState } from 'react';
import cx from 'clsx';
import { useAppSelector } from '@/stores/hooks';
import { userSelector } from '@/stores/states/user/selector';
-import { getLink } from '@/utils/helpers';
import {
getPublicSaleProgram,
getPublicSaleSummary,
@@ -28,9 +25,9 @@ import {
joinRafflePrograme,
} from '@/services/public-sale';
import AuthenStorage from '@/utils/storage/authen.storage';
-import DepositClaimItHere from '@/modules/PublicSale/depositModal/deposit.claim.it.here';
import { formatCurrency } from '@/utils/format';
-import { isMobile } from 'react-device-detect';
+import BigNumber from 'bignumber.js';
+import { PUBLIC_SALE_START } from '@/modules/Whitelist';
const RaffleButton = ({ className }: any) => {
const { isOpen, onOpen, onClose } = useDisclosure();
@@ -102,6 +99,18 @@ const RaffleButton = ({ className }: any) => {
);
};
+ const currentDay = React.useMemo(() => {
+ const diffDay = new BigNumber(
+ dayjs.utc(PUBLIC_SALE_START).diff(dayjs.utc(), 'days'),
+ )
+ .absoluteValue()
+ .toNumber();
+ return {
+ // step: DAYS.length > diffDay ? DAYS[diffDay] : DAYS[DAYS.length - 1],
+ diffDay,
+ };
+ }, []);
+
return (
!isLoading && (
@@ -116,7 +125,7 @@ const RaffleButton = ({ className }: any) => {
lineHeight={'12px'}
fontWeight={400}
>
- Daily Raffle
+ Day {currentDay?.diffDay + 1} Raffle
{
onClick={handleShareTw}
cursor="pointer"
>
-
- Like and repost to join
+
+ Enter the raffle
@@ -213,7 +199,6 @@ const RaffleButton = ({ className }: any) => {
-
Enter the raffle
@@ -251,37 +236,24 @@ const RaffleButton = ({ className }: any) => {
- Enter the raffle
-
@@ -289,37 +261,24 @@ const RaffleButton = ({ className }: any) => {
<>
- Enter the raffle
-
)}
diff --git a/src/modules/PublicSale/raffleButton/styles.module.scss b/src/modules/PublicSale/raffleButton/styles.module.scss
index 732065874..84dd0f8af 100644
--- a/src/modules/PublicSale/raffleButton/styles.module.scss
+++ b/src/modules/PublicSale/raffleButton/styles.module.scss
@@ -148,7 +148,7 @@
.learnMoreWrapper {
background: #ffffff;
- padding: 4px;
+ padding: 4px 12px 4px 4px;
color: #000000;
font-size: 14px;
align-items: center;
From 4e24a8e1288c180d2888981ce911a4d5f3ab0102 Mon Sep 17 00:00:00 2001
From: camewell <130561684+camewell071@users.noreply.github.com>
Date: Wed, 31 Jan 2024 15:02:06 +0700
Subject: [PATCH 35/50] chore: update ui
---
src/modules/PublicSale/activities/index.tsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/modules/PublicSale/activities/index.tsx b/src/modules/PublicSale/activities/index.tsx
index 66f19c732..c494e6c4f 100644
--- a/src/modules/PublicSale/activities/index.tsx
+++ b/src/modules/PublicSale/activities/index.tsx
@@ -90,8 +90,8 @@ Good luck and have fun!
},
],
desc: 'NakaChain is a low-cost and lightning-fast Bitcoin Layer 2 blockchain designed for DeFi apps, enabling the payment of gas fees in Bitcoin. It’s powered by BVM with these modules: Bitcoin for security, Polygon for data availability, and Optimism for execution.' +
- '
On the second day of awesomeness, challenge yourself to dominate the market by trading futures on BRC-20 tokens\' prices. Every two hours, the top gainer will earn $250 in Bitcoin.\n' +
- '
Total rewards: $3,000',
+ '
On the second day of awesomeness, challenge yourself to dominate the market by trading futures on BRC-20 tokens\' prices. Every two hours, the top gainer will earn $50 in Bitcoin.\n' +
+ '
Total rewards: $1,100',
},
{
key: 2,
From e10e4fe3cd4e2dee8c05fa7263f7df63f3ff3e6d Mon Sep 17 00:00:00 2001
From: camewell <130561684+camewell071@users.noreply.github.com>
Date: Wed, 31 Jan 2024 15:22:56 +0700
Subject: [PATCH 36/50] chore: update ui
---
src/modules/PublicSale/activities/index.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/PublicSale/activities/index.tsx b/src/modules/PublicSale/activities/index.tsx
index c494e6c4f..e0bf3969b 100644
--- a/src/modules/PublicSale/activities/index.tsx
+++ b/src/modules/PublicSale/activities/index.tsx
@@ -91,7 +91,7 @@ Good luck and have fun!
],
desc: 'NakaChain is a low-cost and lightning-fast Bitcoin Layer 2 blockchain designed for DeFi apps, enabling the payment of gas fees in Bitcoin. It’s powered by BVM with these modules: Bitcoin for security, Polygon for data availability, and Optimism for execution.' +
'
On the second day of awesomeness, challenge yourself to dominate the market by trading futures on BRC-20 tokens\' prices. Every two hours, the top gainer will earn $50 in Bitcoin.\n' +
- '