Merge branch 'staging' into feat/pay-with-eth

showtime-xyz · Oct 31, 2023 · 3b94fc8 · 3b94fc8
2 parents ac3573d + 8fe33c0
commit 3b94fc8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "showtime",
-  "version": "149.0.5",
+  "version": "149.0.6",
   "private": true,
   "license": "MIT",
   "devDependencies": {

diff --git a/packages/app/components/profile/complete-profile-button.tsx b/packages/app/components/profile/complete-profile-button.tsx
@@ -3,19 +3,22 @@ import { Platform } from "react-native";
 import { Button, GradientButton } from "@showtime-xyz/universal.button";
 import { useRouter } from "@showtime-xyz/universal.router";
 
-import { useRedirectToCreateDrop } from "app/hooks/use-redirect-to-create-drop";
+import { useOnboardingPromise } from "app/components/onboarding";
 import { useUser } from "app/hooks/use-user";
 
 export const CompleteProfileButton = ({ isSelf }: { isSelf: boolean }) => {
   const router = useRouter();
   const { isIncompletedProfile } = useUser();
-  const redirectToCreateDrop = useRedirectToCreateDrop();
+  const { onboardingPromise } = useOnboardingPromise();
+
   if (!isSelf) return null;
   if (isIncompletedProfile) {
     return (
       <GradientButton
         size="small"
-        onPress={redirectToCreateDrop}
+        onPress={async () => {
+          await onboardingPromise();
+        }}
         labelTW={"color-white"}
         style={{ height: 28, paddingVertical: 0 }}
         gradientProps={{

diff --git a/packages/app/hooks/creator-token/use-creator-token-approve.ts b/packages/app/hooks/creator-token/use-creator-token-approve.ts
@@ -77,9 +77,9 @@ export const useApproveToken = () => {
               return true;
             }
           }
+        } else {
+          return true;
         }
-      } else {
-        return true;
       }
     }
   );