resolve circular deps inside rewards (#1348)

* fix(SecretText): resolve circular dependency inside rewards

* fix(PolygonID): resolve circular dependency inside rewards

src/components/[guild]/RolePlatforms/components/AddRoleRewardModal/components/AddSecretTextPanel.tsx

@@ -2,9 +2,7 @@ import { Tab, TabList, TabPanel, TabPanels, Tabs } from "@chakra-ui/react"
 import { useAddRewardDiscardAlert } from "components/[guild]/AddRewardButton/hooks/useAddRewardDiscardAlert"
 import useUser from "components/[guild]/hooks/useUser"
 import Button from "components/common/Button"
-import SecretTextDataForm, {
-  SecretTextRewardForm,
-} from "rewards/SecretText/SecretTextDataForm/SecretTextDataForm"
+import SecretTextDataForm from "rewards/SecretText/SecretTextDataForm/SecretTextDataForm"
 import UniqueTextDataForm, {
   UniqueTextRewardForm,
 } from "rewards/UniqueText/UniqueTextDataForm"
@@ -13,6 +11,7 @@ import { useState } from "react"
 import { FormProvider, useForm, useWatch } from "react-hook-form"
 import { PlatformGuildData, PlatformName, PlatformType } from "types"
 import DefaultAddRewardPanelWrapper from "../DefaultAddRewardPanelWrapper"
+import { SecretTextRewardForm } from "rewards/SecretText/SecretTextDataForm/types"
 
 enum TextPlatformName {
   TEXT,

src/rewards/PolygonID/components/ConnectDIDModal.tsx

@@ -23,18 +23,19 @@ import { useEffect } from "react"
 import useSWR from "swr"
 import useSWRImmutable from "swr/immutable"
 import useConnectedDID from "../hooks/useConnectedDID"
-import { useMintPolygonIDProofContext } from "./MintPolygonIDProofProvider"
 
 type Props = {
   isOpen: boolean
   onClose: () => void
+  onMintPolygonIDProofModalOpen: () => void
 }
 
-const ConnectDIDModal = ({ isOpen, onClose }: Props) => {
+const ConnectDIDModal = ({
+  isOpen,
+  onClose,
+  onMintPolygonIDProofModalOpen,
+}: Props) => {
   const { id: userId } = useUser()
-
-  const { onMintPolygonIDProofModalOpen } = useMintPolygonIDProofContext()
-
   const toast = useToast()
 
   const fetcherWithSign = useFetcherWithSign()

src/rewards/PolygonID/components/MintPolygonIDProofProvider.tsx

@@ -9,14 +9,18 @@ const DynamicMintPolygonIDProofModal = dynamic(
   () => import("./MintPolygonIDProofModal")
 )
 
-const MintPolygonIDProofContext = createContext<{
+interface MintPolygonIDProofContextType {
   isConnectDIDModalOpen: boolean
   onConnectDIDModalOpen: () => void
   onConnectDIDModalClose: () => void
   isMintPolygonIDProofModalOpen: boolean
   onMintPolygonIDProofModalOpen: () => void
   onMintPolygonIDProofModalClose: () => void
-}>(undefined)
+}
+
+const MintPolygonIDProofContext = createContext<MintPolygonIDProofContextType>(
+  {} as MintPolygonIDProofContextType
+)
 
 const MintPolygonIDProofProvider = ({ children }: PropsWithChildren<unknown>) => {
   const { guildPlatforms } = useGuild()
@@ -44,11 +48,12 @@ const MintPolygonIDProofProvider = ({ children }: PropsWithChildren<unknown>) =>
     >
       {children}
 
-      {guildPlatforms.find((gp) => gp.platformId === PlatformType.POLYGON_ID) && (
+      {guildPlatforms?.find((gp) => gp.platformId === PlatformType.POLYGON_ID) && (
         <>
           <DynamicConnectDIDModal
             isOpen={isConnectDIDModalOpen}
             onClose={onConnectDIDModalClose}
+            onMintPolygonIDProofModalOpen={onMintPolygonIDProofModalOpen}
           />
           <DynamicMintPolygonIDProofModal
             isOpen={isMintPolygonIDProofModalOpen}

src/rewards/SecretText/EditSecretTextModal.tsx

@@ -11,9 +11,8 @@ import { Modal } from "components/common/Modal"
 import useToast from "hooks/useToast"
 import { FormProvider, useForm } from "react-hook-form"
 import { GuildPlatform } from "types"
-import SecretTextDataForm, {
-  SecretTextRewardForm,
-} from "./SecretTextDataForm/SecretTextDataForm"
+import SecretTextDataForm from "./SecretTextDataForm/SecretTextDataForm"
+import { SecretTextRewardForm } from "./SecretTextDataForm/types"
 
 type Props = {
   isOpen: boolean

src/rewards/SecretText/SecretTextDataForm/SecretTextDataForm.tsx

@@ -5,12 +5,7 @@ import { PropsWithChildren } from "react"
 import { useController, useFormContext, useWatch } from "react-hook-form"
 import BoxIcon from "static/icons/box.svg"
 import PublicRewardDataForm from "./components/PublicRewardDataForm"
-
-export type SecretTextRewardForm = {
-  name: string
-  imageUrl?: string
-  text: string
-}
+import { SecretTextRewardForm } from "./types"
 
 type Props = {
   shouldValidate?: boolean

src/rewards/SecretText/SecretTextDataForm/components/PublicRewardDataForm.tsx

@@ -2,8 +2,8 @@ import { Box, FormControl, FormLabel, HStack, Input } from "@chakra-ui/react"
 import FormErrorMessage from "components/common/FormErrorMessage"
 import { UniqueTextRewardForm } from "rewards/UniqueText/UniqueTextDataForm"
 import { useFormContext } from "react-hook-form"
-import { SecretTextRewardForm } from "../SecretTextDataForm"
 import RewardImagePicker from "./RewardImagePicker"
+import { SecretTextRewardForm } from "../types"
 
 const PublicRewardDataForm = ({ defaultIcon }) => {
   const {

src/rewards/SecretText/SecretTextDataForm/index.ts

@@ -1,4 +1,5 @@
-import SecretTextDataForm, { SecretTextRewardForm } from "./SecretTextDataForm"
+import SecretTextDataForm from "./SecretTextDataForm"
+import { SecretTextRewardForm } from "./types"
 
 export default SecretTextDataForm
 export type { SecretTextRewardForm }

src/rewards/SecretText/SecretTextDataForm/types.ts

@@ -0,0 +1,5 @@
+export type SecretTextRewardForm = {
+  name: string
+  imageUrl?: string
+  text: string
+}