Merge pull request #1373 from navikt/no-address-fix

Only prefill address if we actually have a address
navikt · Nov 28, 2024 · 359bd19 · 359bd19
2 parents 34eb332 + 67de5c5
commit 359bd19
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/packages/shared-components/src/formio/components/core/address/Address.tsx b/packages/shared-components/src/formio/components/core/address/Address.tsx
@@ -58,13 +58,15 @@ class Address extends BaseComponent {
           this.getKontaktadresse(prefillAddresses);
       }
 
-      if (prefillAddress.landkode) {
-        super.setValue({
-          ...prefillAddress,
-          land: getCountryObject(prefillAddress.landkode),
-        });
-      } else {
-        this.setValue(prefillAddress);
+      if (prefillAddress) {
+        if (prefillAddress.landkode) {
+          super.setValue({
+            ...prefillAddress,
+            land: getCountryObject(prefillAddress.landkode),
+          });
+        } else {
+          this.setValue(prefillAddress);
+        }
       }
     }
   }