Skip to content

Fix: Delete workspace flow #59162

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.

Sign up for GitHub

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

Merged
mountiny merged 3 commits into from
Apr 17, 2025
Merged

Fix: Delete workspace flow #59162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82ff45a
fix getting history entry when navigating back in react-navigation
adamgrzybowski Mar 26, 2025
8c87f49
change navigate to goBack
adamgrzybowski Mar 26, 2025
94aa13b
Merge branch 'main' into @adamgrzybowski/fix-delete-workspace-flow
adamgrzybowski Apr 17, 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
0 ...hes/@react-navigation+native+6.1.12.patch → ...avigation+native+6.1.12+001+initial.patch
View file
Open in desktop
File renamed without changes.
13 changes: 13 additions & 0 deletions .../@react-navigation+native+6.1.12+002+fix-getting-history-entry-when-navigating-back.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/node_modules/@react-navigation/native/lib/module/useLinking.js b/node_modules/@react-navigation/native/lib/module/useLinking.js
index 95a0e32..adb25a0 100644
--- a/node_modules/@react-navigation/native/lib/module/useLinking.js
+++ b/node_modules/@react-navigation/native/lib/module/useLinking.js
@@ -294,7 +294,7 @@ export default function useLinking(ref, _ref) {
try {
if (nextIndex !== -1 && nextIndex < currentIndex &&
// We should only go back if the entry exists and it's less than current index
- history.get(nextIndex - currentIndex)) {
+ history.get(nextIndex)) {
Comment thread
mountiny marked this conversation as resolved.
// An existing entry for this path exists and it's less than current index, go back to that
await history.go(nextIndex - currentIndex);
Comment thread
adamgrzybowski marked this conversation as resolved.
history.replace({
2 changes: 1 addition & 1 deletion src/libs/PolicyUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ function getPolicyEmployeeListByIdWithoutCurrentUser(policies: OnyxCollection<Pi
}

function goBackFromInvalidPolicy() {
Navigation.navigate(ROUTES.SETTINGS_WORKSPACES.route);
Navigation.goBack(ROUTES.SETTINGS_WORKSPACES.route);
}

/** Get a tax with given ID from policy */
Expand Down