@lysaab/lysa-pep 5.0.1 → 6.0.0

package/components/PepAnswers.js

@@ -1,6 +1,5 @@
 import React from "react";
 import "./PepAnswers.scss";
-import countries from "@lysaab/countries";
 import { getRoleAlts, getMilitaryAlts } from "../pages/RolePage/RolePage";
 import { PepType } from "../pages/PepContext";
 import { useIntl, defineMessages, FormattedMessage } from "react-intl";
@@ -60,7 +59,6 @@ const messages = defineMessages({
     },
 });
 export const PepAnswers = ({ answer }) => {
-    var _a;
     const intl = useIntl();
     if (!answer.type || answer.type === PepType.NOT_PEP) {
         return (React.createElement("div", null,
@@ -68,8 +66,6 @@ export const PepAnswers = ({ answer }) => {
                 React.createElement(FormattedMessage, { id: "pep.answers.notpep" }))));
     }
     const entityType = answer.legalEntityType;
-    const lang = intl.locale.slice(0, 2);
-    const country = (countries[lang] || countries["en"]).find((country) => country.value === answer.country);
     const role = getRoleAlts(intl).find((alt) => alt.value === answer.role);
     const militaryRank = getMilitaryAlts(intl).find((alt) => alt.value === answer.militaryRank);
     return (React.createElement("div", null,
@@ -87,9 +83,11 @@ export const PepAnswers = ({ answer }) => {
         answer.ended ? (React.createElement(React.Fragment, null,
             React.createElement(StaticInput, { label: intl.formatMessage(messages.statusLabel), value: intl.formatMessage(messages.statusEndedValue) }),
             React.createElement(StaticInput, { label: intl.formatMessage(messages.endedLabel), value: answer.ended }))) : (React.createElement(StaticInput, { label: intl.formatMessage(messages.statusLabel), value: intl.formatMessage(messages.statusOngoingValue) })),
-        answer.country && (React.createElement(StaticInput, { label: intl.formatMessage(messages.countryLabel), value: country ? country.label : answer.country })),
+        answer.country && (React.createElement(StaticInput, { label: intl.formatMessage(messages.countryLabel), value: intl.formatDisplayName(answer.country, { type: "region" }) })),
         role && (React.createElement(StaticInput, { label: intl.formatMessage(messages.roleLabel), value: role.text })),
-        answer.ambassadorCountry && (React.createElement(StaticInput, { label: intl.formatMessage(messages.ambassadorCountryLabel), value: ((_a = (countries[lang] || countries["en"]).find((country) => country.value === answer.ambassadorCountry)) === null || _a === void 0 ? void 0 : _a.label) || answer.ambassadorCountry })),
+        answer.ambassadorCountry && (React.createElement(StaticInput, { label: intl.formatMessage(messages.ambassadorCountryLabel), value: intl.formatDisplayName(answer.ambassadorCountry, {
+                type: "region",
+            }) })),
         answer.governmentCompany && (React.createElement(StaticInput, { label: intl.formatMessage(messages.governmentCompanyNameLabel), value: answer.governmentCompany })),
         answer.governmentCompanyRole && (React.createElement(StaticInput, { label: intl.formatMessage(messages.governmentCompanyRoleLabel), value: answer.governmentCompanyRole })),
         answer.internationalOrganisation && (React.createElement(StaticInput, { label: intl.formatMessage(messages.internationalOrganisationNameLabel), value: answer.internationalOrganisation })),

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@lysaab/lysa-pep",
   "author": "Lysa AB",
-  "version": "5.0.1",
+  "version": "6.0.0",
   "main": "./Exports.js",
   "dependencies": {
-    "@lysaab/countries": "^3.1.1",
+    "@lysaab/countries": "^5.0.2",
     "@types/luxon": "^1.15.2",
     "@types/react-datepicker": "^3.1.2",
     "@types/react-intl": "^3.0.0",
@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "@formatjs/cli": "^1.1.22",
-    "@lysaab/ui-2": "^33.2.2",
+    "@lysaab/ui-2": "^37.0.0",
     "@types/jest": "24.0.20",
     "@types/luxon": "^1.15.2",
     "@types/node": "12.11.7",
@@ -32,7 +32,7 @@
     "typescript": "^4.3.4"
   },
   "peerDependencies": {
-    "@lysaab/ui-2": "^33.2.1",
+    "@lysaab/ui-2": "^37.0.0",
     "react": "^17.0.1",
     "react-intl": "^5.20.2",
     "react-router-dom": "^5.2.0"

package/pages/PepContext.d.ts

@@ -1,3 +1,4 @@
+import { WorldCountry } from "@lysaab/countries";
 import React from "react";
 export declare enum EntityType {
     PERSON = "PERSON",
@@ -53,9 +54,9 @@ export interface PepState {
     legalEntityType?: EntityType;
     type?: PepType;
     role?: Role;
-    country?: string;
+    country?: WorldCountry;
     ended?: Date;
-    ambassadorCountry?: string;
+    ambassadorCountry?: WorldCountry;
     militaryRank?: MilitaryRank;
     governmentCompany?: string;
     governmentCompanyRole?: string;

package/pages/RolePage/RolePage.js

@@ -1,7 +1,7 @@
 import React, { useRef, useCallback, useContext, } from "react";
 import { Form, PrimaryButton, RequiredValidator, TextInput, Select, Card, CountrySelect, } from "@lysaab/ui-2";
 import { PepContext, Role, MilitaryRank, PepType, EntityType, } from "../PepContext";
-import { useIntl, FormattedMessage, } from "react-intl";
+import { useIntl, FormattedMessage } from "react-intl";
 import { roleMessages, ambassadorMessages, governmentCompanyMessages, intCompanyMessages, militaryMessages, } from "./RoleMessages";
 import { formatPossessive } from "../../utils/Possession";
 export const RolePage = ({ language, next }) => {
@@ -54,9 +54,7 @@ export const RolePage = ({ language, next }) => {
                         : pepContext.state.relationToPEP,
                     name: pepContext.state.ownerName,
                 }), onChange: (event) => pepContext.setState({
-                    ambassadorCountry: event.value
-                        ? event.value.toString()
-                        : undefined,
+                    ambassadorCountry: event.value ? event.value : undefined,
                 }), value: pepContext.state.ambassadorCountry, validators: [
                     new RequiredValidator(intl.formatMessage(ambassadorMessages.required)),
                 ], language: language, placeholder: intl.formatMessage(ambassadorMessages.placeholder) })) : null,

package/pages/StatusPage/StatusPage.d.ts

@@ -1,8 +1,8 @@
 import { FunctionComponent } from "react";
-import { Language } from "@lysaab/ui-2";
+import { Language, WorldCountry } from "@lysaab/ui-2";
 interface Props {
     countryName: string;
-    countryCode: string;
+    countryCode: WorldCountry;
     language: Language;
     next: () => void;
 }

package/pages/StatusPage/StatusPage.js

@@ -69,7 +69,7 @@ export const StatusPage = ({ countryName, countryCode, language, next, }) => {
                             : pepContext.state.relationToPEP,
                         pepType: pepContext.state.type,
                     }), onChange: (event) => pepContext.setState({
-                        country: event.value ? event.value.toString() : undefined,
+                        country: event.value ? event.value : undefined,
                     }), validators: [
                         new RequiredValidator(intl.formatMessage(countrySelectionMessages.required)),
                     ], value: pepContext.state.country, omitList: [countryCode], language: language, placeholder: intl.formatMessage(countrySelectionMessages.placeholder) })) : null),