StoryScreen: combine duplicate toolbar blocks into one

Author: cheeaun

screens/StoryScreen.jsx

@@ -510,83 +510,86 @@ export default function StoryScreen() {
 
   return (
     <Container {...containerProps}>
-      {!isPreview && tabView === 'web' && (
+      {!isPreview && (
         <Stack.Toolbar placement="right">
-          <Stack.Toolbar.Menu icon="ellipsis">
-            <Stack.Toolbar.MenuAction
-              icon="arrow.clockwise"
-              onPress={() => webViewRef.current?.reload()}
-            >
-              Reload page
-            </Stack.Toolbar.MenuAction>
-            <Stack.Toolbar.MenuAction
-              icon="safari"
-              onPress={() => Linking.openURL(navState.url || url)}
-            >
-              Open in browser&hellip;
-            </Stack.Toolbar.MenuAction>
-            <Stack.Toolbar.MenuAction
-              icon="square.and.arrow.up"
-              onPress={() => openShare({ url: navState.url || url })}
-            >
-              Share&hellip;
-            </Stack.Toolbar.MenuAction>
-          </Stack.Toolbar.Menu>
-        </Stack.Toolbar>
-      )}
-      {!isPreview && tabView === 'comments' && (
-        <Stack.Toolbar placement="right">
-          <Stack.Toolbar.Menu icon="square.and.arrow.up">
-            {!settingsInteractions && (
-              <Stack.Toolbar.MenuAction onPress={() => openBrowser(hnURL)}>
-                View on HN web site
-              </Stack.Toolbar.MenuAction>
-            )}
-            {settingsInteractions && (
-              <Stack.Toolbar.MenuAction
-                icon="arrowtriangle.up.fill"
-                onPress={() => {
-                  const jsKey = `web-view-${Date.now()}`;
-                  useStore.getState().setRouteInjectedJS(
-                    jsKey,
-                    `
+          <Stack.Toolbar.Menu
+            icon={tabView === 'web' ? 'ellipsis' : 'square.and.arrow.up'}
+          >
+            {tabView === 'web' ? (
+              <>
+                <Stack.Toolbar.MenuAction
+                  icon="arrow.clockwise"
+                  onPress={() => webViewRef.current?.reload()}
+                >
+                  Reload page
+                </Stack.Toolbar.MenuAction>
+                <Stack.Toolbar.MenuAction
+                  icon="safari"
+                  onPress={() => Linking.openURL(navState.url || url)}
+                >
+                  Open in browser&hellip;
+                </Stack.Toolbar.MenuAction>
+                <Stack.Toolbar.MenuAction
+                  icon="square.and.arrow.up"
+                  onPress={() => openShare({ url: navState.url || url })}
+                >
+                  Share&hellip;
+                </Stack.Toolbar.MenuAction>
+              </>
+            ) : (
+              <>
+                {!settingsInteractions && (
+                  <Stack.Toolbar.MenuAction onPress={() => openBrowser(hnURL)}>
+                    View on HN web site
+                  </Stack.Toolbar.MenuAction>
+                )}
+                {settingsInteractions && (
+                  <Stack.Toolbar.MenuAction
+                    icon="arrowtriangle.up.fill"
+                    onPress={() => {
+                      const jsKey = `web-view-${Date.now()}`;
+                      useStore.getState().setRouteInjectedJS(
+                        jsKey,
+                        `
                     try {
                       document.getElementById('up_${id}').click();
                     } catch (e) {}
                     true;
                   `,
-                  );
-                  router.push({
-                    pathname: '/web-view',
-                    params: {
-                      url: hnURL,
-                      jsKey,
-                    },
-                  });
-                }}
-              >
-                Upvote story on HN
-              </Stack.Toolbar.MenuAction>
-            )}
-            {settingsInteractions && (
-              <Stack.Toolbar.MenuAction
-                icon="arrowshape.turn.up.left"
-                onPress={() =>
-                  router.push({
-                    pathname: '/web-view',
-                    params: { url: hnURL },
-                  })
-                }
-              >
-                View or Reply story on HN
-              </Stack.Toolbar.MenuAction>
+                      );
+                      router.push({
+                        pathname: '/web-view',
+                        params: {
+                          url: hnURL,
+                          jsKey,
+                        },
+                      });
+                    }}
+                  >
+                    Upvote story on HN
+                  </Stack.Toolbar.MenuAction>
+                )}
+                {settingsInteractions && (
+                  <Stack.Toolbar.MenuAction
+                    icon="arrowshape.turn.up.left"
+                    onPress={() =>
+                      router.push({
+                        pathname: '/web-view',
+                        params: { url: hnURL },
+                      })
+                    }
+                  >
+                    View or Reply story on HN
+                  </Stack.Toolbar.MenuAction>
+                )}
+                <Stack.Toolbar.MenuAction
+                  icon="square.and.arrow.up"
+                  onPress={() => openShare({ url: hnURL })}
+                >
+                  Share story&hellip;
+                </Stack.Toolbar.MenuAction>
+              </>
             )}
-            <Stack.Toolbar.MenuAction
-              icon="square.and.arrow.up"
-              onPress={() => openShare({ url: hnURL })}
-            >
-              Share story&hellip;
-            </Stack.Toolbar.MenuAction>
           </Stack.Toolbar.Menu>
         </Stack.Toolbar>
       )}