@@ -34,7 +32,7 @@ export default function Claim_FundWithdrawCard({ onClose, direction, ...props }:
+
Fund
Withdraw
diff --git a/src/Components/ClaimProject/Claim_GenerateSignatureCard.tsx b/src/Components/ClaimProject/Claim_GenerateSignatureCard.tsx
index 6819c2c..987a349 100644
--- a/src/Components/ClaimProject/Claim_GenerateSignatureCard.tsx
+++ b/src/Components/ClaimProject/Claim_GenerateSignatureCard.tsx
@@ -1,6 +1,6 @@
import { motion } from 'framer-motion'
import { Direction, ModalId, replaceModal } from '../../redux/features/modals.slice';
-import { useAppDispatch } from '../../utils/hooks';
+import { useAppDispatch, useAppSelector } from '../../utils/hooks';
import { ModalCard, modalCardVariants } from '../Shared/ModalsContainer/ModalsContainer'
import { useCallback, useEffect } from 'react';
import { IoClose } from 'react-icons/io5';
@@ -8,11 +8,13 @@ import { IoClose } from 'react-icons/io5';
export default function Claim_GenerateSignatureCard({ onClose, direction, ...props }: ModalCard) {
const dispatch = useAppDispatch();
+ const { projectName, image } = useAppSelector(state => ({ projectName: state.project.project?.title, image: state.project.project?.thumbnail_image, }))
+
const handleNext = useCallback(() => {
dispatch(replaceModal({
- modalId: ModalId.Login_NativeWallet,
+ modalId: ModalId.Claim_CopySignature,
direction: Direction.NEXT
}))
}, [dispatch])
@@ -41,12 +43,12 @@ export default function Claim_GenerateSignatureCard({ onClose, direction, ...pro
Claim this project
- To claim ownership of Application Name and its tips, you need to sign a message and paste this on the project website so we can verify you are the real ownership
+ To claim ownership of {projectName} and its tips, you need to sign a message and paste this on the project website so we can verify you are the real ownership
Generate Signature
diff --git a/src/Components/ExplorePage/partials/ProjectsRow.tsx b/src/Components/ExplorePage/partials/ProjectsRow.tsx
index 89083be..94fe025 100644
--- a/src/Components/ExplorePage/partials/ProjectsRow.tsx
+++ b/src/Components/ExplorePage/partials/ProjectsRow.tsx
@@ -28,7 +28,7 @@ export default function ProjectsRow({ title, projects }: Props) {
const handleClick = (projectId: string) => {
projectId = '123123123';
if (!drag.current)
- dispatch(openModal({ modalId: ModalId.Project, initialModalProps: { projectId } }))
+ dispatch(openModal({ modalId: ModalId.Project, propsToPass: { projectId } }))
}
return (
diff --git a/src/Components/Login/Login_ExternalWalletCard.tsx b/src/Components/Login/Login_ExternalWalletCard.tsx
index 170ed61..08ad2dd 100644
--- a/src/Components/Login/Login_ExternalWalletCard.tsx
+++ b/src/Components/Login/Login_ExternalWalletCard.tsx
@@ -3,7 +3,7 @@ import { Direction, ModalId, replaceModal } from '../../redux/features/modals.sl
import { useAppDispatch } from '../../utils/hooks';
import { ModalCard, modalCardVariants } from '../Shared/ModalsContainer/ModalsContainer'
import { AiFillThunderbolt } from 'react-icons/ai';
-import Loader from 'react-loader-spinner';
+import { CopyToClipboard } from 'react-copy-to-clipboard';
import { useCallback, useEffect, useState } from 'react';
import { IoClose } from 'react-icons/io5';
import { IoIosCopy } from 'react-icons/io'
@@ -15,20 +15,17 @@ export default function Login_ExternalWalletCard({ onClose, direction, ...props
const handleNext = useCallback(() => {
dispatch(replaceModal({
- modalId: ModalId.Login_NativeWallet,
+ modalId: ModalId.Login_Success,
direction: Direction.NEXT
}))
}, [dispatch])
useEffect(() => {
-
- // const timeout = setTimeout(handleNext, 3000)
- // return () => clearTimeout(timeout)
}, [handleNext])
const onCopy = () => {
// Copy to Clipboard
- setTimeout(handleNext, 2000)
+ setTimeout(handleNext, 1000)
}
return (
@@ -45,19 +42,21 @@ export default function Login_ExternalWalletCard({ onClose, direction, ...props
Scan this code or copy the address below to login using Inurl-auth
-
+
+
diff --git a/src/Components/Login/Login_NativeWalletCard.tsx b/src/Components/Login/Login_NativeWalletCard.tsx
index 1d0d244..cf27322 100644
--- a/src/Components/Login/Login_NativeWalletCard.tsx
+++ b/src/Components/Login/Login_NativeWalletCard.tsx
@@ -10,7 +10,7 @@ export default function Login_NativeWalletCard({ onClose, direction, ...props }:
const handleNext = () => {
dispatch(replaceModal({
- modalId: ModalId.Login_Success,
+ modalId: ModalId.Login_ExternalWallet,
direction: Direction.NEXT
}))
}
diff --git a/src/Components/Login/Login_SuccessCard.tsx b/src/Components/Login/Login_SuccessCard.tsx
index b700c36..259380f 100644
--- a/src/Components/Login/Login_SuccessCard.tsx
+++ b/src/Components/Login/Login_SuccessCard.tsx
@@ -2,21 +2,21 @@ import { motion } from 'framer-motion'
import { useAppDispatch } from '../../utils/hooks';
import { ModalCard, modalCardVariants } from '../Shared/ModalsContainer/ModalsContainer'
import { useCallback, useEffect } from 'react';
+import { closeModal, openSceduledModal } from '../../redux/features/modals.slice';
+import { connectWallet } from '../../redux/features/wallet.slice';
export default function Login_SuccessCard({ onClose, direction, ...props }: ModalCard) {
const dispatch = useAppDispatch();
const handleNext = useCallback(() => {
- // dispatch(replaceModal({
- // modalId: ModalId.Login_ScanWallet,
- // direction: Direction.NEXT
- // }))
- onClose && onClose()
+ dispatch(closeModal())
+ dispatch(openSceduledModal())
}, [dispatch, onClose])
useEffect(() => {
+ dispatch(connectWallet());
const timeout = setTimeout(handleNext, 3000)
return () => clearTimeout(timeout)
}, [handleNext])
diff --git a/src/Components/Project/ProjectCard.tsx b/src/Components/Project/ProjectCard.tsx
index 3a94fea..b6e1e83 100644
--- a/src/Components/Project/ProjectCard.tsx
+++ b/src/Components/Project/ProjectCard.tsx
@@ -5,15 +5,22 @@ import { MdLocalFireDepartment } from 'react-icons/md';
import { ModalCard, modalCardVariants } from '../Shared/ModalsContainer/ModalsContainer';
import { useQuery } from 'react-query';
import { getProjectById } from '../../api';
-import { useAppDispatch } from '../../utils/hooks';
-import { ModalId, openModal } from '../../redux/features/modals.slice';
+import { useAppDispatch, useAppSelector } from '../../utils/hooks';
+import { ModalId, openModal, scheduleModal } from '../../redux/features/modals.slice';
+import { setProject } from '../../redux/features/project.slice';
export default function ProjectCard({ onClose, direction, ...props }: ModalCard) {
- const { data: project, isLoading } = useQuery(['get-project', props.projectId], () => getProjectById(props.projectId))
-
+ const { data: project, isLoading } = useQuery(
+ ['get-project', props.projectId],
+ () => getProjectById(props.projectId),
+ {
+ onSuccess: project => dispatch(setProject(project))
+ }
+ )
+ const { isWalletConnected } = useAppSelector(state => ({ isWalletConnected: state.wallet.isConnected }))
const dispatch = useAppDispatch();
if (isLoading || !project) return <>;
@@ -21,14 +28,29 @@ export default function ProjectCard({ onClose, direction, ...props }: ModalCard)
const onVote = () => {
- dispatch(openModal({ modalId: ModalId.Vote, initialModalProps: { projectId: props.projectId } }))
+ if (!isWalletConnected) {
+ dispatch(scheduleModal({ modalId: ModalId.Vote, propsToPass: { projectId: props.projectId } }))
+ dispatch(openModal({
+ modalId: ModalId.Login_ScanWallet
+ }))
+ } else
+ dispatch(openModal({ modalId: ModalId.Vote, propsToPass: { projectId: props.projectId } }))
}
const onClaim = () => {
- dispatch(openModal({
- modalId: ModalId.Login_ScanWallet,
- initialModalProps: { projectId: props.projectId },
- }))
+ if (!isWalletConnected) {
+ dispatch(scheduleModal({
+ modalId: ModalId.Claim_GenerateSignature,
+ propsToPass: { projectId: props.projectId },
+ }))
+ dispatch(openModal({
+ modalId: ModalId.Login_ScanWallet
+ }))
+ } else
+ dispatch(openModal({
+ modalId: ModalId.Claim_GenerateSignature,
+ propsToPass: { projectId: props.projectId },
+ }))
}
return (
@@ -56,7 +78,7 @@ export default function ProjectCard({ onClose, direction, ...props }: ModalCard)
Play
- Vote
+ Vote
{project.description}
diff --git a/src/Components/Shared/ModalsContainer/ModalsContainer.tsx b/src/Components/Shared/ModalsContainer/ModalsContainer.tsx
index 97b36f0..c1eb88c 100644
--- a/src/Components/Shared/ModalsContainer/ModalsContainer.tsx
+++ b/src/Components/Shared/ModalsContainer/ModalsContainer.tsx
@@ -1,6 +1,6 @@
import { AnimatePresence, motion } from "framer-motion";
import { useEffect } from "react";
-import { closeModal, Direction, ModalId } from "../../../redux/features/modals.slice";
+import { closeModal, Direction, ModalId, removeScheduledModal } from "../../../redux/features/modals.slice";
import { useAppDispatch, useAppSelector } from "../../../utils/hooks";
import Claim_CopySignatureCard from "../../ClaimProject/Claim_CopySignatureCard";
import Claim_GenerateSignatureCard from "../../ClaimProject/Claim_GenerateSignatureCard";
@@ -85,7 +85,10 @@ export default function ModalsContainer() {
}))
const dispatch = useAppDispatch();
- const onClose = () => dispatch(closeModal());
+ const onClose = () => {
+ dispatch(removeScheduledModal());
+ dispatch(closeModal());
+ }
useEffect(() => {
if (isOpen) document.body.style.overflowY = "hidden";
diff --git a/src/Components/Shared/Navbar/Navbar.tsx b/src/Components/Shared/Navbar/Navbar.tsx
index 66a273c..f9bd56c 100644
--- a/src/Components/Shared/Navbar/Navbar.tsx
+++ b/src/Components/Shared/Navbar/Navbar.tsx
@@ -4,9 +4,11 @@ import { MdLocalFireDepartment } from 'react-icons/md';
import { IoExtensionPuzzle } from 'react-icons/io5';
import { AiFillThunderbolt } from 'react-icons/ai';
import { BsSearch } from "react-icons/bs";
-import { FormEvent, useState } from "react";
+import { FormEvent, useRef, useState } from "react";
import { motion } from "framer-motion";
import { GrClose } from 'react-icons/gr';
+import { useAppDispatch, useAppSelector } from "../../../utils/hooks";
+import { ModalId, openModal } from "../../../redux/features/modals.slice";
export const navLinks = [
{ text: "Explore", url: "/", icon: FaHome, color: 'text-primary-600' },
@@ -18,9 +20,13 @@ export const navLinks = [
export default function Navbar() {
const [searchOpen, setSearchOpen] = useState(false)
- const [searchInput, setSearchInput] = useState("")
+ const [searchInput, setSearchInput] = useState("");
+ const inputRef = useRef
(null)
+ const dispatch = useAppDispatch()
+ const { isWalletConnected } = useAppSelector(state => ({ isWalletConnected: state.wallet.isConnected }))
const toggleSearch = () => {
+ if (!searchOpen) inputRef.current?.focus();
setSearchOpen(!searchOpen);
}
@@ -29,6 +35,18 @@ export default function Navbar() {
alert(`Your Searched for: ${search}`)
}
+ const onConnectWallet = () => {
+ dispatch(openModal({
+ modalId: ModalId.Login_ScanWallet
+ }));
+ }
+
+ const onWithdraw = () => {
+ dispatch(openModal({
+ modalId: ModalId.Claim_FundWithdraw
+ }))
+ }
+
const handleSubmit = (e: FormEvent) => {
e.preventDefault();
// Make Search Request
@@ -53,17 +71,20 @@ export default function Navbar() {
animate={searchOpen ? { opacity: 0 } : { opacity: 1 }}
className="flex">
Submit
- 2.2k Sats
+ : 
