From 9867de223dcd6f014700983421204b3a3d024716 Mon Sep 17 00:00:00 2001
From: aleksandrskondratjevs <aleksandrs.kondratjevs_1@outlook.com>
Date: Tue, 1 Nov 2022 14:28:50 +0200
Subject: [PATCH] Fix on first checkout load shipping estimates

---
 .../CheckoutAddressForm.component.tsx         | 22 +++++++++++++++++--
 .../component/FieldGroup/FieldGroup.type.ts   |  2 --
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/packages/scandipwa/src/component/CheckoutAddressForm/CheckoutAddressForm.component.tsx b/packages/scandipwa/src/component/CheckoutAddressForm/CheckoutAddressForm.component.tsx
index 63d6ddd0ea..a6f6e27745 100644
--- a/packages/scandipwa/src/component/CheckoutAddressForm/CheckoutAddressForm.component.tsx
+++ b/packages/scandipwa/src/component/CheckoutAddressForm/CheckoutAddressForm.component.tsx
@@ -38,6 +38,26 @@ export class CheckoutAddressFormComponent extends MyAccountAddressForm<CheckoutA
         this.onAddressChange = this.onAddressChange.bind(this);
     }
 
+    componentDidMount() {
+        const {
+            currentCity: city,
+            currentRegionId: region_id,
+            currentRegion: region,
+            currentZipcode: postcode,
+            countryId,
+            onShippingEstimationFieldsChange,
+            defaultCountry,
+        } = this.props;
+
+        onShippingEstimationFieldsChange({
+            country_id: countryId || defaultCountry,
+            region_id,
+            region,
+            city,
+            postcode,
+        });
+    }
+
     fieldMap(): (Partial<FieldContainerProps> | FormSection)[] {
         const {
             address,
@@ -97,8 +117,6 @@ export class CheckoutAddressFormComponent extends MyAccountAddressForm<CheckoutA
             addressGroup.events = {
                 // Updates shipping methods on address blurt
                 onBlur: this.onAddressChange,
-                // Updates shipping methods on start
-                onLoad: this.onAddressChange,
             };
         }
 
diff --git a/packages/scandipwa/src/component/FieldGroup/FieldGroup.type.ts b/packages/scandipwa/src/component/FieldGroup/FieldGroup.type.ts
index 88e56560e2..4c9bc7cbdf 100644
--- a/packages/scandipwa/src/component/FieldGroup/FieldGroup.type.ts
+++ b/packages/scandipwa/src/component/FieldGroup/FieldGroup.type.ts
@@ -14,7 +14,6 @@ import {
     FocusEventHandler,
     FormHTMLAttributes,
     MutableRefObject,
-    ReactEventHandler,
     RefObject,
     SyntheticEvent,
 } from 'react';
@@ -77,7 +76,6 @@ DOMAttributes<HTMLDivElement>,
 >
 & {
     onBlur: (event: FocusEventHandler, fields: FieldGroupEventData) => void;
-    onLoad: (event: ReactEventHandler, fields: FieldGroupEventData) => void;
 };
 
 export interface FieldGroupEventData {