From 7642c289c6d0273cc9d1b8aabdff43194260cb11 Mon Sep 17 00:00:00 2001
From: Paras Sood <paras89@live.com>
Date: Tue, 26 Oct 2021 13:49:53 +0100
Subject: [PATCH 1/2] use directory module region updater

---
 .../frontend/templates/account/register.phtml | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/JapaneseAddress/view/frontend/templates/account/register.phtml b/JapaneseAddress/view/frontend/templates/account/register.phtml
index 17e0608c9..4fa728215 100644
--- a/JapaneseAddress/view/frontend/templates/account/register.phtml
+++ b/JapaneseAddress/view/frontend/templates/account/register.phtml
@@ -205,18 +205,28 @@
     });
 </script>
 <?php if ($block->getShowAddressFields()): ?>
+    <?php
+    $regionProvider = $block->getRegionProvider();
+    $regionJson = /* @noEscape */ $regionProvider->getRegionJson();
+    $formData = $block->getFormData();
+    $regionId = (int) $formData->getRegionId();
+    /** @var \Magento\Directory\Helper\Data $directoryHelper */
+    $directoryHelper = $block->getData('directoryHelper');
+    $countriesWithOptionalZip = /* @noEscape */ $directoryHelper->getCountriesWithOptionalZip(true);
+    $displayAll = $block->getConfig('general/region/display_all');
+    ?>
     <script type="text/x-magento-init">
     {
         "#country": {
-            "regionUpdater": {
-                "optionalRegionAllowed": <?= /* @noEscape */ $block->getConfig('general/region/display_all') ? 'true' : 'false' ?>,
+            "directoryRegionUpdater": {
+                "optionalRegionAllowed": <?= /* @noEscape */ $displayAll ? 'true' : 'false' ?>,
                 "regionListId": "#region_id",
                 "regionInputId": "#region",
                 "postcodeId": "#zip",
                 "form": "#form-validate",
-                "regionJson": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson() ?>,
-                "defaultRegion": "<?= /* @noEscape */ (int) $block->getFormData()->getRegionId() ?>",
-                "countriesWithOptionalZip": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getCountriesWithOptionalZip(true) ?>
+                "regionJson": <?= /* @noEscape */ $regionJson ?>,
+                "defaultRegion": <?= /* @noEscape */ $regionId ?>,
+                "countriesWithOptionalZip": <?=  /* @noEscape */ $countriesWithOptionalZip ?>
             }
         }
     }

From 265f322d13147b6f5bdc5d551a1fbec736b3a7a1 Mon Sep 17 00:00:00 2001
From: Paras Sood <paras89@live.com>
Date: Tue, 26 Oct 2021 14:13:50 +0100
Subject: [PATCH 2/2] use directory region updater for address edit form

---
 .../frontend/templates/address/edit.phtml     | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/JapaneseAddress/view/frontend/templates/address/edit.phtml b/JapaneseAddress/view/frontend/templates/address/edit.phtml
index 52f854adf..25d733a66 100644
--- a/JapaneseAddress/view/frontend/templates/address/edit.phtml
+++ b/JapaneseAddress/view/frontend/templates/address/edit.phtml
@@ -187,18 +187,29 @@
         </div>
     </div>
 </form>
+<?php
+    $regionProvider = $block->getRegionProvider();
+    $regionJson = /* @noEscape */
+    $regionProvider->getRegionJson();
+
+    /** @var \Magento\Directory\Helper\Data $directoryHelper */
+    $directoryHelper = $block->getData('directoryHelper');
+    $countriesWithOptionalZip = /* @noEscape */
+    $directoryHelper->getCountriesWithOptionalZip(true);
+    $displayAll = $block->getConfig('general/region/display_all');
+?>
 <script type="text/x-magento-init">
     {
         "#country": {
-            "regionUpdater": {
-                "optionalRegionAllowed": <?= /* @noEscape */ $block->getConfig('general/region/display_all') ? 'true' : 'false' ?>,
+            "directoryRegionUpdater": {
+                "optionalRegionAllowed": <?= /* @noEscape */ $displayAll ? 'true' : 'false' ?>,
                 "regionListId": "#region_id",
                 "regionInputId": "#region",
                 "postcodeId": "#zip",
                 "form": "#form-validate",
-                "regionJson": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson() ?>,
-                "defaultRegion": "<?= /* @noEscape */ (int) $block->getRegionId() ?>",
-                "countriesWithOptionalZip": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getCountriesWithOptionalZip(true) ?>
+                "regionJson": <?= /* @noEscape */ $regionJson ?>,
+                "defaultRegion": <?= /* @noEscape */ $block->getRegionId() ?>,
+                "countriesWithOptionalZip": <?= /* @noEscape */ $countriesWithOptionalZip ?>
             }
         }
     }