Merge pull request #5788 from vuestorefront/#4682-fix/incorrect-load-…

…of-default-address-in-checkout fix: load default address in checkout
vuestorefront · Apr 21, 2021 · bd24d6c · bd24d6c
2 parents ce23de4 + 5de7ef5
commit bd24d6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,6 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix Original Price Calculation typo - @akucharczyk / @lukaszjedrasik (#5472)
 - Purge loader works properly with dynamic config reload - @Fifciu
 - Multi-tab cart-sync in multi-store environment - @cewald (#5711, #5732)
+- Incorrect load of default address in checkout - @lukaszjedrasik ([#4682](https://github.com/vuestorefront/vue-storefront/issues/4682))
 
 ### Changed / Improved
 

diff --git a/core/modules/checkout/components/Shipping.ts b/core/modules/checkout/components/Shipping.ts
@@ -62,9 +62,9 @@ export const Shipping = {
     shipToMyAddress: {
       handler () {
         this.useMyAddress()
-      },
-      immediate: true
-    }
+      }
+    },
+    '$route.hash': 'useMyAddress'
   },
   mounted () {
     this.checkDefaultShippingAddress()