chore: fix rebase

geyserfund · May 5, 2023 · 8d9d58e · 8d9d58e
1 parent a369d27
commit 8d9d58e
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/...pages/projectView/projectActivityPanel/components/ProjectFundingQRScreenQRCodeSection.tsx b/...pages/projectView/projectActivityPanel/components/ProjectFundingQRScreenQRCodeSection.tsx
@@ -337,8 +337,12 @@ export const ProjectFundingQRScreenQRCodeSection = ({ fundingFlow }: Props) => {
   )
 }
 
-
-<<<<<<< Updated upstream
+const GeneratingInvoice = ({
+  refreshInvoice,
+}: {
+  refreshInvoice: () => void
+}) => {
+  const { onOpen, onClose, isOpen } = useDisclosure()
   const timeout = useRef<NodeJS.Timeout | undefined>()
 
   useEffect(() => {
@@ -380,5 +384,3 @@ export const ProjectFundingQRScreenQRCodeSection = ({ fundingFlow }: Props) => {
     </VStack>
   )
 }
-=======
->>>>>>> Stashed changes