@tap-payments/auth-jsconnect 2.3.99-test → 2.4.0-test

package/build/features/app/brand/brandStore.js

@@ -532,11 +532,7 @@ export var brandSlice = createSlice({
             (_d = brand === null || brand === void 0 ? void 0 : brand.terms) === null || _d === void 0 ? void 0 : _d.forEach(function (element) {
                 if ((element === null || element === void 0 ? void 0 : element.term) === 'general') {
                     state.data.brandActivities.termAndConditionChecked = element.agree;
-                }
-                if ((element === null || element === void 0 ? void 0 : element.term) === 'chargeback') {
                     state.data.brandActivities.transactionPolicy = element.agree;
-                }
-                if ((element === null || element === void 0 ? void 0 : element.term) === 'refund') {
                     state.data.brandActivities.refundPolicy = element.agree;
                 }
             });
@@ -590,11 +586,7 @@ export var brandSlice = createSlice({
             (_d = brand === null || brand === void 0 ? void 0 : brand.terms) === null || _d === void 0 ? void 0 : _d.forEach(function (element) {
                 if ((element === null || element === void 0 ? void 0 : element.term) === 'general') {
                     state.data.brandActivities.termAndConditionChecked = element.agree;
-                }
-                if ((element === null || element === void 0 ? void 0 : element.term) === 'chargeback') {
                     state.data.brandActivities.transactionPolicy = element.agree;
-                }
-                if ((element === null || element === void 0 ? void 0 : element.term) === 'refund') {
                     state.data.brandActivities.refundPolicy = element.agree;
                 }
             });
@@ -642,11 +634,7 @@ export var brandSlice = createSlice({
             terms === null || terms === void 0 ? void 0 : terms.forEach(function (element) {
                 if ((element === null || element === void 0 ? void 0 : element.term) === 'general') {
                     state.data.brandActivities.termAndConditionChecked = element.agree;
-                }
-                if ((element === null || element === void 0 ? void 0 : element.term) === 'chargeback') {
                     state.data.brandActivities.transactionPolicy = element.agree;
-                }
-                if ((element === null || element === void 0 ? void 0 : element.term) === 'refund') {
                     state.data.brandActivities.refundPolicy = element.agree;
                 }
             });

package/build/features/app/business/businessStore.js

@@ -103,7 +103,7 @@ export var verifyLeadToken = createAsyncThunk('businessVerifyLeadToken', functio
                 hasBusinessCRInfoCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_INFO) && hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_INFO_CONFIRM);
                 hasBusinessCRActivitiesCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_ACTIVITIES);
                 hasBusinessCustomersCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CUSTOMERS);
-                if (!(!entity_activities && hasBusinessCRInfoCompleted && !hasBusinessCompleted)) return [3, 4];
+                if (!(!entity_activities && (hasBusinessCRInfoCompleted || hasBusinessCRActivitiesCompleted) && !hasBusinessCompleted)) return [3, 4];
                 return [4, API.dataService.getActivities()];
             case 3:
                 activityList = (_b.sent()).list;
@@ -237,7 +237,7 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 _j.label = 6;
             case 6:
                 entity_activities = leadData.entity_activities;
-                if (!(!entity_activities && hasBusinessCRInfoCompleted && !hasBusinessCompleted)) return [3, 8];
+                if (!(!entity_activities && (hasBusinessCRInfoCompleted || hasBusinessCRActivitiesCompleted) && !hasBusinessCompleted)) return [3, 8];
                 return [4, API.dataService.getActivities()];
             case 7:
                 activityList = (_j.sent()).list;
@@ -795,7 +795,7 @@ export var businessSlice = createSlice({
             state.customLoading = false;
             var _c = action.payload, data = _c.data, boardId = _c.boardId, brandData = _c.brandData, leadData = _c.leadData, token = _c.token, isRequireOTP = _c.isRequireOTP;
             var responseBody = state.data.verify.responseBody;
-            state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, data), leadData), responseBody), { board_id: boardId, lead_id: data === null || data === void 0 ? void 0 : data.id });
+            state.data.verify.responseBody = __assign(__assign(__assign(__assign(__assign({}, data), leadData), responseBody), { board_id: boardId, lead_id: data === null || data === void 0 ? void 0 : data.id }), (brandData && { brand: brandData }));
             if (token)
                 state.data.verify.token = token;
             state.data.otpData.isNID = false;
@@ -812,6 +812,13 @@ export var businessSlice = createSlice({
                 var activities = (brandData || {}).activities;
                 return activities === null || activities === void 0 ? void 0 : activities.find(function (value) { return activity.id === value.id; });
             });
+            var terms = (brandData || {}).terms;
+            terms === null || terms === void 0 ? void 0 : terms.forEach(function (element) {
+                if ((element === null || element === void 0 ? void 0 : element.term) === 'general') {
+                    state.data.customersData.transactionPolicy = element.agree;
+                    state.data.customersData.refundPolicy = element.agree;
+                }
+            });
             state.data.activitiesData.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : [];
             state.data.businessTypeData.responseBody = __assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities });
         })
@@ -847,7 +854,7 @@ export var businessSlice = createSlice({
             var _c = action.payload, data = _c.data, formData = _c.formData, brand = _c.brand, leadData = _c.leadData;
             state.data.otpData = formData;
             state.data.otpData.responseBody = data;
-            state.data.verify.responseBody = __assign(__assign(__assign({}, leadData), state.data.verify.responseBody), { flows: (leadData === null || leadData === void 0 ? void 0 : leadData.flows) || [] });
+            state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, leadData), state.data.verify.responseBody), (brand && { brand: brand })), { flows: (leadData === null || leadData === void 0 ? void 0 : leadData.flows) || [] });
             var _d = leadData || {}, entity = _d.entity, entity_activities = _d.entity_activities, business_name = _d.business_name;
             if (business_name === null || business_name === void 0 ? void 0 : business_name.en)
                 state.data.businessTypeData.entityLegalName = business_name === null || business_name === void 0 ? void 0 : business_name.en;
@@ -859,6 +866,13 @@ export var businessSlice = createSlice({
                 var activities = (brand || {}).activities;
                 return activities === null || activities === void 0 ? void 0 : activities.find(function (value) { return value.id === activity.id; });
             });
+            var terms = (brand || {}).terms;
+            terms === null || terms === void 0 ? void 0 : terms.forEach(function (element) {
+                if ((element === null || element === void 0 ? void 0 : element.term) === 'general') {
+                    state.data.customersData.transactionPolicy = element.agree;
+                    state.data.customersData.refundPolicy = element.agree;
+                }
+            });
             state.data.activitiesData.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : [];
             state.data.businessTypeData.responseBody = __assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities });
         })
@@ -1057,6 +1071,13 @@ export var businessSlice = createSlice({
             }
             var activities = entity_activities || [];
             state.data.businessTypeData.responseBody = __assign(__assign(__assign(__assign(__assign({}, data), state.data.businessTypeData.responseBody), { activities: activities }), accountData), documentData);
+            var terms = (brand || {}).terms;
+            terms === null || terms === void 0 ? void 0 : terms.forEach(function (element) {
+                if ((element === null || element === void 0 ? void 0 : element.term) === 'general') {
+                    state.data.customersData.transactionPolicy = element.agree;
+                    state.data.customersData.refundPolicy = element.agree;
+                }
+            });
             state.data.verify.responseBody = __assign(__assign(__assign({}, state.data.verify.responseBody), { entity: entity }), (brand && { brand: brand }));
         })
             .addCase(updateLeadBusinessType.rejected, function (state, action) {

package/build/features/brand/screens/BrandActivities/BrandActivities.js

@@ -87,6 +87,6 @@ var BrandActivities = function (_a) {
     var isCustomerBaseListActive = listActive === ListType.CustomerBaseList;
     var isExpectedCustomerListActive = listActive === ListType.ExpectedCustomerList;
     var isExpectedSalesListActive = listActive === ListType.ExpectedSalesList;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(ActivitiesList, { readOnly: readOnly['activities'] || noneEditable['activities'], show: !isCustomerBaseListActive && !isExpectedCustomerListActive && !isExpectedSalesListActive, onListOpen: function () { return handleMenuClick(ListType.ActivitiesList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(CustomerBase, { readOnly: readOnly['customerLocations'] || noneEditable['operations.customer_base_location'], show: !isActivitiesListActive && !isExpectedCustomerListActive && !isExpectedSalesListActive, onListOpen: function () { return handleMenuClick(ListType.CustomerBaseList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(ExpectedCustomers, { readOnly: readOnly['expectedCustomer'] || noneEditable['operations.customer_base'], show: !isActivitiesListActive && !isCustomerBaseListActive && !isExpectedSalesListActive, onListOpen: function () { return handleMenuClick(ListType.ExpectedCustomerList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(ExpectedSalesRange, { readOnly: readOnly['expectedSale'] || noneEditable['operations.sales_range'], show: !isActivitiesListActive && !isCustomerBaseListActive && !isExpectedCustomerListActive, onListOpen: function () { return handleMenuClick(ListType.ExpectedSalesList); }, onListClose: function () { return handleMenuClick(); } }), _jsxs(Collapse, __assign({ in: !listActive }, { children: [_jsx(TAC, { show: true, readOnly: readOnly['termAndConditionChecked'] || noneEditable['terms'] }), _jsx(RefundPolicy, { readOnly: readOnly['refundPolicy'] || noneEditable['terms'] }), _jsx(TransactionPolicy, { readOnly: readOnly['transactionPolicy'] || noneEditable['terms'] }), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') }))] }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(ActivitiesList, { readOnly: readOnly['activities'] || noneEditable['activities'], show: !isCustomerBaseListActive && !isExpectedCustomerListActive && !isExpectedSalesListActive, onListOpen: function () { return handleMenuClick(ListType.ActivitiesList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(CustomerBase, { readOnly: readOnly['customerLocations'] || noneEditable['operations.customer_base_location'], show: !isActivitiesListActive && !isExpectedCustomerListActive && !isExpectedSalesListActive, onListOpen: function () { return handleMenuClick(ListType.CustomerBaseList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(ExpectedCustomers, { readOnly: readOnly['expectedCustomer'] || noneEditable['operations.customer_base'], show: !isActivitiesListActive && !isCustomerBaseListActive && !isExpectedSalesListActive, onListOpen: function () { return handleMenuClick(ListType.ExpectedCustomerList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(ExpectedSalesRange, { readOnly: readOnly['expectedSale'] || noneEditable['operations.sales_range'], show: !isActivitiesListActive && !isCustomerBaseListActive && !isExpectedCustomerListActive, onListOpen: function () { return handleMenuClick(ListType.ExpectedSalesList); }, onListClose: function () { return handleMenuClick(); } }), _jsxs(Collapse, __assign({ in: !listActive }, { children: [_jsx(TAC, { readOnly: readOnly['termAndConditionChecked'] || noneEditable['terms'] }), _jsx(RefundPolicy, { readOnly: readOnly['refundPolicy'] || noneEditable['terms'] }), _jsx(TransactionPolicy, { readOnly: readOnly['transactionPolicy'] || noneEditable['terms'] }), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') }))] }))] })) })) }));
 };
 export default BrandActivities;

package/build/features/brand/screens/BrandActivities/RefundPolicy.js

@@ -76,11 +76,11 @@ var RefundPolicy = function (_a) {
     var refundChecked = refundControl.field.value;
     var warningMessage = (_d = refundControl.fieldState.error) === null || _d === void 0 ? void 0 : _d.message;
     var countryCode = settingsData.businessCountry.iso2.toLowerCase();
-    var disabled = React.useMemo(function () {
+    var isChecked = React.useMemo(function () {
         var _a, _b;
         return !!((_b = (_a = terms === null || terms === void 0 ? void 0 : terms.find) === null || _a === void 0 ? void 0 : _a.call(terms, function (_a) {
             var term = _a.term;
-            return term === 'refund';
+            return term === 'general';
         })) === null || _b === void 0 ? void 0 : _b.agree);
     }, [terms]);
     var handleRefundCheckedChange = function (event, checked) {
@@ -88,6 +88,6 @@ var RefundPolicy = function (_a) {
             return;
         refundControl.field.onChange(checked);
     };
-    return (_jsxs(ScreenContainer, { children: [_jsxs(ContainerStyled, __assign({ readOnly: readOnly }, { children: [_jsx(CheckboxStyled, { disabled: disabled, disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: refundChecked, onChange: handleRefundCheckedChange }), _jsxs(TextStyled, { children: [t('agree_on_refund_policy'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.REFUND_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.REFUND_EN, target: '_blank', underline: 'always' }, { children: t('refund_policy_compliance') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] }));
+    return (_jsx(Collapse, __assign({ in: !isChecked }, { children: _jsxs(ScreenContainer, { children: [_jsxs(ContainerStyled, __assign({ readOnly: readOnly }, { children: [_jsx(CheckboxStyled, { disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: refundChecked, onChange: handleRefundCheckedChange }), _jsxs(TextStyled, { children: [t('agree_on_refund_policy'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.REFUND_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.REFUND_EN, target: '_blank', underline: 'always' }, { children: t('refund_policy_compliance') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] }) })));
 };
 export default RefundPolicy;

package/build/features/brand/screens/BrandActivities/TAC.d.ts

@@ -12,8 +12,7 @@ export declare const TACContainerStyled: import("@emotion/styled").StyledCompone
     ref?: ((instance: HTMLDivElement | null) => void) | React.RefObject<HTMLDivElement> | null | undefined;
 }, keyof import("@mui/material/OverridableComponent").CommonProps | ("border" | "borderTop" | "borderRight" | "borderBottom" | "borderLeft" | "borderColor" | "borderRadius" | "display" | "displayPrint" | "overflow" | "textOverflow" | "visibility" | "whiteSpace" | "flexBasis" | "flexDirection" | "flexWrap" | "justifyContent" | "alignItems" | "alignContent" | "order" | "flex" | "flexGrow" | "flexShrink" | "alignSelf" | "justifyItems" | "justifySelf" | "gap" | "columnGap" | "rowGap" | "gridColumn" | "gridRow" | "gridAutoFlow" | "gridAutoColumns" | "gridAutoRows" | "gridTemplateColumns" | "gridTemplateRows" | "gridTemplateAreas" | "gridArea" | "bgcolor" | "color" | "zIndex" | "position" | "top" | "right" | "bottom" | "left" | "boxShadow" | "width" | "maxWidth" | "minWidth" | "height" | "maxHeight" | "minHeight" | "boxSizing" | "m" | "mt" | "mr" | "mb" | "ml" | "mx" | "my" | "p" | "pt" | "pr" | "pb" | "pl" | "px" | "py" | "margin" | "marginTop" | "marginRight" | "marginBottom" | "marginLeft" | "marginX" | "marginY" | "padding" | "paddingTop" | "paddingRight" | "paddingBottom" | "paddingLeft" | "paddingX" | "paddingY" | "typography" | "fontFamily" | "fontSize" | "fontStyle" | "fontWeight" | "letterSpacing" | "lineHeight" | "textAlign" | "textTransform") | "children" | "component" | "ref" | "sx"> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme> & TACContainerStyledProps, {}, {}>;
 interface TACProps {
-    show: boolean;
     readOnly?: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ show, readOnly }: TACProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ readOnly }: TACProps) => JSX.Element>;
 export default _default;

package/build/features/brand/screens/BrandActivities/TAC.js

@@ -65,7 +65,7 @@ var CollapseStyled = styled(Collapse)(function () { return ({
 }); });
 var TAC = function (_a) {
     var _b, _c, _d;
-    var show = _a.show, readOnly = _a.readOnly;
+    var readOnly = _a.readOnly;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var control = useFormContext().control;
@@ -76,7 +76,7 @@ var TAC = function (_a) {
     var tacChecked = tacControl.field.value;
     var warningMessage = (_d = tacControl.fieldState.error) === null || _d === void 0 ? void 0 : _d.message;
     var countryCode = settingsData.businessCountry.iso2.toLowerCase();
-    var disabled = React.useMemo(function () {
+    var isChecked = React.useMemo(function () {
         var _a, _b;
         return !!((_b = (_a = terms === null || terms === void 0 ? void 0 : terms.find) === null || _a === void 0 ? void 0 : _a.call(terms, function (_a) {
             var term = _a.term;
@@ -88,6 +88,6 @@ var TAC = function (_a) {
             return;
         tacControl.field.onChange(checked);
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.75 } }, { children: [_jsxs(TACContainerStyled, __assign({ readOnly: readOnly }, { children: [_jsx(CheckboxStyled, { disabled: disabled, disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: tacChecked, onChange: handleTACCheckedChange }), _jsxs(TextStyled, { children: [t('read_agree_terms_and_conditions_message'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_EN, target: '_blank', underline: 'always' }, { children: t('terms_and_conditions_link_title') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] })) })));
+    return (_jsx(Collapse, __assign({ in: !isChecked }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.75 } }, { children: [_jsxs(TACContainerStyled, __assign({ readOnly: readOnly }, { children: [_jsx(CheckboxStyled, { disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: tacChecked, onChange: handleTACCheckedChange }), _jsxs(TextStyled, { children: [t('read_agree_terms_and_conditions_message'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_EN, target: '_blank', underline: 'always' }, { children: t('terms_and_conditions_link_title') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] })) })));
 };
 export default React.memo(TAC);

package/build/features/brand/screens/BrandActivities/TransactionPolicy.js

@@ -39,11 +39,11 @@ var TransactionPolicy = function (_a) {
     var transactionChecked = transactionControl.field.value;
     var warningMessage = (_d = transactionControl.fieldState.error) === null || _d === void 0 ? void 0 : _d.message;
     var countryCode = settingsData.businessCountry.iso2.toLowerCase();
-    var disabled = React.useMemo(function () {
+    var isChecked = React.useMemo(function () {
         var _a, _b;
         return !!((_b = (_a = terms === null || terms === void 0 ? void 0 : terms.find) === null || _a === void 0 ? void 0 : _a.call(terms, function (_a) {
             var term = _a.term;
-            return term === 'chargeback';
+            return term === 'general';
         })) === null || _b === void 0 ? void 0 : _b.agree);
     }, [terms]);
     var handleTransactionCheckedChange = function (event, checked) {
@@ -51,6 +51,6 @@ var TransactionPolicy = function (_a) {
             return;
         transactionControl.field.onChange(checked);
     };
-    return (_jsxs(ScreenContainer, { children: [_jsxs(ContainerStyled, __assign({ readOnly: readOnly }, { children: [_jsx(CheckboxStyled, { disabled: disabled, disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: transactionChecked, onChange: handleTransactionCheckedChange }), _jsxs(TextStyled, { children: [t('agree_on_chargeback_policy'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TRANSACTION_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TRANSACTION_EN, target: '_blank', underline: 'always' }, { children: t('chargeback_policy') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] }));
+    return (_jsx(Collapse, __assign({ in: !isChecked }, { children: _jsxs(ScreenContainer, { children: [_jsxs(ContainerStyled, __assign({ readOnly: readOnly }, { children: [_jsx(CheckboxStyled, { disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: transactionChecked, onChange: handleTransactionCheckedChange }), _jsxs(TextStyled, { children: [t('agree_on_chargeback_policy'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TRANSACTION_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TRANSACTION_EN, target: '_blank', underline: 'always' }, { children: t('chargeback_policy') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] }) })));
 };
 export default TransactionPolicy;

package/build/features/business/screens/Customers/RefundPolicy.js

@@ -10,6 +10,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import * as React from 'react';
 import Box from '@mui/material/Box';
 import { styled, alpha } from '@mui/material/styles';
 import CheckBox from '../../../../components/CheckBox';
@@ -21,9 +22,10 @@ import Text from '../../../../components/Text';
 import Link from '@mui/material/Link';
 import Warning from '../../../../components/Warning';
 import { EXTERNAL_LINKS, TAP_WEBSITE } from '../../../../constants';
-import { ScreenContainer } from '../../../shared/Containers';
 import { settingsSelector } from '../../../../app/settings';
 import { useAppSelector } from '../../../../hooks';
+import { ScreenContainer } from '../../../shared/Containers';
+import { businessSelector } from '../../../app/business/businessStore';
 export var ContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -65,18 +67,27 @@ export var LinkStyled = styled(Link)(function (_a) {
     });
 });
 var RefundPolicy = function () {
-    var _a;
+    var _a, _b, _c;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var control = useFormContext().control;
     var settingsData = useAppSelector(settingsSelector).data;
+    var data = useAppSelector(businessSelector).data;
+    var terms = (_b = (_a = data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.brand) === null || _b === void 0 ? void 0 : _b.terms;
     var refundControl = useController({ control: control, name: 'refundPolicy' });
     var refundChecked = refundControl.field.value;
-    var warningMessage = (_a = refundControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
+    var warningMessage = (_c = refundControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message;
     var countryCode = settingsData.businessCountry.iso2.toLowerCase();
     var handleRefundCheckedChange = function (event, checked) {
         refundControl.field.onChange(checked);
     };
-    return (_jsxs(ScreenContainer, __assign({ sx: { mt: 2.75 } }, { children: [_jsxs(ContainerStyled, { children: [_jsx(CheckboxStyled, { disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: refundChecked, onChange: handleRefundCheckedChange }), _jsxs(TextStyled, { children: [t('agree_on_refund_policy'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.REFUND_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.REFUND_EN, target: '_blank', underline: 'always' }, { children: t('refund_policy_compliance') }))] })] }), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] })));
+    var isChecked = React.useMemo(function () {
+        var _a, _b;
+        return !!((_b = (_a = terms === null || terms === void 0 ? void 0 : terms.find) === null || _a === void 0 ? void 0 : _a.call(terms, function (_a) {
+            var term = _a.term;
+            return term === 'general';
+        })) === null || _b === void 0 ? void 0 : _b.agree);
+    }, [terms]);
+    return (_jsx(Collapse, __assign({ in: !isChecked }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.75 } }, { children: [_jsxs(ContainerStyled, { children: [_jsx(CheckboxStyled, { disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: refundChecked, onChange: handleRefundCheckedChange }), _jsxs(TextStyled, { children: [t('agree_on_refund_policy'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.REFUND_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.REFUND_EN, target: '_blank', underline: 'always' }, { children: t('refund_policy_compliance') }))] })] }), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] })) })));
 };
 export default RefundPolicy;

package/build/features/business/screens/Customers/TransactionPolicy.js

@@ -10,33 +10,43 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import * as React from 'react';
 import { styled } from '@mui/material/styles';
-import Collapse from '../../../../components/Collapse';
 import { useTranslation } from 'react-i18next';
-import { useLanguage } from '../../../../hooks';
 import { useController, useFormContext } from 'react-hook-form';
-import Warning from '../../../../components/Warning';
+import { useLanguage, useAppSelector } from '../../../../hooks';
+import { settingsSelector } from '../../../../app/settings';
 import { EXTERNAL_LINKS, TAP_WEBSITE } from '../../../../constants';
-import { ContainerStyled, CheckboxStyled, TextStyled, LinkStyled } from './RefundPolicy';
+import Collapse from '../../../../components/Collapse';
+import Warning from '../../../../components/Warning';
 import { ScreenContainer } from '../../../shared/Containers';
-import { settingsSelector } from '../../../../app/settings';
-import { useAppSelector } from '../../../../hooks';
+import { businessSelector } from '../../../app/business/businessStore';
+import { ContainerStyled, CheckboxStyled, TextStyled, LinkStyled } from './RefundPolicy';
 var CollapseStyled = styled(Collapse)(function () { return ({
     width: '100%'
 }); });
 var TransactionPolicy = function () {
-    var _a;
+    var _a, _b, _c;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var control = useFormContext().control;
     var settingsData = useAppSelector(settingsSelector).data;
+    var data = useAppSelector(businessSelector).data;
+    var terms = (_b = (_a = data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.brand) === null || _b === void 0 ? void 0 : _b.terms;
     var transactionControl = useController({ control: control, name: 'transactionPolicy' });
     var transactionChecked = transactionControl.field.value;
-    var warningMessage = (_a = transactionControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
+    var warningMessage = (_c = transactionControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message;
     var countryCode = settingsData.businessCountry.iso2.toLowerCase();
     var handleTransactionCheckedChange = function (event, checked) {
         transactionControl.field.onChange(checked);
     };
-    return (_jsxs(ScreenContainer, { children: [_jsxs(ContainerStyled, { children: [_jsx(CheckboxStyled, { disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: transactionChecked, onChange: handleTransactionCheckedChange }), _jsxs(TextStyled, { children: [t('agree_on_chargeback_policy'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TRANSACTION_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TRANSACTION_EN, target: '_blank', underline: 'always' }, { children: t('chargeback_policy') }))] })] }), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] }));
+    var isChecked = React.useMemo(function () {
+        var _a, _b;
+        return !!((_b = (_a = terms === null || terms === void 0 ? void 0 : terms.find) === null || _a === void 0 ? void 0 : _a.call(terms, function (_a) {
+            var term = _a.term;
+            return term === 'general';
+        })) === null || _b === void 0 ? void 0 : _b.agree);
+    }, [terms]);
+    return (_jsx(Collapse, __assign({ in: !isChecked }, { children: _jsxs(ScreenContainer, { children: [_jsxs(ContainerStyled, { children: [_jsx(CheckboxStyled, { disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: transactionChecked, onChange: handleTransactionCheckedChange }), _jsxs(TextStyled, { children: [t('agree_on_chargeback_policy'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TRANSACTION_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TRANSACTION_EN, target: '_blank', underline: 'always' }, { children: t('chargeback_policy') }))] })] }), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] }) })));
 };
 export default TransactionPolicy;

package/package.json

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