diff --git a/public/main.profile.dart.js b/public/main.profile.dart.js
index 295c9d5c12ab..f6713cc50297 100644
--- a/public/main.profile.dart.js
+++ b/public/main.profile.dart.js
@@ -86008,7 +86008,7 @@
       this.companyGateway = t1;
     },
     _CompanyGatewayEditState_build__closure12: function _CompanyGatewayEditState_build__closure12(t0) {
-      this._box_0 = t0;
+      this.gateway = t0;
     },
     _CompanyGatewayEditState_build_closure1: function _CompanyGatewayEditState_build_closure1(t0, t1, t2) {
       this.viewModel = t0;
@@ -382237,7 +382237,8 @@
     call$1(value) {
       var t1 = this.$this;
       t1._entity_dropdown$_filter = value;
-      t1._widget.onSelected$1(null);
+      if (t1.get$hasValue())
+        t1._widget.onSelected$1(null);
     },
     $signature: 9
   };
@@ -394843,7 +394844,7 @@
         t11 = J.$index$asx($.LocalizationsProvider__localizedValues.$index(0, t13), "provider");
         if (t11 == null)
           t11 = "";
-        t3.push(A.EntityDropdown$(true, false, false, t2, t4, _null, B.EntityType_gateway, t11, _null, _null, new A._CompanyGatewayEditState_build_closure0(viewModel, companyGateway), _null, _null, _null));
+        t3.push(A.EntityDropdown$(true, false, true, t2, t4, _null, B.EntityType_gateway, t11, _null, _null, new A._CompanyGatewayEditState_build_closure0(viewModel, companyGateway), _null, _null, _null));
       }
       if (B.JSArray_methods.contains$1(connectGateways, t2))
         if (companyGateway.get$isNew() || accountId.length === 0) {
@@ -394948,26 +394949,27 @@
   };
   A._CompanyGatewayEditState_build_closure0.prototype = {
     call$1(gateway) {
-      var t1 = {};
-      t1.gateway = gateway;
-      if (gateway == null)
-        t1.gateway = A.GatewayEntity_GatewayEntity();
-      this.viewModel.onChanged.call$1(this.companyGateway.rebuild$1(new A._CompanyGatewayEditState_build__closure12(t1)));
+      this.viewModel.onChanged.call$1(this.companyGateway.rebuild$1(new A._CompanyGatewayEditState_build__closure12(gateway)));
     },
     $signature: 40
   };
   A._CompanyGatewayEditState_build__closure12.prototype = {
     call$1(b) {
       var t1 = b.get$feesAndLimitsMap(),
-        t2 = this._box_0,
-        t3 = type$.legacy_GatewayEntity._as(t2.gateway).defaultGatewayTypeId;
-      t1.$indexSet(0, t3, A.FeesAndLimitsSettings_FeesAndLimitsSettings(true));
-      t1 = t2.gateway;
-      t1 = t1.get$id(t1);
+        t2 = this.gateway,
+        t3 = t2 == null,
+        t4 = t3 ? A.GatewayEntity_GatewayEntity() : t2;
+      type$.legacy_GatewayEntity._as(t4);
+      t1.$indexSet(0, t4.defaultGatewayTypeId, A.FeesAndLimitsSettings_FeesAndLimitsSettings(true));
+      t1 = t3 ? null : t2.get$id(t2);
+      if (t1 == null)
+        t1 = "";
       b.get$_company_gateway_model$_$this()._gatewayId = t1;
       b.get$_company_gateway_model$_$this()._config = "{}";
-      t2 = t2.gateway.get$listDisplayName();
-      b.get$_company_gateway_model$_$this()._label = t2;
+      t1 = t3 ? null : t2.get$listDisplayName();
+      if (t1 == null)
+        t1 = "";
+      b.get$_company_gateway_model$_$this()._label = t1;
       return b;
     },
     $signature: 54