Merge branch 'master' into feat/may-14-release

NEUROFUSIONInc · May 23, 2024 · 11b8851 · 11b8851
2 parents 971d35e + b791545
commit 11b8851
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/frontend/src/components/lab/experiment.tsx b/frontend/src/components/lab/experiment.tsx
@@ -100,7 +100,7 @@ export const Experiment: FC<IExperiment> = (experiment) => {
     window.addEventListener("message", (event) => {
       // IMPORTANT: Check the origin of the data!
       // You should probably not use '*', but restrict it to certain domains:
-      if (event.origin.startsWith("https://localhost:") || event.origin.startsWith("https://usefusion.app")) {
+      if (event.origin.startsWith("https://localhost:") || event.origin.startsWith("https://usefusion.app") || event.origin.startsWith("https://usefusion.ai")) {
         console.log("event", event);
         if (typeof event.data === "string") {
           return;

diff --git a/mobile/src/pages/quest-detail.tsx b/mobile/src/pages/quest-detail.tsx
@@ -182,6 +182,7 @@ export function QuestDetailScreen() {
     }
   }, [activePrompt]);
 
+
   return (
     <Screen>
       <ScrollView>
@@ -265,7 +266,6 @@ export function QuestDetailScreen() {
           )}
         </View>
       </ScrollView>
-
       <Portal>
         {activePrompt && (
           <PromptOptionsSheet
@@ -276,6 +276,7 @@ export function QuestDetailScreen() {
           />
         )}
       </Portal>
+
     </Screen>
   );
 }
diff --git a/mobile/src/pages/quests.tsx b/mobile/src/pages/quests.tsx
@@ -4,6 +4,7 @@ import React, { useContext, useEffect, useState } from "react";
 import { Text, View, Image, Pressable } from "react-native";
 
 import { Quest } from "~/@types";
+
 import {
   Button,
   Plus,
@@ -13,6 +14,7 @@ import {
 } from "~/components";
 import { AccountContext } from "~/contexts";
 import { questService } from "~/services/quest.service";
+
 import { colors } from "~/theme";
 
 export function QuestsScreen() {
@@ -38,6 +40,7 @@ export function QuestsScreen() {
     })();
   }, []);
 
+
   return (
     <Screen>
       {activeQuests.length === 0 && (