[PR #1045] [MERGED] Update to React Router v5.1 conventions #3485

Closed
opened 2026-02-28 20:42:20 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/actualbudget/actual/pull/1045
Author: @trevdor
Created: 5/18/2023
Status: Merged
Merged: 5/20/2023
Merged by: @trevdor

Base: masterHead: trevdor-react-router-6


📝 Commits (10+)

  • 6fd277c Migrate to React Router v5.1 conventions
  • fc4350b PageWrapper not needed
  • 220e86e Release notes
  • d67158e Remove compat router
  • 12ea386 Revert "Remove compat router"
  • 2b5d346 PR feedback
  • 0f52185 PR feedback, part 2
  • ed584a6 Pass some missing props that used to come on the route match
  • 4f6a7d5 Merge remote-tracking branch 'origin/master' into trevdor-react-router-6
  • 232567c PR feedback - expandSplits doesn't need params.id

📊 Changes

9 files changed (+267 additions, -354 deletions)

View changed files

📝 packages/desktop-client/src/components/FinancesApp.js (+75 -108)
📝 packages/desktop-client/src/components/Modals.js (+96 -150)
📝 packages/desktop-client/src/components/Titlebar.js (+34 -50)
📝 packages/desktop-client/src/components/accounts/Account.js (+11 -15)
📝 packages/desktop-client/src/components/accounts/MobileAccount.js (+3 -5)
📝 packages/desktop-client/src/components/manager/ManagementApp.js (+32 -22)
📝 packages/desktop-client/src/components/modals/ManageRulesModal.js (+1 -1)
📝 packages/desktop-client/src/components/reports/index.js (+9 -3)
upcoming-release-notes/1045.md (+6 -0)

📄 Description

Makes the final move to v6 easier for https://github.com/actualbudget/actual/issues/822

Per the RR upgrade guide: https://reactrouter.com/en/main/upgrading/v5#upgrade-to-react-router-v51
Can't remove the v5-compat router until we're actually on 6. v5-compat's useNavigate seems to be replaced by redirect in v6, and that utility isn't in v5.

(Was gonna complete the upgrade to 6 all in one PR, but this is big enough as-is and this repo moves fast. Maybe someone else can do the final v6 bit before I can.)


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/actualbudget/actual/pull/1045 **Author:** [@trevdor](https://github.com/trevdor) **Created:** 5/18/2023 **Status:** ✅ Merged **Merged:** 5/20/2023 **Merged by:** [@trevdor](https://github.com/trevdor) **Base:** `master` ← **Head:** `trevdor-react-router-6` --- ### 📝 Commits (10+) - [`6fd277c`](https://github.com/actualbudget/actual/commit/6fd277c76e330e136ff619822204488187e841cd) Migrate to React Router v5.1 conventions - [`fc4350b`](https://github.com/actualbudget/actual/commit/fc4350be5142bff0fa2f218af37e97362ecb2b2c) PageWrapper not needed - [`220e86e`](https://github.com/actualbudget/actual/commit/220e86e48188264ac6b23f9f9ec45afeac7a6189) Release notes - [`d67158e`](https://github.com/actualbudget/actual/commit/d67158ebc8778fb667f9387e973fa570393ff7d5) Remove compat router - [`12ea386`](https://github.com/actualbudget/actual/commit/12ea386dae59dc84fc0e8059c1ffde8105fc6b39) Revert "Remove compat router" - [`2b5d346`](https://github.com/actualbudget/actual/commit/2b5d3461f3b177b8744bf024c07966dd61ff38a8) PR feedback - [`0f52185`](https://github.com/actualbudget/actual/commit/0f5218594d253d33596f1d6103bc9b5c3d264d9a) PR feedback, part 2 - [`ed584a6`](https://github.com/actualbudget/actual/commit/ed584a61436b3838f60204172463fe10f7065e0b) Pass some missing props that used to come on the route match - [`4f6a7d5`](https://github.com/actualbudget/actual/commit/4f6a7d5baa26f721218ec336d972aa4cb8bd3c54) Merge remote-tracking branch 'origin/master' into trevdor-react-router-6 - [`232567c`](https://github.com/actualbudget/actual/commit/232567cb2896415c2112af3762857fde1536b91c) PR feedback - expandSplits doesn't need params.id ### 📊 Changes **9 files changed** (+267 additions, -354 deletions) <details> <summary>View changed files</summary> 📝 `packages/desktop-client/src/components/FinancesApp.js` (+75 -108) 📝 `packages/desktop-client/src/components/Modals.js` (+96 -150) 📝 `packages/desktop-client/src/components/Titlebar.js` (+34 -50) 📝 `packages/desktop-client/src/components/accounts/Account.js` (+11 -15) 📝 `packages/desktop-client/src/components/accounts/MobileAccount.js` (+3 -5) 📝 `packages/desktop-client/src/components/manager/ManagementApp.js` (+32 -22) 📝 `packages/desktop-client/src/components/modals/ManageRulesModal.js` (+1 -1) 📝 `packages/desktop-client/src/components/reports/index.js` (+9 -3) ➕ `upcoming-release-notes/1045.md` (+6 -0) </details> ### 📄 Description Makes the final move to v6 easier for https://github.com/actualbudget/actual/issues/822 Per the RR upgrade guide: https://reactrouter.com/en/main/upgrading/v5#upgrade-to-react-router-v51 Can't remove the v5-compat router until we're actually on 6. v5-compat's `useNavigate` seems to be replaced by `redirect` in v6, and that utility isn't in v5. (Was gonna complete the upgrade to 6 all in one PR, but this is big enough as-is and this repo moves fast. Maybe someone else can do the final v6 bit before I can.) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-02-28 20:42:20 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/actual#3485