fixes redirect

showtime-xyz · Nov 14, 2023 · ac74701 · ac74701
1 parent a60c3db
commit ac74701
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 47 deletions.
diff --git a/apps/next/src/pages/_app.tsx b/apps/next/src/pages/_app.tsx
@@ -231,7 +231,6 @@ function App({ Component, pageProps, router }: AppProps) {
         <VerifyPhoneNumberScreen />
         <UnlockedChannelScreen />
         <CreatorTokenBuyScreen />
-        <CreatorTokensShareModalScreen />
         <CreatorTokenInviteSignInScreen />
         <InviteCreatorTokenScreen />
         <CreatorTokensSelfServeExplainerScreen />

diff --git a/apps/next/src/pages/creator-token/crossmint-purchase-redirect.tsx b/apps/next/src/pages/creator-token/crossmint-purchase-redirect.tsx
diff --git a/packages/app/components/creator-token/buy-creator-token.tsx b/packages/app/components/creator-token/buy-creator-token.tsx
@@ -248,7 +248,8 @@ export const BuyCreatorToken = () => {
       process.env.NEXT_PUBLIC_STAGE === "production" ? "production" : "staging",
     successCallbackURL:
       typeof window !== "undefined"
-        ? window.location.origin + `/creator-token/crossmint-purchase-redirect`
+        ? window.location.origin +
+          `/creator-token/${profileData?.data?.profile.username}/share`
         : undefined,
   } as const;
 
@@ -330,7 +331,7 @@ export const BuyCreatorToken = () => {
                       height={44}
                     />
                   )}
-                  {crossmintConfig.collectionId && selectedAction === "buy" ? (
+                  {selectedAction === "buy" ? (
                     <View>
                       {(priceToBuyNext.isLoading && paymentMethod === "USDC") ||
                       (ethPriceToBuyNext.isLoading &&
@@ -469,7 +470,7 @@ export const BuyCreatorToken = () => {
             </Text>
           </View>
         </View>
-        {selectedAction === "buy" ? (
+        {selectedAction === "buy" && crossmintConfig.collectionId ? (
           <>
             <View tw="mx-auto my-2 h-[1px] w-[20%] rounded-full bg-gray-400" />
             <CrossmintPayButton
@@ -485,27 +486,7 @@ export const BuyCreatorToken = () => {
                   e.preventDefault();
                   return;
                 }
-
-                function listenCrossmintMessage(event: any) {
-                  if (event.data.type === "purchase.succeeded") {
-                    if (profileData?.data?.profile) {
-                      redirectToCreatorTokensShare({
-                        username: profileData?.data?.profile.username,
-                        type: "collected",
-                        collectedCount: tokenAmount,
-                      });
-                      router.pop();
-                      console.log(
-                        `Received message from crossmint window: ${event.data}`
-                      );
-                      window.removeEventListener(
-                        "message",
-                        listenCrossmintMessage
-                      );
-                    }
-                  }
-                }
-                window.addEventListener("message", listenCrossmintMessage);
+                router.pop();
               }}
               {...crossmintConfig}
             />

diff --git a/packages/app/components/creator-token/creator-tokens-share.tsx b/packages/app/components/creator-token/creator-tokens-share.tsx
@@ -45,13 +45,30 @@ const { useParam } = createParam<{
   username: string;
   type: TokenShareType;
   collectedCount: string;
+  p: string;
 }>();
 
 export const CreatorTokensShareModal = memo(function CreatorTokens() {
   const linearOpaticy = useSharedValue(0);
   const [username] = useParam("username");
-  const [collectedCount] = useParam("collectedCount");
-  const [type] = useParam("type");
+  let [collectedCount] = useParam("collectedCount");
+  let [type] = useParam("type");
+
+  // Redirect from crossmint
+  // https://docs.crossmint.com/docs/redirect-url#redirection-payload
+  const [p] = useParam("p");
+
+  if (p) {
+    try {
+      const params = JSON.parse(p);
+      if (params && params[0] && params[0].type === "purchase.succeeded") {
+        collectedCount = params?.[0]?.tokenIds?.length;
+        type = "collected";
+      }
+    } catch (e) {
+      // noop
+    }
+  }
 
   const { data: userInfo } = useUserProfile({ address: username });
   const profileData = userInfo?.data?.profile;

diff --git a/packages/app/screens/creator-token/creator-token-social-share.tsx b/packages/app/screens/creator-token/creator-token-social-share.tsx
@@ -6,7 +6,7 @@ export const CreatorTokenSocialShareScreen = withModalScreen(
   CreatorTokenSocialShare,
   {
     title: "",
-    matchingPathname: "/creator-token/[username]/share",
+    matchingPathname: "/creator-token/[username]/social-share",
     matchingQueryParam: "creatorTokenSocialShareModal",
     snapPoints: ["100%"],
     enableHandlePanningGesture: true,