Cleanup and ordering, part1

src/common/WalletGauge.tsx

@@ -217,7 +217,7 @@ export default function WalletGauge(props: Props) {
                         <Spinner animation="border" />
                         <p>Transfer successful, waiting for the transaction to be finalized.</p>
                         <p>Note that this may take up to 30 seconds. If you want to proceed, you can safely
-                            click on cancel but your transaction may not show up yet.</p>
+                            click on close but your transaction may not show up yet.</p>
                     </Alert>
                 }
             </Dialog>

src/wallet-user/LocCreation.tsx → src/components/locrequest/LocRequestButton.tsx

@@ -1,7 +1,7 @@
 import { useCallback } from 'react';
 import { useNavigate } from "react-router-dom";
-import { requestLocPath } from "./UserRouter";
-import Button from '../common/Button';
+import { requestLocPath } from "../../wallet-user/UserPaths";
+import Button from '../../common/Button';
 import { LocType } from "@logion/node-api";
 
 export interface Props {
@@ -10,7 +10,7 @@ export interface Props {
     locType: LocType;
 }
 
-export default function LocCreation(props: Props) {
+export default function LocRequestButton(props: Props) {
     const { locType } = props;
     const navigate = useNavigate();
 

src/legal-officer/ContextualizedWallet.test.tsx → src/legal-officer/LegalOfficerDashboard.test.tsx

@@ -1,7 +1,7 @@
 jest.mock("../logion-chain");
 jest.mock("../common/CommonContext");
 
-import ContextualizedWallet from './ContextualizedWallet';
+import LegalOfficerDashboard from './LegalOfficerDashboard';
 import { DEFAULT_LEGAL_OFFICER } from "../common/TestData";
 import { shallowRender, mockAccount } from '../tests';
 import { setContextMock } from '../logion-chain/__mocks__/LogionChainMock';
@@ -14,6 +14,6 @@ test('renders', () => {
         ]
     });
     setCurrentAddress(DEFAULT_LEGAL_OFFICER_ACCOUNT);
-    const tree = shallowRender(<ContextualizedWallet />);
+    const tree = shallowRender(<LegalOfficerDashboard />);
     expect(tree).toMatchSnapshot();
 });

src/legal-officer/ContextualizedWallet.tsx → src/legal-officer/LegalOfficerDashboard.tsx

@@ -22,7 +22,7 @@ import { useLogionChain } from '../logion-chain';
 import WarningDialog from 'src/common/WarningDialog';
 import { MenuItemData } from 'src/common/MenuItem';
 
-export default function ContextualizedWallet() {
+export default function LegalOfficerDashboard() {
     const { accounts } = useLogionChain();
     const { colorTheme, refresh, availableLegalOfficers, backendConfig } = useCommonContext();
     const { refreshRequests, missingSettings, refreshLocs, refreshVotes } = useLegalOfficerContext();

src/legal-officer/LegalOfficerRouter.tsx

@@ -21,10 +21,10 @@ import {
     INVITED_CONTRIBUTORS_RELATIVE_PATH,
 } from './LegalOfficerPaths';
 
-import Home from './Home';
-import RecoveryRequests from './RecoveryRequests';
+import Home from './home/Home';
+import RecoveryRequests from './recovery/RecoveryRequests';
 import Settings from '../settings/Settings';
-import RecoveryDetails from "./RecoveryDetails";
+import RecoveryDetails from "./recovery/RecoveryDetails";
 import Transactions from "../common/Transactions";
 import LocDetails, { VoterLocDetails } from "../loc/LocDetails";
 import IdentityProtection from './transaction-protection/IdentityProtection';

src/legal-officer/Main.tsx

@@ -1,7 +1,7 @@
 import { useLogionChain } from '../logion-chain';
 
 import { LegalOfficerContextProvider } from './LegalOfficerContext';
-import ContextualizedWallet from './ContextualizedWallet';
+import LegalOfficerDashboard from './LegalOfficerDashboard';
 
 export default function LegalOfficerWallet() {
     const { injectedAccounts } = useLogionChain();
@@ -12,7 +12,7 @@ export default function LegalOfficerWallet() {
 
     return (
         <LegalOfficerContextProvider>
-            <ContextualizedWallet />
+            <LegalOfficerDashboard />
         </LegalOfficerContextProvider>
     );
 }