remove safe submit etc

shared/chat/blocking/invitation-to-block.tsx

@@ -1,11 +1,11 @@
 import * as Chat from '@/stores/chat'
 import {useProfileState} from '@/stores/profile'
 import * as Kb from '@/common-adapters'
-import {useSafeNavigation} from '@/util/safe-navigation'
+import {useRouteNavigation} from '@/constants/router'
 import {useCurrentUserState} from '@/stores/current-user'
 
 const BlockButtons = () => {
-  const nav = useSafeNavigation()
+  const nav = useRouteNavigation()
   const conversationIDKey = Chat.useChatContext(s => s.id)
 
   const team = Chat.useChatContext(s => s.meta.teamname)
@@ -27,9 +27,9 @@ const BlockButtons = () => {
   )
 
   const onViewProfile = () => showUserProfile(adder)
-  const onViewTeam = () => nav.safeNavigateAppend({name: 'team', params: {teamID}})
+  const onViewTeam = () => nav.navigateAppend({name: 'team', params: {teamID}})
   const onBlock = () =>
-    nav.safeNavigateAppend({
+    nav.navigateAppend({
       name: 'chatBlockingModal',
       params: {
         blockUserByDefault: true,

shared/chat/conversation/info-panel/add-to-channel.tsx

@@ -4,7 +4,7 @@ import * as React from 'react'
 import * as Teams from '@/stores/teams'
 import * as Kb from '@/common-adapters'
 import * as T from '@/constants/types'
-import {useSafeNavigation} from '@/util/safe-navigation'
+import {useRouteNavigation} from '@/constants/router'
 import {useTeamDetailsSubscribe} from '@/teams/subscriber'
 import {pluralize} from '@/util/string'
 import {useChannelParticipants} from '@/teams/common'
@@ -14,7 +14,7 @@ type Props = {teamID: T.Teams.TeamID}
 
 const AddToChannel = (props: Props) => {
   const {teamID} = props
-  const nav = useSafeNavigation()
+  const nav = useRouteNavigation()
   const conversationIDKey = Chat.useChatContext(s => s.id)
 
   const [toAdd, setToAdd] = React.useState(new Set<string>())
@@ -37,7 +37,7 @@ const AddToChannel = (props: Props) => {
   const [error, setError] = React.useState('')
   const addToChannel = C.useRPC(T.RPCChat.localBulkAddToConvRpcPromise)
 
-  const onClose = () => nav.safeNavigateUp()
+  const onClose = () => nav.navigateUp()
   const loadTeamChannelList = Teams.useTeamsState(s => s.dispatch.loadTeamChannelList)
   const onAdd = () => {
     setWaiting(true)
@@ -65,7 +65,7 @@ const AddToChannel = (props: Props) => {
         () => {
           setWaiting(false)
           loadTeamChannelList(teamID)
-          nav.safeNavigateUp()
+          nav.navigateUp()
         },
         (e: {message: string}) => {
           setError(e.message)

shared/chat/inbox/row/build-team.tsx

@@ -1,18 +1,18 @@
 import * as C from '@/constants'
 import {useTeamsState} from '@/stores/teams'
 import * as Kb from '@/common-adapters'
-import {useSafeNavigation} from '@/util/safe-navigation'
+import {useRouteNavigation} from '@/constants/router'
 
 function BuildTeam() {
-  const nav = useSafeNavigation()
+  const nav = useRouteNavigation()
   const launchNewTeamWizardOrModal = useTeamsState(s => s.dispatch.launchNewTeamWizardOrModal)
   const switchTab = C.useRouterState(s => s.dispatch.switchTab)
   const onCreateTeam = () => {
     switchTab(C.Tabs.teamsTab)
     launchNewTeamWizardOrModal()
   }
   const onJoinTeam = () => {
-    nav.safeNavigateAppend('teamJoinTeamDialog')
+    nav.navigateAppend('teamJoinTeamDialog')
   }
 
   return (

shared/chat/punycode-link-warning.tsx

@@ -1,5 +1,5 @@
 import * as Kb from '@/common-adapters'
-import {useSafeNavigation} from '@/util/safe-navigation'
+import {useRouteNavigation} from '@/constants/router'
 import openURL from '@/util/open-url'
 
 type PunycodeLinkWarningProps = {
@@ -10,11 +10,11 @@ type PunycodeLinkWarningProps = {
 
 const PunycodeLinkWarning = (props: PunycodeLinkWarningProps) => {
   const {url, display, punycode} = props
-  const nav = useSafeNavigation()
-  const onCancel = () => nav.safeNavigateUp()
+  const nav = useRouteNavigation()
+  const onCancel = () => nav.navigateUp()
   const onConfirm = () => {
     openURL(url)
-    nav.safeNavigateUp()
+    nav.navigateUp()
   }
   const description = `The link you clicked on appears to be ${display}, but actually points to ${punycode}.`
   return (

shared/common-adapters/confirm-modal.tsx

@@ -87,6 +87,7 @@ const ConfirmModal = (props: Props) => (
           disabled={props.onConfirmDeactivated || !props.onConfirm}
           type="Danger"
           label={props.confirmText || 'Confirm'}
+          lockOnClick={!!props.waitingKey}
           onClick={props.onConfirm}
           style={styles.button}
           waitingKey={props.waitingKey}

shared/common-adapters/floating-menu/index.tsx

@@ -32,14 +32,14 @@ export type Props = {
 
 type SafeNavigationHook = <T extends NavigationProp<ParamListBase>>() => T | null
 
-const useSafeNavigation: SafeNavigationHook = Styles.isMobile
+const useMenuNavigation: SafeNavigationHook = Styles.isMobile
   ? (useNavigation as SafeNavigationHook)
   : () => null
 
 function FloatingMenu(props: Props) {
   const {items, visible, onHidden, mode} = props
 
-  const navigation = useSafeNavigation()
+  const navigation = useMenuNavigation()
 
   React.useEffect(() => {
     const unsub = navigation?.addListener('state', () => {

shared/common-adapters/waiting-button.tsx

@@ -8,6 +8,7 @@ const Kb = {
 }
 
 export type Props = {
+  lockOnClick?: boolean
   onlyDisable?: boolean
   waitingKey?: Array<string> | string
 } & ButtonProps
@@ -25,22 +26,41 @@ export type Props = {
  */
 
 function WaitingButton(props: Props & {ref?: React.Ref<MeasureRef>}) {
-  const {onlyDisable, waitingKey, ref, ...buttonProps} = props
+  const {lockOnClick, onlyDisable, waitingKey, ref, ...buttonProps} = props
   const storeWaiting = C.Waiting.useAnyWaiting(waitingKey)
 
   const [localWaiting, setLocalWaiting] = React.useState(false)
+  const [trackingStoreWaiting, setTrackingStoreWaiting] = React.useState(false)
 
   if (onlyDisable && !waitingKey) {
     throw new Error('WaitingButton onlyDisable should only be used with a waiting key')
   }
+
+  React.useEffect(() => {
+    if (!lockOnClick || !waitingKey || !localWaiting) {
+      return
+    }
+    if (storeWaiting) {
+      setTrackingStoreWaiting(true)
+      return
+    }
+    if (trackingStoreWaiting) {
+      setLocalWaiting(false)
+      setTrackingStoreWaiting(false)
+      return
+    }
+    setLocalWaiting(false)
+  }, [lockOnClick, localWaiting, storeWaiting, trackingStoreWaiting, waitingKey])
+
   const waiting = storeWaiting || localWaiting
   return (
     <Kb.Button
       ref={ref}
       {...buttonProps}
       onClick={event => {
-        if (!waitingKey) {
+        if (lockOnClick || !waitingKey) {
           setLocalWaiting(true)
+          setTrackingStoreWaiting(false)
         }
         buttonProps.onClick?.(event)
       }}

shared/constants/index.tsx

@@ -1,7 +1,7 @@
 export * from './platform'
 export * from './values'
 export * from './strings'
-export {useRouterState, makeScreen} from '@/stores/router'
+export {useRouterState, makeScreen, useRouteNavigation} from '@/stores/router'
 export * as Router2 from '@/stores/router'
 export * as Tabs from './tabs'
 export {useWaitingState} from '@/stores/waiting'

shared/constants/router.tsx

@@ -6,6 +6,7 @@ import {
   CommonActions,
   type NavigationContainerRef,
   useFocusEffect,
+  useRoute,
   createNavigationContainerRef,
   type NavigationState,
 } from '@react-navigation/core'
@@ -181,6 +182,13 @@ export const navigateUp = () => {
   return n?.dispatch(CommonActions.goBack())
 }
 
+const _routeIsVisible = (routeKey: string) => getVisibleScreen()?.key === routeKey
+
+export const navigateUpFromRoute = (routeKey: string) => {
+  if (!_routeIsVisible(routeKey)) return
+  return navigateUp()
+}
+
 export const popStack = () => {
   DEBUG_NAV && console.log('[Nav] popStack')
   const n = _getNavigator()
@@ -238,6 +246,20 @@ export const navigateAppend = (path: PathParam, replace?: boolean) => {
   n.dispatch(StackActions.push(routeName, params))
 }
 
+export const navigateAppendFromRoute = (routeKey: string, path: PathParam, replace?: boolean) => {
+  if (!_routeIsVisible(routeKey)) return
+  return navigateAppend(path, replace)
+}
+
+export const useRouteNavigation = () => {
+  const route = useRoute() as {key: string}
+  const routeKey = route.key
+  return {
+    navigateAppend: (path: PathParam, replace?: boolean) => navigateAppendFromRoute(routeKey, path, replace),
+    navigateUp: () => navigateUpFromRoute(routeKey),
+  }
+}
+
 export const switchTab = (name: Tabs.AppTab) => {
   DEBUG_NAV && console.log('[Nav] switchTab', {name})
   const n = _getNavigator()

shared/fs/browser/destination-picker.tsx

@@ -1,5 +1,5 @@
 import * as C from '@/constants'
-import {useSafeNavigation} from '@/util/safe-navigation'
+import {useRouteNavigation} from '@/constants/router'
 import * as FsCommon from '@/fs/common'
 import * as Kb from '@/common-adapters'
 import * as RowCommon from './rows/common'
@@ -46,7 +46,7 @@ const ConnectedDestinationPicker = (ownProps: OwnProps) => {
     })
   )
 
-  const nav = useSafeNavigation()
+  const nav = useRouteNavigation()
   const clearModals = C.useRouterState(s => s.dispatch.clearModals)
   const onBackUp =
     isShare || !canBackUp(parentPath)
@@ -57,14 +57,14 @@ const ConnectedDestinationPicker = (ownProps: OwnProps) => {
     ? () => {
         moveOrCopy(parentPath, 'copy')
         clearModals()
-        nav.safeNavigateAppend({name: 'fsRoot', params: {path: parentPath}})
+        nav.navigateAppend({name: 'fsRoot', params: {path: parentPath}})
       }
     : undefined
   const onMoveHere = isMovable
     ? () => {
         moveOrCopy(parentPath, 'move')
         clearModals()
-        nav.safeNavigateAppend({name: 'fsRoot', params: {path: parentPath}})
+        nav.navigateAppend({name: 'fsRoot', params: {path: parentPath}})
       }
     : undefined
   const onNewFolder =

shared/fs/common/use-open.tsx

@@ -1,6 +1,6 @@
 import * as C from '@/constants'
 import * as T from '@/constants/types'
-import {useSafeNavigation} from '@/util/safe-navigation'
+import {useRouteNavigation} from '@/constants/router'
 import {useFSState} from '@/stores/fs'
 import * as FS from '@/stores/fs'
 
@@ -16,10 +16,10 @@ export const useOpen = (props: Props) => {
       return {destPicker: destinationPicker, pathItems}
     })
   )
-  const nav = useSafeNavigation()
+  const nav = useRouteNavigation()
 
   if (typeof props.destinationPickerIndex !== 'number') {
-    return () => nav.safeNavigateAppend({name: 'fsRoot', params: {path: props.path}})
+    return () => nav.navigateAppend({name: 'fsRoot', params: {path: props.path}})
   }
 
   const isFolder =

shared/fs/nav-header/title.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 import * as T from '@/constants/types'
 import * as Kb from '@/common-adapters'
 import * as Kbfs from '../common'
-import {useSafeNavigation} from '@/util/safe-navigation'
+import {useRouteNavigation} from '@/constants/router'
 import * as FS from '@/stores/fs'
 
 type Props = {
@@ -20,11 +20,11 @@ const Breadcrumb = (props: Props) => {
           .slice(1, -1)
           .reduce((list, current) => [...list, T.FS.pathConcat(list.at(-1), current)], [FS.defaultPath])
   const {inDestinationPicker} = props
-  const nav = useSafeNavigation()
+  const nav = useRouteNavigation()
   const onOpenPath = (path: T.FS.Path) => {
     inDestinationPicker
       ? FS.makeActionsForDestinationPickerOpen(0, path)
-      : nav.safeNavigateAppend({name: 'fsRoot', params: {path}})
+      : nav.navigateAppend({name: 'fsRoot', params: {path}})
   }
 
   const makePopup = (p: Kb.Popup2Parms) => {

shared/fs/simple-screens/oops.tsx

@@ -1,7 +1,7 @@
 import * as T from '@/constants/types'
 import * as C from '@/constants'
 import * as Kb from '@/common-adapters'
-import {useSafeNavigation} from '@/util/safe-navigation'
+import {useRouteNavigation} from '@/constants/router'
 
 type OwnProps = {
   path: T.FS.Path
@@ -98,9 +98,9 @@ const NonExistent = (props: Props) => (
 )
 
 const Oops = (props: OwnProps) => {
-  const nav = useSafeNavigation()
+  const nav = useRouteNavigation()
   const openParent = () =>
-    nav.safeNavigateAppend({name: 'fsRoot', params: {path: T.FS.getPathParent(props.path)}})
+    nav.navigateAppend({name: 'fsRoot', params: {path: T.FS.getPathParent(props.path)}})
   switch (props.reason) {
     case T.FS.SoftError.NoAccess:
       return <NoAccess {...props} openParent={openParent} />

shared/git/select-channel.tsx

@@ -1,6 +1,6 @@
 import * as Git from '@/stores/git'
 import * as Teams from '@/stores/teams'
-import {useSafeNavigation} from '@/util/safe-navigation'
+import {useRouteNavigation} from '@/constants/router'
 import * as Kb from '@/common-adapters'
 import * as React from 'react'
 import type * as T from '@/constants/types'
@@ -20,10 +20,10 @@ const SelectChannel = (ownProps: OwnProps) => {
   const waiting = channelMetas.size === 0 // TODO fix this?
   const channelNames = [...channelMetas.values()].map(info => info.channelname)
   const [selected, setSelected] = React.useState(_selected)
-  const nav = useSafeNavigation()
+  const nav = useRouteNavigation()
   const setTeamRepoSettings = Git.useGitState(s => s.dispatch.setTeamRepoSettings)
   const onSubmit = (channelName: string) => setTeamRepoSettings(channelName, teamname, repoID, false)
-  const onCancel = () => nav.safeNavigateUp()
+  const onCancel = () => nav.navigateUp()
 
   const submit = () => {
     onSubmit(selected)

shared/login/recover-password/prompt-reset-shared.tsx

@@ -1,7 +1,7 @@
 import * as C from '@/constants'
 import * as AutoReset from '@/stores/autoreset'
 import * as Kb from '@/common-adapters'
-import {useSafeNavigation} from '@/util/safe-navigation'
+import {useRouteNavigation} from '@/constants/router'
 import * as T from '@/constants/types'
 import {SignupScreen} from '@/signup/common'
 import type {ButtonType} from '@/common-adapters/button'
@@ -12,7 +12,7 @@ export type Props = {
 }
 
 const PromptReset = (props: Props) => {
-  const nav = useSafeNavigation()
+  const nav = useRouteNavigation()
   const skipPassword = AutoReset.useAutoResetState(s => s.skipPassword)
   const error = AutoReset.useAutoResetState(s => s.error)
   const resetAccount = AutoReset.useAutoResetState(s => s.dispatch.resetAccount)
@@ -25,7 +25,7 @@ const PromptReset = (props: Props) => {
   const onContinue = () => {
     // dont do this in preflight
     if (C.androidIsTestDevice) {
-      nav.safeNavigateUp()
+      nav.navigateUp()
       return
     }
     if (resetPassword) {
@@ -34,14 +34,14 @@ const PromptReset = (props: Props) => {
     if (skipPassword) {
       resetAccount()
     } else {
-      nav.safeNavigateAppend('resetKnowPassword', true)
+      nav.navigateAppend('resetKnowPassword', true)
     }
   }
   const onBack = () => {
     if (skipPassword) {
       startRecoverPassword({replaceRoute: true, username})
     } else {
-      nav.safeNavigateUp()
+      nav.navigateUp()
     }
   }
   const title = props.resetPassword ? 'Reset password' : skipPassword ? 'Recover password' : 'Account reset'