Upgrade react-router

Author: jmrossy

package.json

@@ -26,7 +26,7 @@
     "electron:build": "./scripts/build.sh -n Mainnet -e",
     "electron:start": "electron ./dist/main.js --enable-logging",
     "electron:dev": "yarn electron:build && yarn electron:start",
-    "electron:dist": "yarn electron:build && DEBUG=electron-builder electron-builder --publish never"
+    "electron:prod": "yarn electron:build && DEBUG=electron-builder electron-builder --publish never"
   },
   "dependencies": {
     "@celo-tools/celo-ethers-wrapper": "^0.0.5",
@@ -49,8 +49,8 @@
     "react-dom": "^17.0.2",
     "react-frappe-charts": "^4.0.0",
     "react-redux": "^7.2.5",
-    "react-router": "^6.0.0-beta.3",
-    "react-router-dom": "^6.0.0-beta.3",
+    "react-router": "^6.0.0-beta.4",
+    "react-router-dom": "^6.0.0-beta.4",
     "react-window": "^1.8.6",
     "redux-persist": "^6.0.0",
     "redux-saga": "^1.1.3",

src/app/App.tsx

@@ -76,7 +76,7 @@ export const App = () => {
           <UpdateBanner />
           <Routes>
             <Route path="/" element={<HomeNavigator />}>
-              <Route path="/" element={<HomeScreen />} />
+              <Route index element={<HomeScreen />} />
               <Route path="tx" element={<TransactionReview />} />
               <Route path="send" element={<SendFormScreen />} />
               <Route path="send-review" element={<SendConfirmationScreen />} />
@@ -93,7 +93,7 @@ export const App = () => {
               <Route path="balances" element={<BalanceDetailsScreen />} />
               <Route path="account" element={<ViewAccountScreen />} />
               <Route path="accounts" element={<AccountsNavigator />}>
-                <Route path="/" element={<AccountsAndContactsScreen />} />
+                <Route index element={<AccountsAndContactsScreen />} />
                 <Route path="add" element={<AddAccountScreen />} />
                 <Route path="create" element={<AddCreateScreen />} />
                 <Route path="derive" element={<AddDeriveScreen />} />
@@ -105,7 +105,7 @@ export const App = () => {
             </Route>
 
             <Route path="/setup" element={<OnboardingNavigator />}>
-              <Route path="/" element={<WelcomeScreen />} />
+              <Route index element={<WelcomeScreen />} />
               <Route path="new" element={<NewAccountScreen />} />
               <Route path="existing" element={<ImportChoiceScreen />} />
               <Route path="import" element={<ImportAccountScreen />} />

yarn.lock

@@ -7267,17 +7267,17 @@ react-redux@^7.2.5:
     prop-types "^15.7.2"
     react-is "^16.13.1"
 
-react-router-dom@^6.0.0-beta.3:
-  version "6.0.0-beta.3"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.0.0-beta.3.tgz#4f84a5e5717514d0a9aee9f6724d54b61cfd6387"
-  integrity sha512-F5HC/mEdZQvBNbxEFDfRfd1b+DPcNeHZgoreH98NJEJe3G1uonWatdtj+tVQ3VnUbg0TzCXa4mzKFZMey90v7A==
+react-router-dom@^6.0.0-beta.4:
+  version "6.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.0.0-beta.4.tgz#9cc9fb57bca3d5548b297ae8101efcdcc68dd903"
+  integrity sha512-yppoRR8S7FxNMG6OGFn9DPJBPLsjeIuQa7GYnkRlgOSTBSPhAQpD6z7rvRzZnesQ9r6W+ibD9RvnqTcna4w/Pg==
   dependencies:
-    react-router "6.0.0-beta.3"
+    react-router "6.0.0-beta.4"
 
-react-router@6.0.0-beta.3, react-router@^6.0.0-beta.3:
-  version "6.0.0-beta.3"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.0.0-beta.3.tgz#d1276202eee8a0269c6d24fc9be72d5448cc63ae"
-  integrity sha512-5fSBKgb0VaUrMi1RJxeZZMyGkjGSd9HtoWtc2XIcBFc01l7y6jBg5mVkmifjhhdSlamE3y6E6RXpfzCWqEBPPA==
+react-router@6.0.0-beta.4, react-router@^6.0.0-beta.4:
+  version "6.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.0.0-beta.4.tgz#e35a440b36fd07a2ac854e1f1f176b56a777793a"
+  integrity sha512-48JRRZJOwmfOKM12Tv3WjmNkVb2NpSEgDTWC4+MEJaud0+eyLJxqy62CKzOydMlk7hrfRFpC/elUYSZAuyx3qA==
 
 react-window@^1.8.6:
   version "1.8.6"