@tap-payments/auth-jsconnect 1.0.85 → 1.0.86

package/build/components/AnimationFlow/BottomSheet.js

@@ -60,7 +60,7 @@ var BottomSheetComponent = function (_a) {
     var open = _a.open, children = _a.children, rest = __rest(_a, ["open", "children"]);
     var getMinHeight = function (maxHeight) {
         var element = document.getElementById('main-feature-container');
-        var height = element ? element.clientHeight + 30 : 0;
+        var height = element ? element.clientHeight + 40 : 0;
         return height || maxHeight * 0.7;
     };
     return (_jsx(BottomSheetStyled, __assign({ open: open, snapPoints: function (_a) {

package/build/components/AnimationFlow/Loader.js

@@ -12,5 +12,5 @@ var BoxStyled = styled(Box)(function () { return ({
     zIndex: 2
 }); });
 export default function FlowLoading() {
-    return (_jsx(BoxStyled, { children: _jsx(Loader, { svgStyle: { width: 60, height: 60 }, innerColor: '#000', outerColor: '#000', toggleAnimation: true }) }));
+    return (_jsx(BoxStyled, { children: _jsx(Loader, { svgStyle: { width: 60, height: 60 }, innerColor: 'white', outerColor: 'white', toggleAnimation: true }) }));
 }

package/build/constants/assets.d.ts

@@ -26,6 +26,8 @@ export declare const ICONS_NAMES: {
     CR_ACTIVE_ICON: string;
     INSTAGRAM_ACTIVE_ICON: string;
     TAP_LOGO_EN_ICON: string;
+    TAP_LOGO_TEXT_AR: string;
+    TAP_LOGO_TEXT_EN: string;
     TAP_EN: string;
     TAP_AR: string;
     ID_IMAGE: string;

package/build/constants/assets.js

@@ -25,7 +25,9 @@ export var ICONS_NAMES = {
     CR_ICON: ICONS_FULL_PATH + '/cr' + ICONS_EXTENSION,
     CR_ACTIVE_ICON: ICONS_FULL_PATH + '/cr_active' + ICONS_EXTENSION,
     INSTAGRAM_ACTIVE_ICON: ICONS_FULL_PATH + '/Insta-active' + ICONS_EXTENSION,
-    TAP_LOGO_EN_ICON: ICONS_FULL_PATH + '/tap-logo-white-en' + ICONS_EXTENSION,
+    TAP_LOGO_EN_ICON: ICONS_FULL_PATH + '/tap-white-logo' + ICONS_EXTENSION,
+    TAP_LOGO_TEXT_AR: ICONS_FULL_PATH + '/tap-white-text-ar' + ICONS_EXTENSION,
+    TAP_LOGO_TEXT_EN: ICONS_FULL_PATH + '/tap-white-text-en' + ICONS_EXTENSION,
     TAP_EN: 'https://tap-connecet.b-cdn.net/imgs/tapEN' + ICONS_EXTENSION,
     TAP_AR: 'https://tap-connecet.b-cdn.net/imgs/tapAR' + ICONS_EXTENSION,
     ID_IMAGE: 'https://villageofwarwick.org/wp-content/uploads/2020/02/ICON99-512-1.png',

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

@@ -299,15 +299,13 @@ export var updateActivitiesInfo = createAsyncThunk('updateActivitiesInfo', funct
                 return [4, API.entityService.createEntityInfo(requestBody)];
             case 1:
                 data = (_f.sent()).data;
-                if (!!data.errors) return [3, 3];
-                thunkApi.dispatch(updateStepName(stepName));
-                return [4, thunkApi.dispatch(retrieveDataList())];
-            case 2:
-                _f.sent();
-                thunkApi.dispatch(handleNextScreenStep());
-                (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, requestBody);
-                _f.label = 3;
-            case 3: return [2, { data: data, formData: __assign({}, params) }];
+                thunkApi.dispatch(retrieveDataList());
+                if (!data.errors) {
+                    thunkApi.dispatch(updateStepName(stepName));
+                    thunkApi.dispatch(handleNextScreenStep());
+                    (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, requestBody);
+                }
+                return [2, { data: data, formData: __assign({}, params) }];
         }
     });
 }); });
@@ -707,7 +705,10 @@ export var businessSlice = createSlice({
                 return;
             }
             state.data.activitiesData = formData;
+            console.log('updateActivitiesInfo', state.data.activitiesData.responseBody);
+            console.log('updateActivitiesInfo', data);
             state.data.activitiesData.responseBody = __assign(__assign({}, data), state.data.activitiesData.responseBody);
+            console.log('updateActivitiesInfo', state.data.activitiesData.responseBody);
         })
             .addCase(updateActivitiesInfo.rejected, function (state, action) {
             state.loading = false;

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

@@ -87,7 +87,7 @@ var ExpectedSalesRange = function (_a) {
         var item = isExist(expectedSales || [], expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.id);
         if (item)
             setSubIndex(item.id);
-    }, [anchorEl]);
+    }, [anchorEl, expectedSalesRangeValue]);
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_sales_yearly') }), _jsx(InputStyled, { readOnly: true, value: (isAr ? expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name_ar : expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name_en) || '', onClick: !!anchorEl ? handleCloseMainMenu : handleOpenMainMenu, placeholder: t('choose_expected_sales'), endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleListStyled, { sx: { maxHeight: '350px', paddingTop: 0 }, list: expectedSalesRangeList, listItemProps: { sx: { padding: 0 } }, onSelectItem: function (item) {
                             var isOnlyOneItem = !item.sub || item.sub.length === 1;
                             if (isOnlyOneItem)

package/build/features/business/screens/SuccessWithFlowButtons/SuccessWithFlowButtons.js

@@ -15,7 +15,7 @@ import { useTranslation } from 'react-i18next';
 import { styled } from '@mui/material/styles';
 import { FlowsButtons } from '../../../shared/Button';
 import { ICONS_NAMES } from '../../../../constants';
-import { useAppSelector, useLanguage } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
 import { businessSelector } from '../../../app/business/businessStore';
 import { allAreTruthy, showLastFour } from '../../../../utils';
 import Box from '@mui/material/Box';
@@ -46,6 +46,7 @@ var SuccessWithFlowButtons = function () {
     var _a, _b, _c;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
+    var dispatch = useAppDispatch();
     var _d = React.useState(false), isAcceptance = _d[0], setIsAcceptance = _d[1];
     var _e = React.useState(false), isPayout = _e[0], setIsPayout = _e[1];
     var data = useAppSelector(businessSelector).data;

package/build/features/shared/Background/LogoBackground.js

@@ -9,7 +9,7 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { memo } from 'react';
 import { styled } from '@mui/material/styles';
 import Collapse from '@mui/material/Collapse';
@@ -19,29 +19,52 @@ import { ICONS_NAMES } from '../../../constants';
 import { useLanguage } from '../../../hooks';
 import Fade from '@mui/material/Fade';
 var BoxStyled = styled(Box)(function (_a) {
+    var _b;
+    var theme = _a.theme;
+    return (_b = {
+            display: 'flex',
+            flexDirection: 'column',
+            justifyContent: 'center',
+            alignItems: 'center',
+            paddingTop: theme.spacing(5)
+        },
+        _b[theme.breakpoints.down('sm')] = {
+            paddingTop: theme.spacing(11.5)
+        },
+        _b);
+});
+var LogoBadgeStyled = styled(Icon)(function (_a) {
     var theme = _a.theme;
     return ({
-        display: 'flex',
-        flexDirection: 'column',
-        justifyContent: 'center',
-        alignItems: 'center',
-        marginTop: theme.spacing(5)
+        height: theme.spacing(8.875),
+        width: theme.spacing(8.875)
     });
 });
-var LogoBadgeStyled = styled(Icon)(function () { return ({
-    height: '100%',
-    width: '100%'
-}); });
 var LogoIconBoxStyled = styled(Box)(function (_a) {
+    var _b;
+    var theme = _a.theme;
+    return (_b = {
+            paddingTop: theme.spacing(2.125),
+            width: '100%',
+            display: 'flex',
+            justifyContent: 'center'
+        },
+        _b[theme.transitions.create(['top'])] = {
+            duration: theme.transitions.duration.standard
+        },
+        _b);
+});
+var LogoIconStyled = styled(Icon)(function (_a) {
     var theme = _a.theme;
     return ({
-        height: theme.spacing(14.625),
-        width: theme.spacing(8.875)
+        width: theme.spacing(5.875),
+        height: theme.spacing(3.625),
+        padding: theme.spacing(0)
     });
 });
 var LogoBackground = function (_a) {
     var isTapOrigin = _a.isTapOrigin;
     var isAr = useLanguage().isAr;
-    return (_jsx(Collapse, __assign({ in: isTapOrigin }, { children: _jsx(Fade, __assign({ in: isTapOrigin }, { children: _jsx(BoxStyled, { children: _jsx(LogoIconBoxStyled, { children: _jsx(LogoBadgeStyled, { src: ICONS_NAMES.TAP_LOGO_EN_ICON }) }) }) })) })));
+    return (_jsx(Collapse, __assign({ in: isTapOrigin }, { children: _jsx(Fade, __assign({ in: isTapOrigin }, { children: _jsxs(BoxStyled, { children: [_jsx(LogoBadgeStyled, { src: ICONS_NAMES.TAP_LOGO_EN_ICON }), _jsx(LogoIconBoxStyled, { children: _jsx(LogoIconStyled, { src: isAr ? ICONS_NAMES.TAP_LOGO_TEXT_AR : ICONS_NAMES.TAP_LOGO_TEXT_EN, alt: 'tap logo' }) })] }) })) })));
 };
 export default memo(LogoBackground);

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

@@ -10,14 +10,16 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx } from "react/jsx-runtime";
-import { createElement as _createElement } from "react";
 import React from 'react';
 import Button from '../../../components/Button';
-import { alpha, styled } from '@mui/material/styles';
+import { alpha, styled, useTheme } from '@mui/material/styles';
 import Box from '@mui/material/Box';
 import Link from '@mui/material/Link';
 import { ICONS_NAMES } from '../../../constants';
 import CheckIcon from '@mui/icons-material/Check';
+import { useAppDispatch } from '../../../hooks';
+import { handleOpen } from '../../../app/settings';
+import useMediaQuery from '@mui/material/useMediaQuery';
 var Image = styled('img', { shouldForwardProp: function (prop) { return prop !== 'isAr'; } })(function (_a) {
     var theme = _a.theme;
     return ({
@@ -43,23 +45,23 @@ var ButtonStyled = styled(Button, {
         paddingInlineEnd: theme.spacing(1.625),
         color: theme.palette.success.main,
         border: "1px solid ".concat(theme.palette.success.main)
-    })), { '&:hover': __assign(__assign({ backgroundColor: theme.palette.primary.main, color: theme.palette.common.white }, (isCompleted && {
-            backgroundColor: theme.palette.common.white,
-            border: "1px solid ".concat(theme.palette.success.main),
-            color: theme.palette.success.main,
-            cursor: 'initial'
-        })), (_b = {}, _b[theme.breakpoints.down('sm')] = {
-            '&:hover': __assign({ backgroundColor: touched ? theme.palette.primary.main : theme.palette.common.white, border: "1px solid ".concat(theme.palette.primary.main), color: touched ? theme.palette.common.white : theme.palette.primary.main }, (isCompleted && {
+    })), (_b = { '&:hover': __assign({ backgroundColor: theme.palette.primary.main, color: theme.palette.common.white }, (isCompleted && {
                 backgroundColor: theme.palette.common.white,
                 border: "1px solid ".concat(theme.palette.success.main),
-                paddingInlineEnd: theme.spacing(1.625),
                 color: theme.palette.success.main,
                 cursor: 'initial'
-            }))
-        }, _b)), '&:disabled': {
+            })) }, _b[theme.breakpoints.down('sm')] = {
+        '&:hover': __assign({ backgroundColor: touched ? theme.palette.primary.main : theme.palette.common.white, border: "1px solid ".concat(theme.palette.primary.main), color: touched ? theme.palette.common.white : theme.palette.primary.main }, (isCompleted && {
             backgroundColor: theme.palette.common.white,
-            color: alpha(theme.palette.primary.main, 0.3)
-        } }));
+            border: "1px solid ".concat(theme.palette.success.main),
+            paddingInlineEnd: theme.spacing(1.625),
+            color: theme.palette.success.main,
+            cursor: 'initial'
+        }))
+    }, _b['&:disabled'] = {
+        backgroundColor: theme.palette.common.white,
+        color: alpha(theme.palette.primary.main, 0.3)
+    }, _b)));
 });
 var CheckIconStyled = styled(CheckIcon)(function (_a) {
     var theme = _a.theme;
@@ -73,17 +75,30 @@ export default function FlowsButtons(_a) {
     var buttons = _a.buttons;
     var _b = React.useState(), index = _b[0], setIndex = _b[1];
     var _c = React.useState(false), touched = _c[0], setTouched = _c[1];
+    var dispatch = useAppDispatch();
+    var theme = useTheme();
+    var isMobile = useMediaQuery(theme.breakpoints.down('sm'));
     var handleTouch = function () {
         setTouched(true);
     };
+    var onRedirect = function (item) {
+        if (item.isCompleted)
+            return;
+        dispatch(handleOpen(false));
+        setTimeout(function () {
+            window.location.href = item.href;
+        }, 500);
+    };
     return (_jsx(ButtonBoxStyled, { children: buttons.map(function (_a, idx) {
             var title = _a.title, href = _a.href, src = _a.src, hoverSrc = _a.hoverSrc, isCompleted = _a.isCompleted, sx = _a.sx;
             var isLast = idx === buttons.length - 1;
-            var linkProps = {
-                href: href,
-                target: '_blank'
-            };
-            return (_createElement(Link, __assign({}, (!isCompleted && linkProps), { underline: 'none', key: idx, onMouseEnter: function () { return !isCompleted && setIndex(idx); }, onMouseLeave: function () { return setIndex(undefined); }, onClick: function () { return setTouched(false); } }),
-                _jsx(ButtonStyled, __assign({ onTouchStart: handleTouch, touched: touched, isCompleted: isCompleted, sx: __assign({ mb: isLast ? 0 : 1.8 }, sx), endIcon: isCompleted ? (_jsx(CheckIconStyled, {})) : (_jsx(Image, { sx: { height: 15 }, src: index === idx ? ICONS_NAMES.Arrow_white_right_icon : ICONS_NAMES.Arrow_filled_right_icon })), startIcon: _jsx(Image, { src: index === idx ? hoverSrc : src, alt: title }), type: 'button' }, { children: title }))));
+            return (_jsx(Link, __assign({ underline: 'none', onMouseEnter: function () { return !isCompleted && setIndex(idx); }, onMouseLeave: function () { return setIndex(undefined); }, onClick: function () {
+                    setTouched(false);
+                    onRedirect({ title: title, href: href, src: src, hoverSrc: hoverSrc, isCompleted: isCompleted });
+                } }, { children: _jsx(ButtonStyled, __assign({ onTouchStart: handleTouch, touched: touched, isCompleted: isCompleted, sx: __assign({ mb: isLast ? 0 : 1.8 }, sx), endIcon: isCompleted ? (_jsx(CheckIconStyled, {})) : isMobile ? (_jsx(Image, { sx: { height: 15 }, src: index === idx
+                            ? touched
+                                ? ICONS_NAMES.Arrow_white_right_icon
+                                : ICONS_NAMES.Arrow_filled_right_icon
+                            : ICONS_NAMES.Arrow_filled_right_icon })) : (_jsx(Image, { sx: { height: 15 }, src: index === idx ? ICONS_NAMES.Arrow_white_right_icon : ICONS_NAMES.Arrow_filled_right_icon })), startIcon: isMobile ? (_jsx(Image, { src: index === idx ? (touched ? hoverSrc : src) : src, alt: title })) : (_jsx(Image, { src: index === idx ? hoverSrc : src, alt: title })), type: 'button' }, { children: title })) }), idx));
         }) }));
 }

package/build/utils/array.js

@@ -38,8 +38,12 @@ export var findItem = function (items, key) {
 };
 export var isExist = function (items, id) {
     return items.find(function (_a) {
-        var sub = _a.sub;
-        return sub === null || sub === void 0 ? void 0 : sub.some(function (item) { return item.id === id; });
+        var sub = _a.sub, itemID = _a.id;
+        if (!sub)
+            return itemID === id;
+        return sub.some(function (item) {
+            return item.id === id;
+        });
     });
 };
 export var allAreTruthy = function (items, condition, key, exclude) {

package/package.json

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