Merge pull request #582 from logion-network/fix/create-or-update-llo

Fix create or update llo

package.json

@@ -10,7 +10,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@creativecommons/cc-assets": "^0.1.0",
-    "@logion/client": "^0.46.0-2",
+    "@logion/client": "^0.46.0-6",
     "@logion/client-browser": "^0.3.5",
     "@logion/crossmint": "^0.1.32",
     "@logion/extension": "^0.8.1",

src/legal-officer/TestData.tsx

@@ -1,6 +1,5 @@
 import { DateTime } from 'luxon';
-import { toIsoString } from "@logion/client";
-import { ProtectionRequest } from '@logion/client/dist/RecoveryClient.js';
+import { toIsoString, ProtectionRequest } from "@logion/client";
 
 import { DEFAULT_LEGAL_OFFICER, ANOTHER_LEGAL_OFFICER } from "../common/TestData";
 
@@ -29,7 +28,6 @@ export const RECOVERY_REQUESTS_HISTORY: ProtectionRequest[] = [
             country: "Belgium",
         },
         createdOn: toIsoString(DateTime.fromISO('2021-06-10T11:40:00.000', {zone: "utc"})),
-        isRecovery: true,
         addressToRecover: "5EsuBEtGbx8DoKTcKYDceJudEuzzHSS6GBPhbaPh4rsYsuoL",
         status: "PENDING"
     }

src/legal-officer/recovery/RecoveryRequestStatus.tsx

@@ -1,4 +1,4 @@
-import { ProtectionRequestStatus as ProtectionRequestStatusType } from '@logion/client/dist/RecoveryClient.js';
+import { ProtectionRequestStatus as ProtectionRequestStatusType } from '@logion/client';
 
 import Icon from "../../common/Icon";
 import { ORANGE, GREEN, RED, YELLOW } from "../../common/ColorTheme";

src/logion-chain/LogionChainContext.tsx

@@ -1,6 +1,6 @@
 import {
     AccountTokens,
-    LegalOfficer,
+    CreateOrUpdateLegalOfficer,
     LegalOfficerClass,
     LogionClient,
     Token,
@@ -256,7 +256,7 @@ export interface LogionChainContextType {
     authenticate: (address: ValidAccountId[]) => Promise<void>,
     authenticateAddress: (address: ValidAccountId, signer?: RawSigner) => Promise<LogionClient | undefined>,
     getOfficer?: (address: ValidAccountId | undefined) => LegalOfficerClass | undefined,
-    saveOfficer?: (legalOfficer: LegalOfficer) => Promise<void>,
+    saveOfficer?: (legalOfficer: CreateOrUpdateLegalOfficer) => Promise<void>,
     reconnect: () => void,
     tryEnableMetaMask: () => Promise<void>,
     extrinsicSubmissionState: ExtrinsicSubmissionState;
@@ -611,7 +611,7 @@ function buildClientHelpers(
     axiosFactory: AxiosFactory,
     isCurrentAuthenticated: () => boolean,
     getOfficer: (owner: ValidAccountId | undefined) => LegalOfficerClass | undefined,
-    saveOfficer: (legalOfficer: LegalOfficer) => Promise<void>,
+    saveOfficer: (legalOfficer: CreateOrUpdateLegalOfficer) => Promise<void>,
     accounts: Accounts,
     client: LogionClient,
 } {

src/settings/DirectoryData.tsx

@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useState } from "react";
 import { Col, Form, Row } from "react-bootstrap";
 import { Controller, useForm } from "react-hook-form";
-import { LegalOfficer } from "@logion/client";
+import { CreateOrUpdateLegalOfficer } from "@logion/client";
 import { ValidAccountId } from "@logion/node-api";
 
 import Button from "../common/Button";
@@ -370,12 +370,10 @@ export default function DirectoryData() {
     );
 }
 
-function toLegalOfficer(formValues: FormValues): LegalOfficer {
+function toLegalOfficer(formValues: FormValues): CreateOrUpdateLegalOfficer {
     return {
         account: ValidAccountId.polkadot(formValues.address),
         additionalDetails: formValues.additionalDetails,
-        name: "",
-        node: "",
         postalAddress: {
             company: formValues.company,
             line1: formValues.line1,
@@ -390,7 +388,5 @@ function toLegalOfficer(formValues: FormValues): LegalOfficer {
             email: formValues.email,
             phoneNumber: formValues.phoneNumber,
         },
-        nodeId: "",
-        region: "Europe",
     }
 }

src/wallet-user/protection/LegalOfficers.tsx

@@ -1,4 +1,4 @@
-import { ProtectionRequestStatus } from "@logion/client/dist/RecoveryClient.js";
+import { ProtectionRequestStatus } from "@logion/client";
 
 import './LegalOfficers.css';
 import SelectLegalOfficerAndLoc, { LegalOfficerAndLoc } from "./SelectLegalOfficerAndLoc";

src/wallet-user/protection/ProtectionRecoveryRequest.tsx

@@ -22,7 +22,7 @@ import { SETTINGS_PATH } from '../UserPaths';
 import SelectLegalOfficer from './SelectLegalOfficer';
 
 import './ProtectionRecoveryRequest.css';
-import { ProtectionRequestStatus } from '@logion/client/dist/RecoveryClient.js';
+import { ProtectionRequestStatus } from '@logion/client';
 import RecoveryRefusal from "./RecoveryRefusal";
 import ButtonGroup from "../../common/ButtonGroup";
 import ExtrinsicSubmissionStateView from 'src/ExtrinsicSubmissionStateView';

src/wallet-user/protection/RecoveryRefusal.tsx

@@ -1,11 +1,10 @@
-import { RejectedRecovery } from "@logion/client";
+import { RejectedRecovery, LegalOfficerProtectionState } from "@logion/client";
 import Button from "../../common/Button";
 import { useUserContext } from "../UserContext";
 import { useCommonContext } from "../../common/CommonContext";
 import './RecoveryRefusal.css';
 import { RED } from "../../common/ColorTheme";
 import ButtonGroup from "../../common/ButtonGroup";
-import { LegalOfficerProtectionState } from "@logion/client/dist/Recovery.js";
 import { Refusal } from "./ProtectionRecoveryRequest";
 
 export interface Props {

src/wallet-user/protection/SelectLegalOfficer.tsx

@@ -1,8 +1,7 @@
 import Row from "react-bootstrap/Row";
 import Col from "react-bootstrap/Col";
-import { LegalOfficerClass } from "@logion/client";
+import { LegalOfficerClass, ProtectionRequestStatus } from "@logion/client";
 import { ValidAccountId } from "@logion/node-api";
-import { ProtectionRequestStatus } from "@logion/client/dist/RecoveryClient.js";
 
 import { ORANGE, GREEN, RED, YELLOW, BackgroundAndForegroundColors } from "../../common/ColorTheme";
 import Select, { OptionType } from '../../common/Select';

src/wallet-user/recovery/WalletRecoveryProcessTab.test.tsx

@@ -5,9 +5,7 @@ import { ValidAccountId, Fees, TypesAccountData, Lgnt } from "@logion/node-api";
 import { mutateRecoveredBalanceState, setProtectionState, setRecoveredBalanceState } from '../__mocks__/UserContextMock';
 
 import WalletRecoveryProcessTab from "./WalletRecoveryProcessTab";
-import { ClaimedRecovery } from '@logion/client';
-import { ProtectionParameters } from '@logion/client/dist/Recovery.js';
-import { BalanceState } from '@logion/client/dist/Balance.js';
+import { ClaimedRecovery, ProtectionParameters, BalanceState } from '@logion/client';
 
 jest.mock('../../logion-chain');
 jest.mock('../../common/CommonContext');

yarn.lock

@@ -3178,15 +3178,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@logion/client@npm:^0.46.0-2":
-  version: 0.46.0-2
-  resolution: "@logion/client@npm:0.46.0-2"
+"@logion/client@npm:^0.46.0-6":
+  version: 0.46.0-6
+  resolution: "@logion/client@npm:0.46.0-6"
   dependencies:
-    "@logion/node-api": ^0.31.1
+    "@logion/node-api": ^0.31.2-1
     axios: ^1.6.7
     luxon: ^3.4.4
     mime-db: ^1.52.0
-  checksum: 398617c7c766fbb01d4dbe75cbf117d3e2998aaa4acc8a3ca9b70fd68353e758a8e1f3e1635e57f54b734f5bdd3c06ac355c744012e7c593094a6e27716dffdb
+  checksum: a9b7919c8a899ac9aea85167e5dc85da1ff5b94c9e8fcabd0a8c4ebf8e19194df5dfa9dce91dc42939df8d39013f00793eb68a2671b2bf0c82f3679740a6ba7d
   languageName: node
   linkType: hard
 
@@ -3225,9 +3225,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@logion/node-api@npm:^0.31.1":
-  version: 0.31.1
-  resolution: "@logion/node-api@npm:0.31.1"
+"@logion/node-api@npm:^0.31.2-1":
+  version: 0.31.2-1
+  resolution: "@logion/node-api@npm:0.31.2-1"
   dependencies:
     "@polkadot/api": ^11.0.2
     "@polkadot/util": ^12.6.2
@@ -3236,7 +3236,7 @@ __metadata:
     bech32: ^2.0.0
     fast-sha256: ^1.3.0
     uuid: ^9.0.0
-  checksum: cce34fb29bb4c3422536eb0529cb6fba3ba14a5b7a73888566cb4267ce8427b308693d3fb89c0fecfe6e7e52be74661ac6da1667b5a54bf96d6249f31034cced
+  checksum: 9a1fb1409092976071a2a8e78fd02bd570c0e42fafc4bec3e109f277a9fe776ea109e480f4a360da5d6421c251dbf6f5b2e6762bce551f838c5dbc0338bc3c37
   languageName: node
   linkType: hard
 
@@ -11895,7 +11895,7 @@ __metadata:
     "@babel/preset-react": ^7.23.3
     "@babel/preset-typescript": ^7.23.3
     "@creativecommons/cc-assets": ^0.1.0
-    "@logion/client": ^0.46.0-2
+    "@logion/client": ^0.46.0-6
     "@logion/client-browser": ^0.3.5
     "@logion/crossmint": ^0.1.32
     "@logion/extension": ^0.8.1