@tap-payments/auth-jsconnect 1.1.0-test → 1.1.1-test

package/build/@types/form.d.ts

@@ -49,7 +49,7 @@ export declare type BankFormValues = {
     iban: string;
     beneficiaryName: string;
     bankName: string;
-    bankStatementId: string;
+    bankStatementId?: string;
     uploading?: boolean;
     confirmPolicy: boolean;
 };

package/build/api/lead.d.ts

@@ -27,6 +27,7 @@ declare type BrandContent = {
     about?: BrandTitle;
 };
 declare type BrandInfo = {
+    id?: string;
     name?: BrandTitle;
     sector?: Array<string>;
     website?: string;

package/build/components/FileInput/UploadInput.js

@@ -33,6 +33,6 @@ var UploadInput = function (_a) {
         if (event.target.files)
             onChange === null || onChange === void 0 ? void 0 : onChange(event.target.files[0]);
     };
-    return (_jsxs(UploadBoxStyled, __assign({ onClick: openDeviceMedia }, { children: [_jsx(Text, __assign({ sx: { fontSize: '12px' } }, { children: title })), _jsx(UploadInputStyled, { onChange: onFileChange, id: 'upload-file-input', inputRef: fileRef, type: 'file', inputProps: { accept: '.png,.jpg,.pdf,.jpeg' }, required: true })] })));
+    return (_jsxs(UploadBoxStyled, __assign({ onClick: openDeviceMedia }, { children: [_jsx(Text, __assign({ sx: { fontSize: '12px' } }, { children: title })), _jsx(UploadInputStyled, { onChange: onFileChange, id: 'upload-file-input', inputRef: fileRef, type: 'file', inputProps: { accept: '.png,.jpg,.pdf,.jpeg' } })] })));
 };
 export default UploadInput;

package/build/features/app/bank/bankStore.js

@@ -271,7 +271,6 @@ var initialState = {
             iban: '',
             beneficiaryName: '',
             bankName: '',
-            bankStatementId: '',
             confirmPolicy: false,
             uploading: false
         }

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

@@ -309,10 +309,10 @@ export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', funct
     });
 }); });
 export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, instagram, twitter, _b, mobileData, nidData, otpData, brandData, isAbsher, responseBody, isExistingUser, payload, data;
-    var _c, _d, _e, _f, _g, _h, _j, _k, _l;
-    return __generator(this, function (_m) {
-        switch (_m.label) {
+    var _a, settings, connect, instagram, twitter, _b, mobileData, nidData, otpData, brandData, isAbsher, responseBody, isExistingUser, isOther, brand, payload, data;
+    var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    return __generator(this, function (_p) {
+        switch (_p.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
                 instagram = !!((_c = params.links) === null || _c === void 0 ? void 0 : _c.instagram) ? "".concat(INSTAGRAM_URL, "/").concat((_d = params.links) === null || _d === void 0 ? void 0 : _d.instagram) : '';
@@ -321,17 +321,19 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 isAbsher = otpData.isAbsher;
                 responseBody = (isAbsher ? nidData : mobileData).responseBody;
                 isExistingUser = (responseBody === null || responseBody === void 0 ? void 0 : responseBody.new_user) === false;
+                isOther = ((_g = params.selectedBrandItem) === null || _g === void 0 ? void 0 : _g.id) === 'other';
+                brand = __assign({ name: {
+                        en: params.brandName,
+                        ar: params.brandName,
+                        zh: params.brandName
+                    }, website: (_h = params.links) === null || _h === void 0 ? void 0 : _h.website, social: [twitter, instagram] }, (isExistingUser &&
+                    !isOther && {
+                    id: (_j = params.selectedBrandItem) === null || _j === void 0 ? void 0 : _j.id,
+                    name: undefined
+                }));
                 payload = {
-                    brand: {
-                        name: {
-                            en: params.brandName,
-                            ar: params.brandName,
-                            zh: params.brandName
-                        },
-                        website: (_g = params.links) === null || _g === void 0 ? void 0 : _g.website,
-                        social: [twitter, instagram]
-                    },
-                    id: (isExistingUser ? (_h = brandData.responseBody) === null || _h === void 0 ? void 0 : _h.lead_id : (_j = otpData.responseBody) === null || _j === void 0 ? void 0 : _j.lead_id) || '',
+                    brand: brand,
+                    id: (isExistingUser ? (_k = brandData.responseBody) === null || _k === void 0 ? void 0 : _k.lead_id : (_l = otpData.responseBody) === null || _l === void 0 ? void 0 : _l.lead_id) || '',
                     terms_conditions_accepted: params.termAndConditionChecked,
                     step_name: CONNECT_STEP_NAMES.UPDATE_LEAD_MERCHANT,
                     encryption_contract: [
@@ -345,10 +347,10 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 1:
-                data = (_m.sent()).data;
+                data = (_p.sent()).data;
                 if (!data.errors) {
                     thunkApi.dispatch(handleNextScreenStep());
-                    (_l = (_k = settings.data.appConfig).onStepCompleted) === null || _l === void 0 ? void 0 : _l.call(_k, settings.data.activeScreen.name, params);
+                    (_o = (_m = settings.data.appConfig).onStepCompleted) === null || _o === void 0 ? void 0 : _o.call(_m, settings.data.activeScreen.name, params);
                 }
                 return [2, { response: data, formData: params }];
         }

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

@@ -51,10 +51,8 @@ var BrandList = function (_a) {
     var _b = React.useState(null), anchorEl = _b[0], setAnchorEl = _b[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var _c = useFormContext(), setValue = _c.setValue, control = _c.control;
-    var linksControl = useController({ control: control, name: 'links' });
+    var control = useFormContext().control;
     var selectedBrandControl = useController({ control: control, name: 'selectedBrandItem' });
-    var links = linksControl.field.value;
     var selectedBrand = selectedBrandControl.field.value;
     var onOpenBrandList = function (event) {
         var _a;
@@ -79,8 +77,6 @@ var BrandList = function (_a) {
     var onSelectItem = function (brand) {
         selectedBrandControl.field.onChange(brand);
         onCloseBrandList();
-        var website = brand.website;
-        setValue('links', __assign(__assign({}, links), { website: website }), { shouldValidate: true });
     };
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputStyled, { label: t('select_brand_label'), readOnly: true, onClick: !!anchorEl ? onCloseBrandList : onOpenBrandList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_brand'), value: t(getBrandName(selectedBrand)) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'id', list: list, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsx(BrandContainer, { children: _jsx(BrandNameText, __assign({ isSelected: getBrandId(item) === getBrandId(selectedBrand) }, { children: isOtherLicense(item) ? t(getBrandName(item)) : getBrandName(item) })) }), getBrandId(item) === getBrandId(selectedBrand) && _jsx(CheckIcon, {})] }));

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

@@ -18,6 +18,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import Form from '../../../../components/Form';
+import { INSTAGRAM_URL, TWITTER_URL } from '../../../../constants';
 import { ScreenContainer } from '../../../shared/Containers';
 import Button from '../../../shared/Button';
 import { clearError, connectSelector, updateLeadBrand } from '../../../app/connect/connectStore';
@@ -50,6 +51,7 @@ var Merchant = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
+    var formDataSelectedBrand = methods.getValues('selectedBrandItem');
     var onSubmit = function (formData) {
         dispatch(updateLeadBrand(formData));
     };
@@ -69,11 +71,11 @@ var Merchant = function (_a) {
             methods.setError('brandName', { message: 'Profile Name already exists' });
     }, [responseBody]);
     React.useEffect(function () {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if (isNewUser === true) {
             setUserType(ValidationOptions.NEW_USER);
         }
-        if (isNewUser === false && (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0 && methods.getValues('selectedBrandItem').id === 'other') {
+        if (isNewUser === false && (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0 && (formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.id) === 'other') {
             setUserType(ValidationOptions.EXISTING_USER_WITH_OTHER_BRAND);
             methods.clearErrors();
             setTimeout(function () {
@@ -82,17 +84,17 @@ var Merchant = function (_a) {
                 methods.setValue('links', sites);
             }, 100);
         }
-        if (isNewUser === false && (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0 && methods.getValues('selectedBrandItem').id !== 'other') {
+        if (isNewUser === false && (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0 && (formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.id) !== 'other') {
             setUserType(ValidationOptions.EXISTING_USER_WITH_EXIST_BRAND);
             methods.clearErrors();
-            var twitter = ((_a = selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.social) === null || _a === void 0 ? void 0 : _a.find(function (item) { return item.includes('twitter.com'); })) || '';
-            var instagram = ((_b = selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.social) === null || _b === void 0 ? void 0 : _b.find(function (item) { return item.includes('instagram.com'); })) || '';
-            var sites_1 = __assign(__assign({}, links), { website: selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.website, twitter: twitter, instagram: instagram });
+            var twitter = ((_b = (_a = formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.social) === null || _a === void 0 ? void 0 : _a.find(function (item) { return item.includes('twitter.com'); })) === null || _b === void 0 ? void 0 : _b.replaceAll("".concat(TWITTER_URL, "/"), '')) || '';
+            var instagram = ((_d = (_c = formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.social) === null || _c === void 0 ? void 0 : _c.find(function (item) { return item.includes('instagram.com'); })) === null || _d === void 0 ? void 0 : _d.replaceAll("".concat(INSTAGRAM_URL, "/"), '')) || '';
+            var sites_1 = __assign(__assign({}, links), { website: formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.website, twitter: twitter, instagram: instagram });
             setTimeout(function () { return methods.setValue('links', sites_1, { shouldValidate: true }); }, 100);
         }
-    }, [methods.getValues('selectedBrandItem'), isNewUser]);
+    }, [formDataSelectedBrand, isNewUser]);
     React.useEffect(function () {
-        if (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id)
+        if (!(formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.id) && (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id))
             methods.setValue('selectedBrandItem', selectedBrandItem, { shouldValidate: true });
     }, [selectedBrandItem]);
     var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName || !!error;

package/build/features/shared/Button/Button.js

@@ -37,7 +37,7 @@ var IconStyled = styled(Icon, { shouldForwardProp: function (prop) { return prop
         width: theme.spacing(3),
         height: theme.spacing(3),
         transform: isAr ? 'scaleX(-1)' : 'scaleX(1)',
-        marginInlineEnd: theme.spacing(0.5)
+        marginInlineEnd: theme.spacing(-0.375)
     });
 });
 var BackIconStyled = styled(Icon, { shouldForwardProp: function (prop) { return prop !== 'isAr'; } })(function (_a) {

package/package.json

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