Merge pull request #541 from logion-network/feature/direct-protection

Review-less protection
logion-network · Feb 2, 2024 · 017ec47 · 017ec47
2 parents dfc1e6f + d22f431
commit 017ec47
Show file tree

Hide file tree

Showing 27 changed files with 72 additions and 804 deletions.
diff --git a/src/legal-officer/ContextualizedWallet.tsx b/src/legal-officer/ContextualizedWallet.tsx
@@ -7,7 +7,6 @@ import { useCommonContext } from '../common/CommonContext';
 
 import {
     HOME_PATH,
-    PROTECTION_REQUESTS_PATH,
     RECOVERY_REQUESTS_PATH,
     SETTINGS_PATH,
     WALLET_PATH,
@@ -145,22 +144,6 @@ export default function ContextualizedWallet() {
             <Dashboard
                 menuTop={ menuTop }
                 menuMiddle={[
-                    {
-                        id: "protection",
-                        text: "Protection Management",
-                        to: PROTECTION_REQUESTS_PATH,
-                        exact: true,
-                        icon: {
-                            icon: {
-                                id: 'shield',
-                                hasVariants: true,
-                            },
-                            height: 'auto',
-                            width: '60px',
-                        },
-                        onClick: refreshAll,
-                        disabled: currentLegalOfficerUnavailable,
-                    },
                     {
                         id: "vault",
                         text: "Vault-out Requests",

diff --git a/src/legal-officer/LegalOfficerPaths.tsx b/src/legal-officer/LegalOfficerPaths.tsx
@@ -10,9 +10,6 @@ import {
 
 export const HOME_PATH = LEGAL_OFFICER_PATH;
 
-export const PROTECTION_REQUESTS_RELATIVE_PATH = '/protection';
-export const PROTECTION_REQUESTS_PATH = LEGAL_OFFICER_PATH + PROTECTION_REQUESTS_RELATIVE_PATH;
-
 export const RECOVERY_REQUESTS_RELATIVE_PATH = '/recovery';
 export const RECOVERY_REQUESTS_PATH = LEGAL_OFFICER_PATH + RECOVERY_REQUESTS_RELATIVE_PATH;
 

diff --git a/src/legal-officer/LegalOfficerRouter.tsx b/src/legal-officer/LegalOfficerRouter.tsx
@@ -1,7 +1,6 @@
 import { Routes, Route, Navigate } from 'react-router-dom';
 
 import {
-    PROTECTION_REQUESTS_RELATIVE_PATH,
     RECOVERY_REQUESTS_RELATIVE_PATH,
     SETTINGS_RELATIVE_PATH,
     RECOVERY_DETAILS_RELATIVE_PATH,
@@ -26,7 +25,6 @@ import {
 } from './LegalOfficerPaths';
 
 import Home from './Home';
-import ProtectionRequests from './ProtectionRequests';
 import RecoveryRequests from './RecoveryRequests';
 import Settings from '../settings/Settings';
 import RecoveryDetails from "./RecoveryDetails";
@@ -88,7 +86,6 @@ export default function LegalOfficerRouter() {
 
     return (
         <Routes>
-            <Route path={ PROTECTION_REQUESTS_RELATIVE_PATH } element={ <ProtectionRequests /> } />
             <Route path={ VAULT_OUT_REQUESTS_RELATIVE_PATH } element={ <VaultOutRequests /> } />
             <Route path={ RECOVERY_REQUESTS_RELATIVE_PATH } element={ <RecoveryRequests /> } />
             <Route path={ RECOVERY_DETAILS_RELATIVE_PATH } element={ <RecoveryDetails /> } />

diff --git a/src/legal-officer/PendingProtectionRequests.test.tsx b/src/legal-officer/PendingProtectionRequests.test.tsx
diff --git a/src/legal-officer/ProtectionRequests.css b/src/legal-officer/ProtectionRequests.css
diff --git a/src/legal-officer/ProtectionRequests.test.tsx b/src/legal-officer/ProtectionRequests.test.tsx
diff --git a/src/legal-officer/ProtectionRequests.tsx b/src/legal-officer/ProtectionRequests.tsx
diff --git a/src/legal-officer/ProtectionRequestsHistory.test.tsx b/src/legal-officer/ProtectionRequestsHistory.test.tsx
diff --git a/src/legal-officer/ProtectionRequestsHistory.tsx b/src/legal-officer/ProtectionRequestsHistory.tsx
diff --git a/src/legal-officer/RecoveryDetails.tsx b/src/legal-officer/RecoveryDetails.tsx
@@ -61,10 +61,11 @@ export default function RecoveryDetails() {
         const currentAddress = accounts!.current!.accountId.address;
         const lost = recoveryInfo!.accountToRecover!.requesterAddress;
         const rescuer = recoveryInfo!.recoveryAccount.requesterAddress;
-        await acceptProtectionRequest(axiosFactory!(currentAddress)!, {
-            requestId: requestId!,
-        });
+
         if (await alreadyVouched(lost, rescuer, currentAddress)) {
+            await acceptProtectionRequest(axiosFactory!(currentAddress)!, {
+                requestId: requestId!,
+            });
             refreshRequests!(false);
             navigate(RECOVERY_REQUESTS_PATH);
         } else {
@@ -77,7 +78,10 @@ export default function RecoveryDetails() {
                     signerId: currentAddress,
                     submittable,
                     callback,
-                })
+                });
+                await acceptProtectionRequest(axiosFactory!(currentAddress)!, {
+                    requestId: requestId!,
+                });
             };
             try {
                 await submitCall(call);