Merge branch 'frontend-fix-route-passphrase-II'

Author: thisconnect

frontends/web/src/app.tsx

@@ -139,7 +139,6 @@ class App extends Component<Props, State> {
       currentURL.startsWith('/account-summary')
       || currentURL.startsWith('/add-account')
       || currentURL.startsWith('/settings/manage-accounts')
-      || currentURL.startsWith('/passphrase')
     )) {
       route('/', true);
       return;

frontends/web/src/routes/router.tsx

@@ -192,14 +192,14 @@ export const AppRouter = ({ devices, deviceIDs, devicesKey, accounts, activeAcco
         <Route path="pocket/:code" element={PocketEl} />
         <Route path="exchange/:code" element={ExchangeEl} />
       </Route>
-      <Route path="passphrase/:deviceID" element={PassphraseEl} />
       <Route path="manage-backups/:deviceID" element={ManageBackupsEl} />
       <Route path="accounts/select-receive" element={ReceiveAccountsSelectorEl} />
       <Route path="settings">
         <Route index element={MobileSettingsEl} />
         <Route path="appearance" element={AppearanceEl} />
         <Route path="about" element={AboutEl} />
         <Route path="device-settings/:deviceID" element={Device} />
+        <Route path="device-settings/passphrase/:deviceID" element={PassphraseEl} />
         <Route path="advanced-settings" element={AdvancedSettingsEl} />
         <Route path="electrum" element={<ElectrumSettings />} />
         <Route path="manage-accounts" element={

frontends/web/src/routes/settings/components/device-settings/passphrase-setting.tsx

@@ -28,7 +28,7 @@ const PassphraseSetting = ({ deviceID, passphraseEnabled }: TProps) => {
   const { t } = useTranslation();
   return (
     <SettingsItem
-      onClick={() => route(`/passphrase/${deviceID}`)}
+      onClick={() => route(`/settings/device-settings/passphrase/${deviceID}`)}
       settingName={t('deviceSettings.expert.passphrase.title')}
       secondaryText={t('deviceSettings.expert.passphrase.description')}
       displayedValue={ passphraseEnabled