Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement flexible bottom tab bar #49539

Merged
merged 499 commits into from
Feb 12, 2025
Merged
Changes from 3 commits
Commits
Show all changes
499 commits
Select commit Hold shift + click to select a range
097d3c5
Unification of comments in Navigation.ts
WojtekBoman Dec 11, 2024
0ae4aac
Fix goBack in navigateToConciergeChatAndDeleteReport
WojtekBoman Dec 11, 2024
7345d80
Merge pull request #142 from software-mansion-labs/poc/bottom-tab-cle…
WojtekBoman Dec 11, 2024
ade9a19
Merge branch 'main' into poc/split-navs
WojtekBoman Dec 11, 2024
27c6f92
Simplify ActiveWorkspaceContextProvider
WojtekBoman Dec 12, 2024
96289b1
Adjust BaseSidebarScreen workspace reset hook to split navigators
WojtekBoman Dec 12, 2024
18ad376
Remove Navigation.switchPolicyID
WojtekBoman Dec 12, 2024
14068c4
Adjust createInverseRelation, fix SPLIT_TO_SIDEBAR
WojtekBoman Dec 12, 2024
0a11e29
Fix Navigation.popToTop
WojtekBoman Dec 12, 2024
5117a9f
Adjust ResizeScreenTests to SplitNavigator structure
WojtekBoman Dec 13, 2024
08f5c9d
Fix goBack types
WojtekBoman Dec 13, 2024
579608e
Remove useNavigationResetRootOnLayoutChange
WojtekBoman Dec 13, 2024
79202d1
Fix go back using swipe from not found policy page
WojtekBoman Dec 17, 2024
9f5bccb
Hide bottom tab on workspace initial page when policy is not found
WojtekBoman Dec 17, 2024
faeaf9a
Simplify getAdaptedState
WojtekBoman Dec 17, 2024
e7a5150
Add comment to NAVIGATORS.WORKSPACE_SPLIT_NAVIGATOR linking config
WojtekBoman Dec 18, 2024
49c49f9
Handle adding SettingsSplit under WorkspaceSplit in getAdaptedState
WojtekBoman Dec 18, 2024
4620ac7
Add shouldDisplayPolicyNotFoundPage
WojtekBoman Dec 18, 2024
f405f7e
Simplify getRoutePolicyID
WojtekBoman Dec 18, 2024
2e08e1e
Remove backTo param from Workspace Initial Page
WojtekBoman Dec 18, 2024
3e7f16c
Merge pull request #154 from software-mansion-labs/poc/fix-adapt-state
adamgrzybowski Dec 18, 2024
c611aa2
fix copying params for sidebar in adaptStateIfNecessary
adamgrzybowski Dec 18, 2024
7438d33
implement TopLevelBottomTabBar and proper animations
adamgrzybowski Dec 20, 2024
88b9998
Merge pull request #155 from software-mansion-labs/poc/top-level-bott…
adamgrzybowski Dec 20, 2024
28ed8b9
Merge branch 'main' into poc/split-navs
WojtekBoman Dec 20, 2024
99fc247
Fix lint
WojtekBoman Dec 20, 2024
17759f4
Remove Navigation.popToTop and add shouldPopToTop to GoBackOptions
WojtekBoman Dec 20, 2024
1480723
Fix types in getAdaptedStateFromPath
WojtekBoman Dec 20, 2024
af2058d
Add splitNavigator to RootNavigatorOptions
WojtekBoman Dec 30, 2024
98247e3
Merge branch 'main' into poc/split-navs
WojtekBoman Dec 30, 2024
e5fa16b
Merge branch 'main' into poc/split-navs
WojtekBoman Jan 7, 2025
4b2949d
Add resetPolicyIDInNavigationState
WojtekBoman Jan 9, 2025
0a07ab6
add final review adjustments
adamgrzybowski Jan 9, 2025
94f9dfb
remove index file for helpers
adamgrzybowski Jan 9, 2025
1b32364
Fix navigating to workspaces list using settings tab button
WojtekBoman Jan 9, 2025
2d6951a
remove isSplitNavigatorName
adamgrzybowski Jan 9, 2025
84a15f5
Merge pull request #157 from software-mansion-labs/poc/split-reset-po…
WojtekBoman Jan 9, 2025
c81e83d
Merge branch 'main' into poc/split-navs
WojtekBoman Jan 9, 2025
9fbe3d3
Merge branch 'poc/split-navs' into poc/final-review-adjustments
adamgrzybowski Jan 9, 2025
e22f82a
Merge pull request #158 from software-mansion-labs/poc/final-review-a…
adamgrzybowski Jan 9, 2025
e575d1b
fix resetPolicyIDInNavigationState
adamgrzybowski Jan 9, 2025
f4ef875
fix ts problems
adamgrzybowski Jan 9, 2025
3bc1739
Split BOTTOM_TABS const to a separate file to fix imports
Kicu Jan 10, 2025
03e6a6d
Move setNavigationActionToMicrotaskQueue to Navigation.ts
WojtekBoman Dec 23, 2024
c4fa287
Add tests for Navigation.goBack
WojtekBoman Dec 23, 2024
4a6766e
Add tests for Navigation.goBack with comparing route params
WojtekBoman Dec 23, 2024
3acba0a
Add test for going back to previous split
WojtekBoman Dec 30, 2024
5232577
Cleanup and group go back tests
WojtekBoman Dec 31, 2024
0b6c39f
Add test for going back to the page present in the split navigator th…
WojtekBoman Dec 31, 2024
a22cf59
Add NavigateTests
WojtekBoman Dec 31, 2024
3a9fd70
Add SwitchPolicyIDTests
WojtekBoman Jan 7, 2025
c404c02
Create package for navigation tests
WojtekBoman Jan 7, 2025
3960579
Move setNavigationActionToMicrotaskQueue to helpers
WojtekBoman Jan 10, 2025
8bc926d
Refactor old names in nav tests
WojtekBoman Jan 10, 2025
9c9d28c
Move TestNavigationContainer to test utils
WojtekBoman Jan 10, 2025
b21cb6a
Merge pull request #156 from software-mansion-labs/poc/go-back-tests
adamgrzybowski Jan 10, 2025
6589e68
fix tests
adamgrzybowski Jan 10, 2025
f05d53c
fix lint
adamgrzybowski Jan 10, 2025
8648ce7
fix tests v2
adamgrzybowski Jan 10, 2025
3af5702
Adjust useBottomTabIsFocused to splits
WojtekBoman Jan 8, 2025
e07c4f5
Merge branch 'main' into poc/split-navs
WojtekBoman Jan 14, 2025
d514067
Mock TopLevelBottomTabBar in navigation tests
WojtekBoman Jan 14, 2025
5f90743
Fix lint in ReportUtils
WojtekBoman Jan 14, 2025
0812be8
Merge branch 'main' into poc/split-navs
WojtekBoman Jan 16, 2025
c1d8459
Add LinkToOptions
WojtekBoman Jan 14, 2025
c11217d
Adjust navigate calls to LinkToOptions
WojtekBoman Jan 16, 2025
f1bc522
Add backTo param to SelectDelegateRolePage
WojtekBoman Jan 16, 2025
52ce458
fix tooltips for sidebar list
adamgrzybowski Jan 16, 2025
667a052
fix tooltipis on bottom tab bar
adamgrzybowski Jan 16, 2025
21be090
remove leftover style
adamgrzybowski Jan 16, 2025
114b059
Merge pull request #159 from software-mansion-labs/poc/link-to-options
WojtekBoman Jan 16, 2025
36c1238
fix fab tooltip
adamgrzybowski Jan 16, 2025
6d1010f
fix tests and typecheck
adamgrzybowski Jan 16, 2025
2b5299a
Merge pull request #160 from software-mansion-labs/poc/split-tooltips
adamgrzybowski Jan 16, 2025
50f36ea
fix tests v2
adamgrzybowski Jan 16, 2025
ac8a578
change name to isTooltipAllowed
adamgrzybowski Jan 16, 2025
072f0d9
Merge branch 'main' into poc/split-navs
WojtekBoman Jan 16, 2025
8292c1e
fix tests v3
adamgrzybowski Jan 16, 2025
133e7d2
Add optional chaining to useIsBottomTabVisibleDirectly
WojtekBoman Jan 17, 2025
a7207b8
Merge branch 'main' into poc/split-navs
adamgrzybowski Jan 17, 2025
12cf649
Merge branch 'main' into poc/split-navs
WojtekBoman Jan 17, 2025
0da271f
remove unnecessary line
adamgrzybowski Jan 17, 2025
e6a96a4
Merge branch 'main' into poc/split-navs
WojtekBoman Jan 20, 2025
52c7e39
Fix dismissModal in submitPerDiemExpense
WojtekBoman Jan 20, 2025
29d62e7
Merge branch 'main' into poc/split-navs
WojtekBoman Jan 20, 2025
8a45900
create SidebarSpacerWrapper
adamgrzybowski Jan 21, 2025
4bade3d
reorganize screen options
adamgrzybowski Jan 21, 2025
eb76552
fix naming for createSplitNavigator
adamgrzybowski Jan 21, 2025
8c879b0
Fix issue: Web - App opens invite member confirmation page when press…
WojtekBoman Jan 22, 2025
905e986
Merge pull request #163 from software-mansion-labs/splits/fix-safari-…
adamgrzybowski Jan 22, 2025
1b051fd
Fix issue: Workspace settings - Clicking RHP back button does not clo…
WojtekBoman Jan 22, 2025
151f989
Merge pull request #164 from software-mansion-labs/poc/fixes-after-re…
WojtekBoman Jan 22, 2025
045a00f
fix stat index in adaptStateIfNecessary
adamgrzybowski Jan 22, 2025
9bd4941
Merge pull request #165 from software-mansion-labs/splits/fix-split-r…
adamgrzybowski Jan 22, 2025
76c44f9
fix bottom bar over composer on safari mobile
adamgrzybowski Jan 22, 2025
0988220
handle styles for platforms
adamgrzybowski Jan 22, 2025
fbf309c
improve comment
adamgrzybowski Jan 22, 2025
eed4ebc
Merge pull request #166 from software-mansion-labs/splits/fix-safar-b…
adamgrzybowski Jan 22, 2025
2d5107f
Fix search menu overflowing on scrolling on mobile
Kicu Jan 23, 2025
c973fa6
Fix contextual search item missing in router
Kicu Jan 23, 2025
e5fde2a
Merge pull request #167 from software-mansion-labs/kicu/help-navi-search
WojtekBoman Jan 23, 2025
f04858c
Cleanup split navigators code
WojtekBoman Jan 16, 2025
16e4838
Add persistentScreens props
WojtekBoman Jan 17, 2025
422db51
Add useIsCurrentRouteHome
WojtekBoman Jan 17, 2025
1eb0557
Add GetStateForActionHandlers docs
WojtekBoman Jan 17, 2025
20a6ae7
Add docs to showSettingsPage
WojtekBoman Jan 17, 2025
ca99a85
Exclude switchPolicyID logic to navigation helpers
WojtekBoman Jan 17, 2025
c336b80
Fix imports in FAB
WojtekBoman Jan 20, 2025
0c50bef
Remove unnecessary check in SearchPageNarrow
WojtekBoman Jan 20, 2025
d8eaaad
Add getTopmostReportsSplitNavigator
WojtekBoman Jan 20, 2025
4a5d43e
Add replaceWithSplitNavigator
WojtekBoman Jan 20, 2025
0fd49e5
Add warnings to handleOpenWorkspaceSplitAction
WojtekBoman Jan 22, 2025
0e88076
Exclude navigation tests to separate file
WojtekBoman Jan 22, 2025
fc5e1ec
Fix showing tooltips in OptionRowLHN
WojtekBoman Jan 23, 2025
49d50bb
Merge pull request #161 from software-mansion-labs/poc/code-cleanup
WojtekBoman Jan 23, 2025
1437b88
Fix issue: Desktop - Filter by WS - The E icon is misaligned on the r…
WojtekBoman Jan 23, 2025
ecba313
Fix issue: Expense - Amount editor RHP slides in from the right inste…
WojtekBoman Jan 23, 2025
d472353
Fix adding params to additionalAction in linkTo
WojtekBoman Jan 23, 2025
561bab6
Merge pull request #168 from software-mansion-labs/poc/fixes-after-re…
WojtekBoman Jan 23, 2025
7d7a0db
Merge branch 'main' into poc/split-navs
WojtekBoman Jan 23, 2025
ff4a363
Fix imports in InitialSettingsPage
WojtekBoman Jan 23, 2025
65838b5
fix position
adamgrzybowski Jan 23, 2025
c128d35
fix isTooltipAllowed timing issue
adamgrzybowski Jan 23, 2025
acb842c
simplify condition
adamgrzybowski Jan 23, 2025
d1f82ba
Merge pull request #169 from software-mansion-labs/splits/bottom-tab-…
adamgrzybowski Jan 23, 2025
406c209
Fix issue: Contact methods - Lets make sure it is you page appears twice
WojtekBoman Jan 24, 2025
e1778df
Fix issue: Web - Copilot - RHP is not dismissed after adding a copilot
WojtekBoman Jan 24, 2025
4cfdaa8
Fix issue: Workspace - Wrong navigation when opening workspace after …
WojtekBoman Jan 24, 2025
f1b1404
Run prettier
WojtekBoman Jan 24, 2025
750155c
fix xero export page nav bug
SzymczakJ Jan 24, 2025
55bc370
Merge branch 'poc/split-navs' into @szymczak/xero-export-page-nav-bug
SzymczakJ Jan 24, 2025
a0b57dc
Merge pull request #171 from software-mansion-labs/@szymczak/xero-exp…
SzymczakJ Jan 24, 2025
90dcc91
Fix issue: Scan expense - Selecting replace on the receipt of a scann…
WojtekBoman Jan 24, 2025
5bcc320
Merge pull request #170 from software-mansion-labs/poc/fixes-after-re…
WojtekBoman Jan 24, 2025
7b38421
Merge branch 'main' into poc/split-navs
WojtekBoman Jan 24, 2025
95b9ed9
fix blinking of bottom tab
adamgrzybowski Jan 24, 2025
dd31a78
Merge pull request #172 from software-mansion-labs/splits/fix-blinkin…
adamgrzybowski Jan 24, 2025
b6ab4cb
fix misalgined bottom tab bar on empty workspace list
adamgrzybowski Jan 24, 2025
0bd0bc8
Merge pull request #173 from software-mansion-labs/splits/fix-misalig…
adamgrzybowski Jan 24, 2025
b0c90fc
fix invoices - it's no here page
289Adam289 Jan 27, 2025
69745d5
Merge pull request #174 from software-mansion-labs/289Adam289/fix-nav…
289Adam289 Jan 27, 2025
55d7b0b
Fix issue: Expensify Card -App crashes when clicking Card limit/Limit…
WojtekBoman Jan 27, 2025
6474240
fix 2fa navi bug
SzymczakJ Jan 27, 2025
0347c3d
Merge pull request #176 from software-mansion-labs/@szymczak/fix-2fa-…
SzymczakJ Jan 27, 2025
d6fddec
Merge pull request #175 from software-mansion-labs/poc/fixes-after-re…
WojtekBoman Jan 27, 2025
9f4fe6f
fix SageIntacct wrong nav in out-of-pocket expenses
SzymczakJ Jan 27, 2025
e8c3815
Merge pull request #177 from software-mansion-labs/@szymczak/fix-sage…
SzymczakJ Jan 27, 2025
a17b7bb
Fix issue: Workflows - RHP opens not here page when returning from Ap…
WojtekBoman Jan 27, 2025
42fcb57
Merge pull request #179 from software-mansion-labs/poc/fixes-after-re…
WojtekBoman Jan 27, 2025
d9bfcf9
fix admins button dismiss modal crash
adamgrzybowski Jan 28, 2025
68f9160
Merge pull request #180 from software-mansion-labs/splits/fix-admins-…
adamgrzybowski Jan 28, 2025
0b4807d
Fix composer focus when navigating when starting new chat
Kicu Jan 27, 2025
2b169c0
Simplify ReportSplitNavigator
Kicu Jan 27, 2025
b4ab2d3
Simplify focusing logic and fix focusing composer after message edit.
Kicu Jan 28, 2025
20808cb
fix get physical card navigation flow
SzymczakJ Jan 28, 2025
427ba66
Merge pull request #182 from software-mansion-labs/@szymczak/fix–get–…
SzymczakJ Jan 28, 2025
44d3f19
fix hold modal
adamgrzybowski Jan 28, 2025
225ca63
Merge pull request #183 from software-mansion-labs/splits/fix-hold-modal
adamgrzybowski Jan 28, 2025
0e43795
Merge pull request #181 from software-mansion-labs/kicu/fix-composer-…
Kicu Jan 29, 2025
e1896b1
fix card not immediately appearing after assigning
SzymczakJ Jan 29, 2025
49f4491
Merge branch 'main' into poc/split-navs
WojtekBoman Jan 29, 2025
14e612f
Add CONST.NAVIGATION_TESTS
WojtekBoman Jan 29, 2025
9299ea3
Remove getTopmostRouteName and replace it with focusedRoute.
Kicu Jan 29, 2025
03f1271
Merge pull request #184 from software-mansion-labs/kicu/nav-cleantopmost
Kicu Jan 29, 2025
f1ba2dd
Merge pull request #186 from software-mansion-labs/@szymczak/card-not…
SzymczakJ Jan 29, 2025
35ffdfe
use proper backTo param
adamgrzybowski Jan 29, 2025
579a8b3
Merge pull request #187 from software-mansion-labs/splits/fix-wrong-r…
adamgrzybowski Jan 29, 2025
36ef0c3
Fix navigating to tag list view for multitags
Kicu Jan 29, 2025
c5d99ed
sync submodule with main
Kicu Jan 29, 2025
a29d2e2
Fix broken auth params when opening desktop App from deeplink.
Kicu Jan 30, 2025
1c88720
Merge pull request #188 from software-mansion-labs/kicu/nav-fix-multi…
Kicu Jan 30, 2025
0b2a175
Improve naming around resetting route params on logout
Kicu Jan 31, 2025
82b4f9d
Merge pull request #189 from software-mansion-labs/kicu/nav-fix-deskt…
Kicu Jan 31, 2025
b5e1778
Merge branch 'main' into poc/split-navs
WojtekBoman Jan 31, 2025
0f4090a
fix per diem nav bug
SzymczakJ Jan 31, 2025
445f747
Merge pull request #191 from software-mansion-labs/@szymczak/fix-per-…
SzymczakJ Jan 31, 2025
25054fe
fix bottom bar on not found view
adamgrzybowski Jan 31, 2025
38c0fd1
create goBackToHome
adamgrzybowski Jan 31, 2025
007b1ff
Merge pull request #192 from software-mansion-labs/splits/goBackToHome
adamgrzybowski Jan 31, 2025
ad50a6f
Fix issue: Workspace - Unable to close upgrade success modal with Got…
WojtekBoman Feb 3, 2025
9c5583f
Fix issue: Android - Workspace - Device back button returns to worksp…
WojtekBoman Feb 3, 2025
26d82cd
Fix issue: Distance - The ‘More features’ hyperlink redirects to a pa…
WojtekBoman Feb 3, 2025
1f8e5bd
Fix issue: Accounting - RHP for connection setup disappears after upg…
WojtekBoman Feb 3, 2025
71a853c
create container for bottomContent
adamgrzybowski Feb 3, 2025
1029f37
Merge pull request #194 from software-mansion-labs/splits/fix-bottom-…
adamgrzybowski Feb 3, 2025
64bea11
Merge pull request #193 from software-mansion-labs/poc/fixes-after-re…
adamgrzybowski Feb 3, 2025
2f6e5cc
Fix issue: Reports - Workspace switcher is not cleared after resettin…
WojtekBoman Feb 4, 2025
ac85b4e
Fix issue: Search-Menu with the saved search stays on the screen afte…
WojtekBoman Feb 4, 2025
c5ccc08
Fix issue: Private notes - User navigates to Private notes page when …
WojtekBoman Feb 4, 2025
286e640
Merge pull request #195 from software-mansion-labs/poc/fixes-after-re…
WojtekBoman Feb 4, 2025
7addc32
Merge branch 'main' into poc/split-navs
WojtekBoman Feb 5, 2025
9948ee1
fix issue: Workspace - RHP back button reopens member list after retu…
adamgrzybowski Feb 5, 2025
9ef25f7
fix issue: Multi tags-RHP returns to tag settings instead of tag deta…
adamgrzybowski Feb 5, 2025
b72775e
extract goBack
adamgrzybowski Feb 5, 2025
97df421
Merge pull request #196 from software-mansion-labs/splits/fix-some-go…
adamgrzybowski Feb 5, 2025
0c97c37
Fix issue: Hybrid - Expense Details - App crashes after tapping on 'G…
WojtekBoman Feb 5, 2025
0ff9667
Fix lint in WorkspaceProfilePage
WojtekBoman Feb 5, 2025
95fc9f0
Fix issue: Android - Workspace - No animation when opening workspace …
WojtekBoman Feb 5, 2025
f3d5e81
Merge pull request #197 from software-mansion-labs/poc/fixes-after-re…
adamgrzybowski Feb 5, 2025
3fdd3b0
Remove setActiveWorkspaceID from useMemo in ActiveWorkspaceProvider
WojtekBoman Feb 7, 2025
a330c14
Remove FULL_SCREEN_NAVIGATOR from NAVIGATORS
WojtekBoman Feb 7, 2025
31c6de4
remove unnecessary dependency
adamgrzybowski Feb 7, 2025
2a15f9b
fix condition for adding keys full screen blocking view
adamgrzybowski Feb 7, 2025
6afa9a7
Fix showing bottom side of pages displayed in ScreenWrapper
WojtekBoman Feb 7, 2025
8d2936c
Merge pull request #199 from software-mansion-labs/splits/review-fixes
WojtekBoman Feb 7, 2025
5a6b153
Remove withNavigation
WojtekBoman Feb 7, 2025
cb1bb00
Merge pull request #198 from software-mansion-labs/fix/poc-screen-wra…
WojtekBoman Feb 7, 2025
dffbb6d
improve bottom tab bar performance
adamgrzybowski Feb 7, 2025
7afde6e
fix commnet
adamgrzybowski Feb 7, 2025
649a987
Merge pull request #200 from software-mansion-labs/splits/fix-delayed…
adamgrzybowski Feb 7, 2025
4f00f36
Fix navigating back from CountrySelectionPage
WojtekBoman Feb 10, 2025
02ceecc
Remove unused prop from FreezeWrapper
WojtekBoman Feb 10, 2025
9c0f61a
Replace isEmpty with isEmptyObject in SplitRouter
WojtekBoman Feb 10, 2025
e042499
Fix CONST.NAVIGATION.ACTION_TYPE.SWITCH_POLICY_ID type in RootStackNa…
WojtekBoman Feb 10, 2025
6a5bb49
Fix function name in getIsScreenWithBottomTabFocused
WojtekBoman Feb 10, 2025
5cc046f
improve effect TopLevelBottomTabBar
adamgrzybowski Feb 10, 2025
2536565
Remove @TODO comments from Report.ts
WojtekBoman Feb 10, 2025
cfe1583
Wrap SearchPageNarrow with FreezeWrapper
WojtekBoman Feb 10, 2025
02e1088
Remove unnecessary comment from SearchPage component
WojtekBoman Feb 10, 2025
663cf56
Merge pull request #202 from software-mansion-labs/splits/review-fixe…
WojtekBoman Feb 10, 2025
74d9d1f
Merge pull request #201 from software-mansion-labs/poc/fixes-after-re…
WojtekBoman Feb 10, 2025
d0af1d5
Merge branch 'main' into poc/split-navs
WojtekBoman Feb 10, 2025
4dcbc80
improve comment
adamgrzybowski Feb 10, 2025
54fca6a
fix tests
adamgrzybowski Feb 10, 2025
7a94577
Merge pull request #203 from software-mansion-labs/splits/review-fixe…
adamgrzybowski Feb 10, 2025
94c53a2
fix name in createRootStackNavigator
adamgrzybowski Feb 10, 2025
803c6ef
remove todo comments
adamgrzybowski Feb 10, 2025
3249dac
fix comment
adamgrzybowski Feb 10, 2025
fdf57fe
fix reassure tests
adamgrzybowski Feb 10, 2025
adc0457
use SCREENS const
adamgrzybowski Feb 10, 2025
30644b5
Merge pull request #204 from software-mansion-labs/splits/review-fixe…
adamgrzybowski Feb 10, 2025
0acfc15
fix reassure tests v2
adamgrzybowski Feb 10, 2025
4ccf4d6
fix reassure tests v3
adamgrzybowski Feb 10, 2025
b2103e2
fix crash on AddPersonalBankAccountPage
adamgrzybowski Feb 10, 2025
f8e8d98
Add backTo when navigating to IOURequestStepTime
WojtekBoman Feb 10, 2025
3bafff4
Merge pull request #205 from software-mansion-labs/poc/fix-per-diem-g…
adamgrzybowski Feb 10, 2025
9237d3b
change fallbackRoute to backToRoute
adamgrzybowski Feb 11, 2025
eb8ec32
fix naming in root router
adamgrzybowski Feb 11, 2025
f134b1c
Merge branch 'main' into poc/split-navs
adamgrzybowski Feb 11, 2025
9a5140d
fix freeze related to iou start
adamgrzybowski Feb 11, 2025
0200ec4
fix goBack to iou start
adamgrzybowski Feb 11, 2025
408806c
Fix navigating from WorkspaceConfirmationPage on a wide layout
WojtekBoman Feb 11, 2025
c031dd7
Add ReportsSplitNavigator docs and adjust comment in ActiveWorkspaceP…
WojtekBoman Feb 11, 2025
d372bc2
Add displayName to TopLevelBottomTabBar
WojtekBoman Feb 11, 2025
178491f
Adjust params in getAllCardsForWorkspace
WojtekBoman Feb 11, 2025
5f8a034
Merge pull request #206 from software-mansion-labs/poc/fix-navigating…
adamgrzybowski Feb 11, 2025
f13005d
add comment for blocking view context
adamgrzybowski Feb 11, 2025
fb7296a
Adjust goBack functions in bank account pages
WojtekBoman Feb 11, 2025
06579cb
Merge branch 'main' into poc/split-navs
adamgrzybowski Feb 11, 2025
676d331
Merge branch 'main' into poc/split-navs
adamgrzybowski Feb 11, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/libs/Navigation/NavigationRoot.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import * as Session from '@userActions/Session';
import {updateOnboardingLastVisitedPath} from '@userActions/Welcome';
import {getOnboardingInitialPath} from '@userActions/Welcome/OnboardingFlow';
import CONST from '@src/CONST';
import NAVIGATORS from '@src/NAVIGATORS';
import ONYXKEYS from '@src/ONYXKEYS';
import type {Route} from '@src/ROUTES';
import ROUTES from '@src/ROUTES';
Expand Down Expand Up @@ -175,7 +176,21 @@ function NavigationRoot({authenticated, lastVisitedPath, initialUrl, onReady, sh
if (!lastRoute) {
return;
}
navigationRef.reset({...rootState, index: 0, routes: [{...lastRoute, params: {}}]});

// REPORTS_SPLIT_NAVIGATOR will persist after user logout, because it is used both for logged-in and logged-out users
// That's why for ReportsSplit we need to explicitly clear params when resetting navigation state,
// However in case other routes (related to login/logout) appear in nav state, then we want to preserve params for those
const isReportSplitNavigatorMounted = lastRoute.name === NAVIGATORS.REPORTS_SPLIT_NAVIGATOR;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const isReportSplitNavigatorMounted = lastRoute.name === NAVIGATORS.REPORTS_SPLIT_NAVIGATOR;
const isReportsSplitNavigatorMounted = lastRoute.name === NAVIGATORS.REPORTS_SPLIT_NAVIGATOR;

navigationRef.reset({
...rootState,
index: 0,
routes: [
{
...lastRoute,
params: isReportSplitNavigatorMounted ? undefined : lastRoute.params,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
params: isReportSplitNavigatorMounted ? undefined : lastRoute.params,
params: isReportsSplitNavigatorMounted ? undefined : lastRoute.params,

},
],
});
}, [authenticated, previousAuthenticated]);

const handleStateChange = (state: NavigationState | undefined) => {
Expand Down