diff --git a/campaign-launcher/client/index.html b/campaign-launcher/client/index.html index 17ba58ca8..78cc137ca 100644 --- a/campaign-launcher/client/index.html +++ b/campaign-launcher/client/index.html @@ -15,14 +15,6 @@ - - HuFi diff --git a/campaign-launcher/client/package.json b/campaign-launcher/client/package.json index e13f68cae..9e0de6795 100644 --- a/campaign-launcher/client/package.json +++ b/campaign-launcher/client/package.json @@ -26,7 +26,6 @@ "@mui/x-data-grid": "^8.21.0", "@mui/x-date-pickers": "^8.21.0", "@tanstack/react-query": "^5.90.21", - "@walletconnect/ethereum-provider": "^2.23.5", "axios": "^1.13.2", "chart.js": "^4.5.1", "chartjs-plugin-annotation": "^3.1.0", diff --git a/campaign-launcher/client/public/tableImage.png b/campaign-launcher/client/public/tableImage.png deleted file mode 100644 index 82b7d8c5e..000000000 Binary files a/campaign-launcher/client/public/tableImage.png and /dev/null differ diff --git a/campaign-launcher/client/src/App.tsx b/campaign-launcher/client/src/App.tsx index 664df396c..4f18b930c 100644 --- a/campaign-launcher/client/src/App.tsx +++ b/campaign-launcher/client/src/App.tsx @@ -23,6 +23,8 @@ import ThemeProvider from '@/providers/ThemeProvider'; import WagmiProvider from '@/providers/WagmiProvider'; import { Web3AuthProvider } from '@/providers/Web3AuthProvider'; +import './index.css'; + const App: FC = () => { return ( diff --git a/campaign-launcher/client/src/assets/fonts/Inter.woff2 b/campaign-launcher/client/src/assets/fonts/Inter.woff2 new file mode 100644 index 000000000..91dc3e852 Binary files /dev/null and b/campaign-launcher/client/src/assets/fonts/Inter.woff2 differ diff --git a/campaign-launcher/client/src/assets/metamask.svg b/campaign-launcher/client/src/assets/metamask.svg deleted file mode 100644 index f893c1592..000000000 --- a/campaign-launcher/client/src/assets/metamask.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/campaign-launcher/client/src/components/CampaignInfo/index.tsx b/campaign-launcher/client/src/components/CampaignInfo/index.tsx index 62c4401c4..9e98cf535 100644 --- a/campaign-launcher/client/src/components/CampaignInfo/index.tsx +++ b/campaign-launcher/client/src/components/CampaignInfo/index.tsx @@ -1,4 +1,4 @@ -import { useState, type FC } from 'react'; +import { lazy, Suspense, useState, type FC } from 'react'; import { Box, Button, Skeleton, Stack, Typography } from '@mui/material'; @@ -7,13 +7,14 @@ import CampaignStatusLabel from '@/components/CampaignStatusLabel'; import CampaignTypeLabel from '@/components/CampaignTypeLabel'; import CustomTooltip from '@/components/CustomTooltip'; import JoinCampaign from '@/components/JoinCampaign'; -import ChartModal from '@/components/modals/ChartModal'; import { useIsMobile } from '@/hooks/useBreakpoints'; import { CalendarIcon } from '@/icons'; import type { CampaignDetails, CampaignJoinStatus } from '@/types'; import { getChainIcon, getNetworkName } from '@/utils'; import dayjs from '@/utils/dayjs'; +const ChartModal = lazy(() => import('@/components/modals/ChartModal')); + const formatDate = (dateString: string): string => { return dayjs(dateString).format('D MMM YYYY'); }; @@ -136,11 +137,13 @@ const CampaignInfo: FC = ({ > Paid Amount Chart - setIsChartModalOpen(false)} - campaign={campaign} - /> + + setIsChartModalOpen(false)} + campaign={campaign} + /> + )} diff --git a/campaign-launcher/client/src/components/CampaignStats/index.tsx b/campaign-launcher/client/src/components/CampaignStats/index.tsx index 4b63b5f05..43cdf553d 100644 --- a/campaign-launcher/client/src/components/CampaignStats/index.tsx +++ b/campaign-launcher/client/src/components/CampaignStats/index.tsx @@ -1,4 +1,11 @@ -import { type FC, type PropsWithChildren, Children, useState } from 'react'; +import { + type FC, + type PropsWithChildren, + Children, + lazy, + Suspense, + useState, +} from 'react'; import { Box, Button, Skeleton, styled, Typography, Grid } from '@mui/material'; @@ -21,7 +28,7 @@ import { getTokenInfo, } from '@/utils'; -import ChartModal from '../modals/ChartModal'; +const ChartModal = lazy(() => import('@/components/modals/ChartModal')); type Props = { campaign: CampaignDetails | null | undefined; @@ -377,11 +384,13 @@ const CampaignStats: FC = ({ > Paid Amount Chart - setIsChartModalOpen(false)} - campaign={campaign} - /> + + setIsChartModalOpen(false)} + campaign={campaign} + /> + )} diff --git a/campaign-launcher/client/src/components/CampaignSymbol/index.tsx b/campaign-launcher/client/src/components/CampaignSymbol/index.tsx index 65080c177..48b9be076 100644 --- a/campaign-launcher/client/src/components/CampaignSymbol/index.tsx +++ b/campaign-launcher/client/src/components/CampaignSymbol/index.tsx @@ -15,7 +15,7 @@ export const getSymbolStyles = (size: 'xs' | 'small' | 'medium' | 'large') => { case 'xs': return { image: { - width: 16, + size: 16, border: '1px solid white', }, text: { @@ -26,7 +26,7 @@ export const getSymbolStyles = (size: 'xs' | 'small' | 'medium' | 'large') => { case 'small': return { image: { - width: 24, + size: 24, border: '1px solid white', }, text: { @@ -37,7 +37,7 @@ export const getSymbolStyles = (size: 'xs' | 'small' | 'medium' | 'large') => { case 'medium': return { image: { - width: 32, + size: 32, border: '1px solid white', }, text: { @@ -48,7 +48,7 @@ export const getSymbolStyles = (size: 'xs' | 'small' | 'medium' | 'large') => { case 'large': return { image: { - width: 72, + size: 72, border: '2px solid white', }, text: { @@ -60,7 +60,7 @@ export const getSymbolStyles = (size: 'xs' | 'small' | 'medium' | 'large') => { default: return { image: { - width: 24, + size: 24, border: '1px solid white', }, text: { diff --git a/campaign-launcher/client/src/components/ConnectWallet/index.tsx b/campaign-launcher/client/src/components/ConnectWallet/index.tsx index 7ace64f22..d254d7fa5 100644 --- a/campaign-launcher/client/src/components/ConnectWallet/index.tsx +++ b/campaign-launcher/client/src/components/ConnectWallet/index.tsx @@ -10,7 +10,6 @@ import { } from 'wagmi'; import coinbaseSvg from '@/assets/coinbase.svg'; -import metaMaskSvg from '@/assets/metamask.svg'; import walletConnectSvg from '@/assets/walletconnect.svg'; import BaseModal from '@/components/modals/BaseModal'; import { useIsMobile } from '@/hooks/useBreakpoints'; @@ -18,20 +17,16 @@ import { useActiveAccount } from '@/providers/ActiveAccountProvider'; import { useWeb3Auth } from '@/providers/Web3AuthProvider'; const WALLET_ICONS: Record = { - metaMask: metaMaskSvg, coinbaseWalletSDK: coinbaseSvg, walletConnect: walletConnectSvg, }; -const ConnectWallet: FC = () => { - const [anchorEl, setAnchorEl] = useState(null); - - const connect = useConnect(); +const Content: FC<{ onClose: () => void }> = ({ onClose }) => { + const isMobile = useIsMobile(); const connectors = useConnectors(); - const { isConnecting } = useActiveAccount(); - const { setShowSignInPrompt } = useWeb3Auth(); + const connect = useConnect(); const disconnect = useDisconnect(); - const isMobile = useIsMobile(); + const { setShowSignInPrompt } = useWeb3Auth(); const handleConnect = async (connector: Connector) => { try { @@ -50,59 +45,64 @@ const ConnectWallet: FC = () => { } }; + return ( + <> + + {connectors.map((connector) => ( + + ))} + + + By connecting a wallet, you agree to HUMAN Protocol Terms of Service and + consent to its Privacy Policy. + + + ); +}; + +const ConnectWallet: FC = () => { + const [anchorEl, setAnchorEl] = useState(null); + + const { isConnecting } = useActiveAccount(); + const isMobile = useIsMobile(); + const handleConnectWalletButtonClick = (e: MouseEvent) => { setAnchorEl(e.currentTarget); }; const onClose = () => setAnchorEl(null); - const renderContent = () => { - return ( - <> - - {connectors.map((connector) => ( - - ))} - - - By connecting a wallet, you agree to HUMAN Protocol Terms of Service - and consent to its Privacy Policy. - - - ); - }; - return ( <>