Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix create or update llo #582

Merged
merged 3 commits into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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-5",
"@logion/client-browser": "^0.3.5",
"@logion/crossmint": "^0.1.32",
"@logion/extension": "^0.8.1",
Expand Down
4 changes: 1 addition & 3 deletions src/legal-officer/TestData.tsx
Original file line number Diff line number Diff line change
@@ -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";

Expand Down Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion src/legal-officer/recovery/RecoveryRequestStatus.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
6 changes: 3 additions & 3 deletions src/logion-chain/LogionChainContext.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
AccountTokens,
LegalOfficer,
CreateOrUpdateLegalOfficer,
LegalOfficerClass,
LogionClient,
Token,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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,
} {
Expand Down
8 changes: 2 additions & 6 deletions src/settings/DirectoryData.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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,
Expand All @@ -390,7 +388,5 @@ function toLegalOfficer(formValues: FormValues): LegalOfficer {
email: formValues.email,
phoneNumber: formValues.phoneNumber,
},
nodeId: "",
region: "Europe",
}
}
2 changes: 1 addition & 1 deletion src/wallet-user/protection/LegalOfficers.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/wallet-user/protection/ProtectionRecoveryRequest.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
3 changes: 1 addition & 2 deletions src/wallet-user/protection/RecoveryRefusal.tsx
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions src/wallet-user/protection/SelectLegalOfficer.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 1 addition & 3 deletions src/wallet-user/recovery/WalletRecoveryProcessTab.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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-5":
version: 0.46.0-5
resolution: "@logion/client@npm:0.46.0-5"
dependencies:
"@logion/node-api": ^0.31.1
axios: ^1.6.7
luxon: ^3.4.4
mime-db: ^1.52.0
checksum: 398617c7c766fbb01d4dbe75cbf117d3e2998aaa4acc8a3ca9b70fd68353e758a8e1f3e1635e57f54b734f5bdd3c06ac355c744012e7c593094a6e27716dffdb
checksum: 92456e8ae8ec54021e436d6fd1743dd1602d1c32c7999c59d9d404914a3c58fe502a4676f09fca700e12e09c2f70ec0d98534b35dfbe4b3ab5c8f240ae0c87f0
languageName: node
linkType: hard

Expand Down Expand Up @@ -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-5
"@logion/client-browser": ^0.3.5
"@logion/crossmint": ^0.1.32
"@logion/extension": ^0.8.1
Expand Down
Loading