@lysaab/lysa-pep 0.16.0 → 0.17.1

package/lib/components/PepAnswers.js

@@ -1,22 +1,24 @@
-import React from "react";
+import React, { useContext } from "react";
 import "./PepAnswers.scss";
 import { countries } from "../model/Countries";
 import { LABELS } from "../model/PepTexts";
 import { roleAlternatives, militaryAlternatives } from "../pages/PepRolePage";
-import { EntityType, PepType } from "../pages/PepContext";
+import { EntityType, PepType, PepContext } from "../pages/PepContext";
 export const PepAnswers = ({ answer }) => {
+    const pepContext = useContext(PepContext);
     if (!answer.type || answer.type === PepType.NOT_PEP) {
         return React.createElement("div", null,
             React.createElement("p", null, "Personen \u00E4r inte PEP"));
     }
-    const labels = LABELS("");
+    const entityType = pepContext.state.legalEntityType || EntityType.PERSON;
+    const labels = LABELS(pepContext.state.ownerName);
     const country = countries.find(country => country.value === answer.country);
     const role = roleAlternatives.find(alt => alt.value === answer.role);
     const militaryRank = militaryAlternatives.find(alt => alt.value === answer.militaryRank);
     return (React.createElement("div", null,
-        answer.type && (React.createElement(StaticInput, { label: "Vem \u00E4r pep", value: labels[EntityType.PERSON].GENERIC.IS_PEP[answer.type] })),
-        answer.relationToPEP && (React.createElement(StaticInput, { label: "Relation", value: labels[EntityType.PERSON][PepType.RELATIVE].RELATION[answer.relationToPEP] })),
-        answer.businessRelation && (React.createElement(StaticInput, { label: "Relation", value: labels[EntityType.PERSON][PepType.COLLEAGUE].BUSINESS_RELATION[answer.businessRelation] })),
+        answer.type && (React.createElement(StaticInput, { label: "Vem \u00E4r pep", value: labels[entityType].GENERIC.IS_PEP[answer.type] })),
+        answer.relationToPEP && (React.createElement(StaticInput, { label: "Relation", value: labels[entityType][PepType.RELATIVE].RELATION[answer.relationToPEP] })),
+        answer.businessRelation && (React.createElement(StaticInput, { label: "Relation", value: labels[entityType][PepType.COLLEAGUE].BUSINESS_RELATION[answer.businessRelation] })),
         answer.nameOfPEP && (React.createElement(StaticInput, { label: "Namn p\u00E5 personen", value: answer.nameOfPEP })),
         answer.birthdayOfPEP && (React.createElement(StaticInput, { label: "F\u00F6delsedag f\u00F6r personen", value: answer.birthdayOfPEP })),
         answer.ended ? (React.createElement(React.Fragment, null,
@@ -30,7 +32,7 @@ export const PepAnswers = ({ answer }) => {
         answer.governmentCompanyRole && (React.createElement(StaticInput, { label: "Roll p\u00E5 f\u00F6retaget", value: answer.governmentCompanyRole })),
         answer.internationalOrganisation && (React.createElement(StaticInput, { label: "Organisationens namn", value: answer.internationalOrganisation })),
         answer.internationalOrganisationRole && (React.createElement(StaticInput, { label: "Roll i organisationen", value: answer.internationalOrganisationRole })),
-        militaryRank && (React.createElement(StaticInput, { label: "Milit\u00E4r grad", value: militaryRank.value }))));
+        militaryRank && (React.createElement(StaticInput, { label: "Milit\u00E4r grad", value: militaryRank.text }))));
 };
 const StaticInput = ({ label, value }) => {
     return (React.createElement("div", { className: "static-input" },

package/lib/model/PepTexts.d.ts

@@ -9,6 +9,8 @@ export declare const LABELS: (name?: string | undefined) => {
                 [PepType.COLLEAGUE]: string;
             };
             IS_PEP_HEADER: string;
+            STATUS_ONGOING_HEADER: string;
+            STATUS_COUNTRY_HEADER: string;
         };
         ME: {
             ROLE_LABEL: string;
@@ -165,6 +167,8 @@ export declare const LABELS: (name?: string | undefined) => {
                 [PepType.COLLEAGUE]: string;
             };
             IS_PEP_HEADER: string;
+            STATUS_ONGOING_HEADER: string;
+            STATUS_COUNTRY_HEADER: string;
         };
         ME: {
             ROLE_LABEL: string;

package/lib/model/PepTexts.js

@@ -16,7 +16,9 @@ export const LABELS = (name) => {
                     [PepType.RELATIVE]: `Jag har en relation med en person som är PEP`,
                     [PepType.COLLEAGUE]: `Jag är medarbetare till, eller har en affärsrelation med, en person som är PEP`
                 },
-                IS_PEP_HEADER: `Är du eller en närstående till dig en person i politisk utsatt ställning? (PEP)`
+                IS_PEP_HEADER: `Är du eller en närstående till dig en person i politisk utsatt ställning? (PEP)`,
+                STATUS_ONGOING_HEADER: `Är din befattning pågående eller avslutad?`,
+                STATUS_COUNTRY_HEADER: `I vilket land är din befattning?`,
             },
             [PepType.ME]: {
                 ROLE_LABEL: `Ange din roll`,
@@ -175,7 +177,10 @@ export const LABELS = (name) => {
                         "Jag"} är medarbetare till, eller har en affärsrelation med, en person som är PEP`
                 },
                 IS_PEP_HEADER: `Är ${name || "du"} eller en närstående till ${name ||
-                    "dig"} en person i politisk utsatt ställning? (PEP)`
+                    "dig"} en person i politisk utsatt ställning? (PEP)`,
+                STATUS_ONGOING_HEADER: `Är ${possessiveName ||
+                    "din"} befattning pågående eller avslutad?`,
+                STATUS_COUNTRY_HEADER: `I vilket land är ${possessiveName || "din"} befattning?`,
             },
             [PepType.ME]: {
                 ROLE_LABEL: `Ange ${possessiveName || "din"} roll`,
@@ -317,7 +322,7 @@ export const LABELS = (name) => {
                 ROLE_LABEL: {
                     [BusinessRelation.CO_OWNERSHIP]: `Ange tjänst/roll för personen i politisk utsatt ställning som ${name ||
                         "du"} har en relation till`,
-                    [BusinessRelation.CLOSE_CONNECTION]: `AngeAnge tjänst/roll för personen i politisk utsatt ställning som ${name ||
+                    [BusinessRelation.CLOSE_CONNECTION]: `Ange tjänst/roll för personen i politisk utsatt ställning som ${name ||
                         "du"} har en relation till`,
                     [BusinessRelation.COMPANY_FOR_PEP]: `Ange tjänst/roll för personen i politisk utsatt ställning som ${name ||
                         "du"} har en relation till`

package/lib/pages/PepIsPepPage.d.ts

@@ -1,14 +1,15 @@
-import { FunctionComponent } from "react";
+import React from "react";
 import { PepType, EntityType } from "./PepContext";
-export interface ExternalIsPepState {
-    ownerName: string;
-    entityType: EntityType;
+interface QuestionsProps {
+    ownerName?: string;
+    legalEntityType?: EntityType;
     type?: PepType;
     onChange: (type: PepType) => void;
+    resetValues?: () => void;
 }
+export declare const PepIsPepQuestions: React.FC<QuestionsProps>;
 interface Props {
-    next?: () => void;
-    external?: ExternalIsPepState;
+    next: () => void;
 }
-export declare const PepIsPepPage: FunctionComponent<Props>;
+export declare const PepIsPepPage: React.FC<Props>;
 export {};

package/lib/pages/PepIsPepPage.js

@@ -1,13 +1,10 @@
-import React, { useRef, useCallback, useContext, } from "react";
+import React, { useRef, useCallback, useContext } from "react";
 import { Form, RadioGroup, RequiredValidator, PrimaryButton, } from "@lysaab/ui-2";
 import { PepType, PepContext, EntityType } from "./PepContext";
 import { LABELS } from "../model/PepTexts";
-export const PepIsPepPage = ({ next, external }) => {
-    var _a, _b;
-    const pepContext = useContext(PepContext);
-    const formRef = useRef();
-    const entityType = ((_a = external) === null || _a === void 0 ? void 0 : _a.entityType) || pepContext.state.legalEntityType || EntityType.PERSON;
-    const labels = LABELS(((_b = external) === null || _b === void 0 ? void 0 : _b.ownerName) || pepContext.state.ownerName);
+export const PepIsPepQuestions = ({ ownerName, legalEntityType, type, onChange, resetValues, }) => {
+    const labels = LABELS(ownerName);
+    const entityType = legalEntityType || EntityType.PERSON;
     const IsPepAlternatives = [
         {
             text: labels[entityType].GENERIC.IS_PEP[PepType.NOT_PEP],
@@ -23,8 +20,17 @@ export const PepIsPepPage = ({ next, external }) => {
             value: PepType.COLLEAGUE,
         },
     ];
+    return (React.createElement(RadioGroup, { alternatives: IsPepAlternatives, onChange: (alternative) => {
+            var _a;
+            onChange(alternative.value);
+            (_a = resetValues) === null || _a === void 0 ? void 0 : _a();
+        }, value: IsPepAlternatives.find((alt) => alt.value === type), header: labels[entityType].GENERIC.IS_PEP_HEADER, validators: [RequiredValidator("Du måste välja ett alternativ")] }));
+};
+export const PepIsPepPage = ({ next }) => {
+    const pepContext = useContext(PepContext);
+    const formRef = useRef();
     const nextPage = useCallback(() => {
-        if (formRef.current && formRef.current.isValid && next) {
+        if (formRef.current && formRef.current.isValid) {
             next();
         }
     }, [formRef, next]);
@@ -48,14 +54,6 @@ export const PepIsPepPage = ({ next, external }) => {
         });
     }, [pepContext]);
     return (React.createElement(Form, { onSubmit: nextPage, lysaFormRef: formRef },
-        React.createElement(RadioGroup, { alternatives: IsPepAlternatives, onChange: alternative => {
-                if (external) {
-                    external.onChange(alternative.value);
-                }
-                else {
-                    pepContext.setState({ type: alternative.value });
-                    resetValues();
-                }
-            }, value: IsPepAlternatives.find(alt => { var _a; return alt.value === (((_a = external) === null || _a === void 0 ? void 0 : _a.type) || pepContext.state.type); }), header: labels[entityType].GENERIC.IS_PEP_HEADER, validators: [RequiredValidator("Du måste välja ett alternativ")] }),
-        next && React.createElement(PrimaryButton, { type: "submit" }, "N\u00E4sta")));
+        React.createElement(PepIsPepQuestions, { ownerName: pepContext.state.ownerName, legalEntityType: pepContext.state.legalEntityType, type: pepContext.state.type, onChange: (type) => pepContext.setState({ type }), resetValues: resetValues }),
+        React.createElement(PrimaryButton, { type: "submit" }, "N\u00E4sta")));
 };

package/lib/pages/PepStatusPage.js

@@ -1,7 +1,8 @@
 import React, { useRef, useCallback, useContext, } from "react";
 import { Form, RadioGroup, RequiredValidator, PrimaryButton, Datepicker, } from "@lysaab/ui-2";
-import { PepContext, PepStatus } from "./PepContext";
+import { PepContext, PepStatus, EntityType } from "./PepContext";
 import { CountrySelect } from "../components/CountrySelect";
+import { LABELS } from "../model/PepTexts";
 const stateAlternatives = [
     {
         text: "Pågående",
@@ -36,14 +37,16 @@ export const PepStatusPage = ({ next }) => {
             pepContext.setState({ ended: undefined });
         }
     }, [pepContext]);
+    const labels = LABELS(pepContext.state.ownerName);
+    const entityType = pepContext.state.legalEntityType || EntityType.PERSON;
     return (React.createElement("div", null,
         React.createElement(Form, { lysaFormRef: formRef, onSubmit: () => {
                 nextPage();
             } },
-            React.createElement(RadioGroup, { alternatives: stateAlternatives, header: "\u00C4r befattningen p\u00E5g\u00E5ende eller avslutad?", onChange: updateIsOngoing, value: stateAlternatives.find(alt => alt.value === pepContext.state.isOngoing), validators: [RequiredValidator("Du måste välja ett alternativ")] }),
+            React.createElement(RadioGroup, { alternatives: stateAlternatives, header: labels[entityType].GENERIC.STATUS_ONGOING_HEADER, onChange: updateIsOngoing, value: stateAlternatives.find(alt => alt.value === pepContext.state.isOngoing), validators: [RequiredValidator("Du måste välja ett alternativ")] }),
             pepContext.state.isOngoing &&
                 pepContext.state.isOngoing === PepStatus.ENDED ? (React.createElement(Datepicker, { label: "N\u00E4r avslutades uppdraget?", selected: pepContext.state.ended, onChange: event => pepContext.setState({ ended: event || undefined }), validators: [RequiredValidator("Du måste ange fördelsedag")], showMonthYearPicker: true, dateFormat: "yyyy-MM", maxDate: new Date() })) : null,
-            React.createElement(RadioGroup, { alternatives: isSwedenAlternatives, header: "I vilket land \u00E4r befattningen", onChange: updateIsSweden, value: isSwedenAlternatives.find(alt => alt.value === pepContext.state.isSweden), validators: [RequiredValidator("Du måste välja ett alternativ")] }),
+            React.createElement(RadioGroup, { alternatives: isSwedenAlternatives, header: labels[entityType].GENERIC.STATUS_COUNTRY_HEADER, onChange: updateIsSweden, value: isSwedenAlternatives.find(alt => alt.value === pepContext.state.isSweden), validators: [RequiredValidator("Du måste välja ett alternativ")] }),
             pepContext.state.isSweden && pepContext.state.isSweden === "other" ? (React.createElement(CountrySelect, { label: "V\u00E4lj i vilket land befattningen \u00E4r", onChange: event => pepContext.setState({
                     country: event.value ? event.value.toString() : undefined,
                 }), validators: [RequiredValidator("Du måste välja land")], value: pepContext.state.country, removeSweden: true })) : null,

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@lysaab/lysa-pep",
   "author": "Lysa AB",
-  "version": "0.16.0",
+  "version": "0.17.1",
   "main": "./lib/Exports.js",
   "dependencies": {
     "@types/luxon": "^1.15.2",
     "luxon": "^1.21.1"
   },
   "devDependencies": {
+    "@lysaab/ui-2": "^16.13.1",
     "@types/jest": "24.0.20",
     "@types/luxon": "^1.15.2",
     "@types/node": "12.11.7",
@@ -17,7 +18,7 @@
     "luxon": "^1.21.1",
     "react": "^16.11.0",
     "react-dom": "^16.11.0",
-    "react-scripts": "3.2.0",
+    "react-scripts": "^3.4.1",
     "typescript": "^3.7.2"
   },
   "peerDependencies": {

package/src/components/PepAnswers.tsx

@@ -1,21 +1,24 @@
-import React, { FunctionComponent } from "react";
+import React, { FunctionComponent, useContext } from "react";
 import "./PepAnswers.scss";
 import { PepRequest } from "../model/PepModel";
 import { countries } from "../model/Countries";
 import { LABELS } from "../model/PepTexts";
 import { roleAlternatives, militaryAlternatives } from "../pages/PepRolePage";
-import { EntityType, PepType } from "../pages/PepContext";
+import { EntityType, PepType, PepContext } from "../pages/PepContext";
 
 interface Props {
   answer: PepRequest;
 }
 
 export const PepAnswers: FunctionComponent<Props> = ({ answer }) => {
+  const pepContext = useContext(PepContext);
+
   if (!answer.type || answer.type === PepType.NOT_PEP) {
     return <div><p>Personen är inte PEP</p></div>;
   }
 
-  const labels = LABELS("");
+  const entityType = pepContext.state.legalEntityType || EntityType.PERSON;
+  const labels = LABELS(pepContext.state.ownerName);
   const country = countries.find(country => country.value === answer.country);
   const role = roleAlternatives.find(alt => alt.value === answer.role);
   const militaryRank = militaryAlternatives.find(
@@ -26,14 +29,14 @@ export const PepAnswers: FunctionComponent<Props> = ({ answer }) => {
       {answer.type && (
         <StaticInput
           label="Vem är pep"
-          value={labels[EntityType.PERSON].GENERIC.IS_PEP[answer.type]}
+          value={labels[entityType].GENERIC.IS_PEP[answer.type]}
         />
       )}
       {answer.relationToPEP && (
         <StaticInput
           label="Relation"
           value={
-            labels[EntityType.PERSON][PepType.RELATIVE].RELATION[
+            labels[entityType][PepType.RELATIVE].RELATION[
               answer.relationToPEP
             ]
           }
@@ -43,7 +46,7 @@ export const PepAnswers: FunctionComponent<Props> = ({ answer }) => {
         <StaticInput
           label="Relation"
           value={
-            labels[EntityType.PERSON][PepType.COLLEAGUE].BUSINESS_RELATION[
+            labels[entityType][PepType.COLLEAGUE].BUSINESS_RELATION[
               answer.businessRelation
             ]
           }
@@ -101,7 +104,7 @@ export const PepAnswers: FunctionComponent<Props> = ({ answer }) => {
         />
       )}
       {militaryRank && (
-        <StaticInput label="Militär grad" value={militaryRank.value} />
+        <StaticInput label="Militär grad" value={militaryRank.text} />
       )}
     </div>
   );

package/src/demo/Pep.tsx

@@ -61,18 +61,19 @@ export function Pep() {
         <legend>Konfig</legend>
         <div>
           <label>
-            Verkligen huvudman
-            <input
-              type="checkbox"
-              value={"true"}
-              onChange={event =>
+            Entitet
+
+            <select
+              value={pepContext.state.legalEntityType || EntityType.PERSON}
+              onChange={event => {
                 pepContext.setState({
-                  legalEntityType: event.currentTarget.checked
-                    ? EntityType.CORPORATION
-                    : EntityType.PERSON
-                })
-              }
-            />
+                  legalEntityType: event.currentTarget.value as EntityType,
+                });
+              }}
+            >
+              <option value={EntityType.PERSON}>Person</option>
+              <option value={EntityType.CORPORATION}>Företag</option>
+            </select>
           </label>
         </div>
         <div>

package/src/model/PepTexts.ts

@@ -25,7 +25,9 @@ export const LABELS = (name?: string) => {
           [PepType.RELATIVE]: `Jag har en relation med en person som är PEP`,
           [PepType.COLLEAGUE]: `Jag är medarbetare till, eller har en affärsrelation med, en person som är PEP`
         },
-        IS_PEP_HEADER: `Är du eller en närstående till dig en person i politisk utsatt ställning? (PEP)`
+        IS_PEP_HEADER: `Är du eller en närstående till dig en person i politisk utsatt ställning? (PEP)`,
+        STATUS_ONGOING_HEADER: `Är din befattning pågående eller avslutad?`,
+        STATUS_COUNTRY_HEADER: `I vilket land är din befattning?`,
       },
       [PepType.ME]: {
         ROLE_LABEL: `Ange din roll`,
@@ -184,7 +186,10 @@ export const LABELS = (name?: string) => {
             "Jag"} är medarbetare till, eller har en affärsrelation med, en person som är PEP`
         },
         IS_PEP_HEADER: `Är ${name || "du"} eller en närstående till ${name ||
-          "dig"} en person i politisk utsatt ställning? (PEP)`
+          "dig"} en person i politisk utsatt ställning? (PEP)`,
+        STATUS_ONGOING_HEADER: `Är ${possessiveName ||
+          "din"} befattning pågående eller avslutad?`,
+        STATUS_COUNTRY_HEADER: `I vilket land är ${possessiveName || "din"} befattning?`,
       },
       [PepType.ME]: {
         ROLE_LABEL: `Ange ${possessiveName || "din"} roll`,
@@ -326,7 +331,7 @@ export const LABELS = (name?: string) => {
         ROLE_LABEL: {
           [BusinessRelation.CO_OWNERSHIP]: `Ange tjänst/roll för personen i politisk utsatt ställning som ${name ||
             "du"} har en relation till`,
-          [BusinessRelation.CLOSE_CONNECTION]: `AngeAnge tjänst/roll för personen i politisk utsatt ställning som ${name ||
+          [BusinessRelation.CLOSE_CONNECTION]: `Ange tjänst/roll för personen i politisk utsatt ställning som ${name ||
             "du"} har en relation till`,
           [BusinessRelation.COMPANY_FOR_PEP]: `Ange tjänst/roll för personen i politisk utsatt ställning som ${name ||
             "du"} har en relation till`

package/src/pages/PepIsPepPage.tsx

@@ -1,9 +1,4 @@
-import React, {
-  FunctionComponent,
-  useRef,
-  useCallback,
-  useContext,
-} from "react";
+import React, { useRef, useCallback, useContext } from "react";
 import {
   Form,
   RadioGroup,
@@ -14,24 +9,23 @@ import {
 import { PepType, PepContext, EntityType } from "./PepContext";
 import { LABELS } from "../model/PepTexts";
 
-export interface ExternalIsPepState {
-  ownerName: string;
-  entityType: EntityType;
+interface QuestionsProps {
+  ownerName?: string;
+  legalEntityType?: EntityType;
   type?: PepType;
   onChange: (type: PepType) => void;
+  resetValues?: () => void;
 }
 
-interface Props {
-  next?: () => void;
-  external?: ExternalIsPepState;
-}
-
-export const PepIsPepPage: FunctionComponent<Props> = ({ next, external }) => {
-  const pepContext = useContext(PepContext);
-  const formRef = useRef<LysaFormRef>();
-  const entityType =
-    external?.entityType || pepContext.state.legalEntityType || EntityType.PERSON;
-  const labels = LABELS(external?.ownerName || pepContext.state.ownerName);
+export const PepIsPepQuestions: React.FC<QuestionsProps> = ({
+  ownerName,
+  legalEntityType,
+  type,
+  onChange,
+  resetValues,
+}) => {
+  const labels = LABELS(ownerName);
+  const entityType = legalEntityType || EntityType.PERSON;
 
   const IsPepAlternatives = [
     {
@@ -49,8 +43,30 @@ export const PepIsPepPage: FunctionComponent<Props> = ({ next, external }) => {
     },
   ];
 
+  return (
+    <RadioGroup
+      alternatives={IsPepAlternatives}
+      onChange={(alternative) => {
+        onChange(alternative.value);
+        resetValues?.();
+      }}
+      value={IsPepAlternatives.find((alt) => alt.value === type)}
+      header={labels[entityType].GENERIC.IS_PEP_HEADER}
+      validators={[RequiredValidator("Du måste välja ett alternativ")]}
+    />
+  );
+};
+
+interface Props {
+  next: () => void;
+}
+
+export const PepIsPepPage: React.FC<Props> = ({ next }) => {
+  const pepContext = useContext(PepContext);
+  const formRef = useRef<LysaFormRef>();
+
   const nextPage = useCallback(() => {
-    if (formRef.current && formRef.current.isValid && next) {
+    if (formRef.current && formRef.current.isValid) {
       next();
     }
   }, [formRef, next]);
@@ -77,24 +93,15 @@ export const PepIsPepPage: FunctionComponent<Props> = ({ next, external }) => {
 
   return (
     <Form onSubmit={nextPage} lysaFormRef={formRef}>
-      <RadioGroup
-        alternatives={IsPepAlternatives}
-        onChange={alternative => {
-          if (external) {
-            external.onChange(alternative.value);
-          } else {
-            pepContext.setState({ type: alternative.value });
-            resetValues();
-          }
-        }}
-        value={IsPepAlternatives.find(
-          alt => alt.value === (external?.type || pepContext.state.type)
-        )}
-        header={labels[entityType].GENERIC.IS_PEP_HEADER}
-        validators={[RequiredValidator("Du måste välja ett alternativ")]}
+      <PepIsPepQuestions
+        ownerName={pepContext.state.ownerName}
+        legalEntityType={pepContext.state.legalEntityType}
+        type={pepContext.state.type}
+        onChange={(type) => pepContext.setState({ type })}
+        resetValues={resetValues}
       />
 
-      {next && <PrimaryButton type="submit">Nästa</PrimaryButton>}
+      <PrimaryButton type="submit">Nästa</PrimaryButton>
     </Form>
   );
 };

package/src/pages/PepStatusPage.tsx

@@ -13,8 +13,9 @@ import {
   Datepicker,
 } from "@lysaab/ui-2";
 import { Alternative } from "@lysaab/ui-2/components/input/InputAPI";
-import { PepContext, PepStatus } from "./PepContext";
+import { PepContext, PepStatus, EntityType } from "./PepContext";
 import { CountrySelect } from "../components/CountrySelect";
+import { LABELS } from "../model/PepTexts";
 
 const stateAlternatives: Alternative<PepStatus>[] = [
   {
@@ -68,6 +69,9 @@ export const PepStatusPage: FunctionComponent<Props> = ({ next }) => {
     [pepContext]
   );
 
+  const labels = LABELS(pepContext.state.ownerName);
+  const entityType = pepContext.state.legalEntityType || EntityType.PERSON;
+
   return (
     <div>
       <Form
@@ -78,7 +82,7 @@ export const PepStatusPage: FunctionComponent<Props> = ({ next }) => {
       >
         <RadioGroup
           alternatives={stateAlternatives}
-          header="Är befattningen pågående eller avslutad?"
+          header={labels[entityType].GENERIC.STATUS_ONGOING_HEADER}
           onChange={updateIsOngoing}
           value={stateAlternatives.find(
             alt => alt.value === pepContext.state.isOngoing
@@ -103,7 +107,7 @@ export const PepStatusPage: FunctionComponent<Props> = ({ next }) => {
 
         <RadioGroup
           alternatives={isSwedenAlternatives}
-          header="I vilket land är befattningen"
+          header={labels[entityType].GENERIC.STATUS_COUNTRY_HEADER}
           onChange={updateIsSweden}
           value={isSwedenAlternatives.find(
             alt => alt.value === pepContext.state.isSweden

package/.env.development

@@ -1 +0,0 @@
-PORT=3007