Merge branch 'main' of https://github.com/ChurchApps/ChumsApp

Author: jzongker

src/components/Wrapper.tsx

@@ -7,16 +7,21 @@ interface Props {
   children: React.ReactNode;
 }
 
-export const Wrapper: React.FC<Props> = (props) => (
-  <>
-    <Header />
+export const Wrapper: React.FC<Props> = (props) => {
+  const isWebView = typeof (window as any).ReactNativeWebView !== "undefined";
+  const showHeader = !(isWebView && window.location.pathname === "/profile");
 
-    <Box sx={{ width: "100%" }}>
-      <div id="appBarSpacer"></div>
-      {props.children}
-    </Box>
-  </>
-);
+  return (
+    <>
+      {showHeader && <Header />}
+
+      <Box sx={{ width: "100%" }}>
+        {showHeader && <div id="appBarSpacer"></div>}
+        {props.children}
+      </Box>
+    </>
+  );
+};
 /*
   const [donationError, setDonationError] = React.useState<boolean>(false);
   const [isFormMember, setIsFormMember] = React.useState<boolean>(false);

src/profile/ProfilePage.tsx

@@ -36,6 +36,12 @@ export const ProfilePage = () => {
     }
   }, []);
 
+  const sendEventToReactNative = (eventName: string, data?: any) => {
+    if ((window as any).ReactNativeWebView) {
+      (window as any).ReactNativeWebView.postMessage(JSON.stringify({ event: eventName, data }));
+    }
+  };
+
   const updateProfileMutation = useMutation({
     mutationFn: async () => {
       const promises: Promise<any>[] = [];
@@ -73,6 +79,7 @@ export const ProfilePage = () => {
       setSaveMessage(Locale.label("profile.profilePage.saveChange"));
       setPassword("");
       setPasswordVerify("");
+      sendEventToReactNative("profile_updated");
     },
     onError: (error) => {
       console.error("Error saving profile:", error);
@@ -83,6 +90,7 @@ export const ProfilePage = () => {
   const deleteAccountMutation = useMutation({
     mutationFn: () => ApiHelper.delete("/users", "MembershipApi"),
     onSuccess: () => {
+      sendEventToReactNative("profile_deleted");
       navigate("/logout", { replace: true });
     },
   });