@tap-payments/auth-jsconnect 2.1.52-test → 2.1.53-test

package/build/features/app/connect/connectStore.js

@@ -817,10 +817,10 @@ export var connectSlice = createSlice({
             state.error = action.error.message;
         })
             .addCase(updateLeadIndividual.fulfilled, function (state, action) {
-            var _a, _b;
+            var _a, _b, _c;
             state.loading = false;
             state.error = null;
-            var _c = action.payload, formData = _c.formData, leadResponse = _c.leadResponse;
+            var _d = action.payload, formData = _d.formData, leadResponse = _d.leadResponse;
             var brand = leadResponse.brand, rest = __rest(leadResponse, ["brand"]);
             if (brand) {
                 var channel_services = brand.channel_services, terms = brand.terms;
@@ -832,6 +832,7 @@ export var connectSlice = createSlice({
                 state.data.brandData.termAndConditionChecked = !!termAndCondition;
             }
             var selectedBrand = ((_b = (_a = state.data.brandData) === null || _a === void 0 ? void 0 : _a.responseBody) === null || _b === void 0 ? void 0 : _b.brand_list[0]) || leadResponse.brand;
+            state.data.brandData.brandName = (_c = selectedBrand === null || selectedBrand === void 0 ? void 0 : selectedBrand.name) === null || _c === void 0 ? void 0 : _c.en;
             state.data.brandData.segment = rest.segments_list.find(function (_a) {
                 var _b;
                 var id = _a.id;

package/build/features/connect/screens/Merchant/Merchant.js

@@ -36,17 +36,17 @@ var ListType;
     ListType["BrandList"] = "BrandList";
 })(ListType || (ListType = {}));
 var Merchant = function (_a) {
-    var _b;
-    var _c = React.useState(false), brandNameChecking = _c[0], setBrandNameChecking = _c[1];
-    var _d = React.useState(false), isRequiredNewBrand = _d[0], setIsRequiredNewBrand = _d[1];
-    var _e = useAppSelector(connectSelector), data = _e.data, loading = _e.loading, error = _e.error;
-    var _f = data.brandData, brandName = _f.brandName, selectedBrandItem = _f.selectedBrandItem, termAndConditionChecked = _f.termAndConditionChecked, responseBody = _f.responseBody, salesChannels = _f.salesChannels, segment = _f.segment, teamSize = _f.teamSize;
+    var _b, _c;
+    var _d = React.useState(false), brandNameChecking = _d[0], setBrandNameChecking = _d[1];
+    var _e = React.useState(false), isRequiredNewBrand = _e[0], setIsRequiredNewBrand = _e[1];
+    var _f = useAppSelector(connectSelector), data = _f.data, loading = _f.loading, error = _f.error;
+    var _g = data.brandData, brandName = _g.brandName, selectedBrandItem = _g.selectedBrandItem, termAndConditionChecked = _g.termAndConditionChecked, responseBody = _g.responseBody, salesChannels = _g.salesChannels, segment = _g.segment, teamSize = _g.teamSize;
     var brandList = (responseBody || {}).brand_list;
-    var _g = React.useState(), listActive = _g[0], setListActive = _g[1];
+    var _h = React.useState(), listActive = _h[0], setListActive = _h[1];
     var methods = useForm({
         resolver: yupResolver(MerchantValidationSchema(isRequiredNewBrand)),
         defaultValues: {
-            brandName: brandName,
+            brandName: brandName || ((_b = selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.name) === null || _b === void 0 ? void 0 : _b.en),
             selectedBrandItem: selectedBrandItem,
             termAndConditionChecked: termAndConditionChecked,
             salesChannels: salesChannels,
@@ -68,7 +68,9 @@ var Merchant = function (_a) {
     React.useEffect(function () {
         methods.setValue('segment', segment);
         methods.setValue('teamSize', teamSize);
-    }, [segment, teamSize]);
+        if (brandName)
+            methods.trigger('brandName');
+    }, [segment, teamSize, brandName]);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
@@ -81,8 +83,8 @@ var Merchant = function (_a) {
         if (termAndConditionChecked === true)
             methods.setValue('termAndConditionChecked', termAndConditionChecked);
     }, [termAndConditionChecked]);
-    var brandErrChecks = !!Object.entries(methods.formState.errors).length || !!error;
-    var disabled = brandErrChecks || brandNameChecking || ((_b = data.brandData.responseBody) === null || _b === void 0 ? void 0 : _b.response_code) === '5';
+    var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName || !!error;
+    var disabled = brandErrChecks || brandNameChecking || ((_c = data.brandData.responseBody) === null || _c === void 0 ? void 0 : _c.response_code) === '5';
     var hasBrandList = (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0;
     var isOtherBrand = (brandListItem === null || brandListItem === void 0 ? void 0 : brandListItem.id) === 'other' && hasBrandList;
     var isNewBrand = (brandList === null || brandList === void 0 ? void 0 : brandList.length) === 0 || BrandList === undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tap-payments/auth-jsconnect",
-	"version": "2.1.52-test",
+	"version": "2.1.53-test",
 	"description": "connect library, auth",
 	"private": false,
 	"main": "build/index.js",

package/build/features/individual/screens/IndividualList/BoardList.js

@@ -1 +0,0 @@
-"use strict";

package/build/features/individual/screens/IndividualList/ShareholderList.js

@@ -1 +0,0 @@
-"use strict";

package/build/features/individual/screens/IndividualList/UserList.js

@@ -1 +0,0 @@
-"use strict";

package/build/features/individual/screens/IndividualList/index.js

@@ -1 +0,0 @@
-"use strict";