fix some ios-only things creeping into android

mozzius · Feb 15, 2024 · 3f47f41 · 3f47f41
1 parent 26a6baa
commit 3f47f41
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 28 deletions.
diff --git a/apps/expo/src/app/_layout.tsx b/apps/expo/src/app/_layout.tsx
@@ -350,17 +350,21 @@ const App = () => {
                             name="edit-bio"
                             options={{
                               title: "Edit Profile",
-                              presentation: "modal",
-                              headerTransparent: true,
-                              headerShadowVisible: true,
-                              headerBlurEffect: theme.dark
-                                ? "systemThickMaterialDark"
-                                : "systemChromeMaterialLight",
-                              headerStyle: {
-                                backgroundColor: theme.dark
-                                  ? "rgba(0,0,0,0.4)"
-                                  : "rgba(255,255,255,0.1)",
-                              },
+                              ...Platform.select({
+                                ios: {
+                                  presentation: "modal",
+                                  headerTransparent: true,
+                                  headerShadowVisible: true,
+                                  headerBlurEffect: theme.dark
+                                    ? "systemThickMaterialDark"
+                                    : "systemChromeMaterialLight",
+                                  headerStyle: {
+                                    backgroundColor: theme.dark
+                                      ? "rgba(0,0,0,0.4)"
+                                      : "rgba(255,255,255,0.1)",
+                                  },
+                                },
+                              }),
                             }}
                           />
                           <Stack.Screen

diff --git a/apps/expo/src/app/capture/[author]/[post].tsx b/apps/expo/src/app/capture/[author]/[post].tsx
@@ -144,17 +144,19 @@ export default function ShareAsImageScreen() {
             </View>
           </ScrollView>
         </TransparentHeaderUntilScrolled>
-        <Stack.Screen
-          options={{
-            headerRight: () => (
-              <TouchableOpacity onPress={() => router.push("../")}>
-                <Text primary className="text-lg">
-                  Cancel
-                </Text>
-              </TouchableOpacity>
-            ),
-          }}
-        />
+        {Platform.OS === "ios" && (
+          <Stack.Screen
+            options={{
+              headerRight: () => (
+                <TouchableOpacity onPress={() => router.push("../")}>
+                  <Text primary className="text-lg">
+                    Cancel
+                  </Text>
+                </TouchableOpacity>
+              ),
+            }}
+          />
+        )}
       </>
     );
   }

diff --git a/apps/expo/src/lib/hooks/notifications.ts b/apps/expo/src/lib/hooks/notifications.ts
@@ -55,12 +55,14 @@ export const useNotifications = () => {
       const token = await getPushToken();
       if (token) {
         try {
-          await agent.app.bsky.notification.registerPush({
-            serviceDid: SERVICE_DID,
-            platform: Platform.OS,
-            token: token.data,
-            appId: "dev.mozzius.graysky",
-          });
+          if (agent.hasSession) {
+            await agent.app.bsky.notification.registerPush({
+              serviceDid: SERVICE_DID,
+              platform: Platform.OS,
+              token: token.data,
+              appId: "dev.mozzius.graysky",
+            });
+          }
         } catch (error) {
           Sentry.captureException(
             new Error("Failed to register push token", { cause: error }),