Merge branch 'dev-v2.1-master' into v2.1-master

Author: mason

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "paymentwall/module-magento2",
     "description": "Offical Paymentwall module for Magento 2",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "type": "magento2-module",
     "homepage": "https://www.paymentwall.com/?source=gh",
     "keywords": [

etc/module.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Paymentwall_Paymentwall" setup_version="2.3.0" schema_version="2.3.0">
+    <module name="Paymentwall_Paymentwall" setup_version="2.3.1" schema_version="2.3.1">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Payment"/>

view/frontend/web/js/view/payment/method-renderer/paymentwall.js

@@ -28,6 +28,12 @@ define(
             initialize: function () {
                 this._super();
 
+                let countryId = quote.shippingAddress().countryId
+                if (countryId) {
+                    this.billingCountryId(countryId);
+                    this.getPaymentwallLocalMethods(countryId);
+                }
+
                 quote.billingAddress.subscribe(function (address) {
                     if (address && address.countryId && address.countryId != this.billingCountryId()) {
                         this.billingCountryId(address.countryId);