forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
fix: click on our profile when seeing someone's profile (#7732)
Co-authored-by: Stanislas Signoud <signez@stanisoft.net>
Co-authored-by: Hailey <me@haileyok.com>
authored by
Nicolas Borlet
Stanislas Signoud
Hailey
and committed by
GitHub
cb85768e
ca7116ec
+12
-2
+12
-2
src/view/shell/bottom-bar/BottomBarWeb.tsx
+12
-2
src/view/shell/bottom-bar/BottomBarWeb.tsx
···
240
240
}
241
241
return getCurrentRoute(state)
242
242
})
243
+
244
+
// Checks whether we're on someone else's profile
245
+
const isOnDifferentProfile =
246
+
currentRoute.name === 'Profile' &&
247
+
routeName === 'Profile' &&
248
+
(currentRoute.params as CommonNavigatorParams['Profile']).name !==
249
+
currentAccount?.handle
250
+
243
251
const isActive =
244
252
currentRoute.name === 'Profile'
245
253
? isTab(currentRoute.name, routeName) &&
246
254
(currentRoute.params as CommonNavigatorParams['Profile']).name ===
247
-
currentAccount?.handle
255
+
(routeName === 'Profile'
256
+
? currentAccount?.handle
257
+
: (currentRoute.params as CommonNavigatorParams['Profile']).name)
248
258
: isTab(currentRoute.name, routeName)
249
259
250
260
return (
251
261
<Link
252
262
href={href}
253
263
style={[styles.ctrl, a.pb_lg]}
254
-
navigationAction="navigate"
264
+
navigationAction={isOnDifferentProfile ? 'push' : 'navigate'}
255
265
aria-role="link"
256
266
aria-label={routeName}
257
267
accessible={true}>