Skip to content

Commit

Permalink
Merge pull request #585 from logion-network/feature/merge-protection-…
Browse files Browse the repository at this point in the history
…recovery

Merge protection and recovery
  • Loading branch information
gdethier authored Jun 28, 2024
2 parents aaf2c5a + 8b73f6e commit 1d89c94
Show file tree
Hide file tree
Showing 31 changed files with 485 additions and 2,006 deletions.
9 changes: 0 additions & 9 deletions public/assets/lgnt.svg

This file was deleted.

Binary file removed public/assets/recovery-process.png
Binary file not shown.
12 changes: 0 additions & 12 deletions src/components/coin/CoinIcon.test.tsx

This file was deleted.

15 changes: 0 additions & 15 deletions src/components/coin/CoinIcon.tsx

This file was deleted.

10 changes: 0 additions & 10 deletions src/components/coin/__snapshots__/CoinIcon.test.tsx.snap

This file was deleted.

14 changes: 0 additions & 14 deletions src/wallet-user/UserDashboard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
HOME_PATH,
TRUST_PROTECTION_PATH,
SETTINGS_PATH,
RECOVERY_PATH,
locRequestsPath,
ISSUER_PATH,
TRANSACTIONS_PATH,
Expand Down Expand Up @@ -167,19 +166,6 @@ export default function UserDashboard() {
background: colorTheme.bottomMenuItems.iconGradient,
},
});
menuBottom.push({
id: "recovery",
text: "Recovery",
to: RECOVERY_PATH,
exact: true,
icon: {
icon: {
id: 'recovery'
},
background: colorTheme.recoveryItems.iconGradient,
},
onClick: refreshAll,
});
}

return (
Expand Down
2 changes: 0 additions & 2 deletions src/wallet-user/UserPaths.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ export const TRUST_PROTECTION_RELATIVE_PATH = '/protection';
export const TRUST_PROTECTION_PATH = USER_PATH + TRUST_PROTECTION_RELATIVE_PATH;
export const SETTINGS_RELATIVE_PATH = '/settings';
export const SETTINGS_PATH = USER_PATH + SETTINGS_RELATIVE_PATH;
export const RECOVERY_RELATIVE_PATH = '/recovery';
export const RECOVERY_PATH = USER_PATH + RECOVERY_RELATIVE_PATH;
export const WALLET_RELATIVE_PATH = '/wallet';
export const VAULT_RELATIVE_PATH = '/vault';
export const ISSUER_RELATIVE_PATH = '/verified-issuer';
Expand Down
3 changes: 0 additions & 3 deletions src/wallet-user/UserRouter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
import {
TRUST_PROTECTION_RELATIVE_PATH,
SETTINGS_RELATIVE_PATH,
RECOVERY_RELATIVE_PATH,
TRANSACTIONS_RELATIVE_PATH,
VAULT_TRANSACTIONS_RELATIVE_PATH,
SETTINGS_PATH,
Expand Down Expand Up @@ -36,7 +35,6 @@ import { useCommonContext } from "../common/CommonContext";
import { useUserContext } from "./UserContext";
import Home from "./home/Home";
import TrustProtection from "./protection/TrustProtection";
import Recovery from "./recovery/Recovery";
import { useLogionChain } from '../logion-chain';
import IdentityLocRequest from "../loc/IdentityLocRequest";
import IssuerDashboard from "./issuer/IssuerDashboard";
Expand All @@ -63,7 +61,6 @@ export default function UserRouter() {
<Routes>
<Route path={ TRUST_PROTECTION_RELATIVE_PATH } element={ <TrustProtection />} />
<Route path={ SETTINGS_RELATIVE_PATH } element={ <Settings showContactInformation={ false } /> } />
<Route path={ RECOVERY_RELATIVE_PATH } element={ <Recovery /> } />
<Route path={ TRANSACTIONS_RELATIVE_PATH } element={ <Transactions
account={ accounts!.current?.accountId! }
balance={ balanceState?.balance || null }
Expand Down
32 changes: 0 additions & 32 deletions src/wallet-user/__snapshots__/UserDashboard.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,6 @@ exports[`UserDashboard Given connected and account, then renders with router 1`]
"text": "Settings",
"to": "/user/settings",
},
Object {
"exact": true,
"icon": Object {
"background": Object {
"from": "#7a90cb",
"to": "#3b6cf4",
},
"icon": Object {
"id": "recovery",
},
},
"id": "recovery",
"onClick": [Function],
"text": "Recovery",
"to": "/user/recovery",
},
]
}
menuMiddle={
Expand Down Expand Up @@ -183,22 +167,6 @@ exports[`UserDashboard Given disconnected and accounts then empty 1`] = `
"text": "Settings",
"to": "/user/settings",
},
Object {
"exact": true,
"icon": Object {
"background": Object {
"from": "#7a90cb",
"to": "#3b6cf4",
},
"icon": Object {
"id": "recovery",
},
},
"id": "recovery",
"onClick": [Function],
"text": "Recovery",
"to": "/user/recovery",
},
]
}
menuMiddle={
Expand Down
4 changes: 0 additions & 4 deletions src/wallet-user/__snapshots__/UserRouter.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ exports[`renders 1`] = `
}
path="/settings"
/>
<Route
element={<Recovery />}
path="/recovery"
/>
<Route
element={
<Transactions
Expand Down
Loading

0 comments on commit 1d89c94

Please sign in to comment.