@tap-payments/auth-jsconnect 1.0.97-test → 1.0.100-test

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

@@ -10,13 +10,13 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import React, { memo, useEffect, useState } from 'react';
+import { memo, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { styled } from '@mui/material/styles';
 import { FlowsButtons } from '../../../shared/Button';
 import { ICONS_NAMES, PASSWORD_OPERATION_TYPE } from '../../../../constants';
 import { useAppSelector, useLanguage } from '../../../../hooks';
-import { allAreTruthy, getResetFlowUrl, showLastFour } from '../../../../utils';
+import { getResetFlowUrl, showLastFour } from '../../../../utils';
 import { passwordSelector } from '../../../app/password/passwordStore';
 import Box from '@mui/material/Box';
 import Text from '../../../../components/Text';
@@ -47,19 +47,20 @@ var SuccessWithFlowButtons = function () {
     var _a, _b, _c;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    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(passwordSelector).data;
-    var _f = data.verify.responseBody || {}, flows = _f.flows, nameObj = _f.name, entity = _f.entity, brand = _f.brand, bank = _f.bank_account;
-    var _g = useState([]), buttons = _g[0], setButtons = _g[1];
+    var _d = data.verify.responseBody || {}, flows = _d.flows, nameObj = _d.name, entity = _d.entity, brand = _d.brand, bank = _d.bank_account, merchant = _d.merchant, identification_id = _d.identification_id;
+    var _e = useState([]), buttons = _e[0], setButtons = _e[1];
     var username = ((nameObj === null || nameObj === void 0 ? void 0 : nameObj.first) || '') + ' ' + ((nameObj === null || nameObj === void 0 ? void 0 : nameObj.last) || '');
     var licenseNumber = ((_a = entity === null || entity === void 0 ? void 0 : entity.license) === null || _a === void 0 ? void 0 : _a.number) || '';
     var bankName = (bank === null || bank === void 0 ? void 0 : bank.bank_name) || t('bank');
     var iban = showLastFour((bank === null || bank === void 0 ? void 0 : bank.iban) || '');
     var taxID = (entity === null || entity === void 0 ? void 0 : entity.tax_number) || '';
     var brandName = (isAr ? (_b = brand === null || brand === void 0 ? void 0 : brand.name) === null || _b === void 0 ? void 0 : _b.ar : (_c = brand === null || brand === void 0 ? void 0 : brand.name) === null || _c === void 0 ? void 0 : _c.en) || '';
+    var isAcceptance = merchant === null || merchant === void 0 ? void 0 : merchant.is_acceptance_allowed;
+    var isPayout = merchant === null || merchant === void 0 ? void 0 : merchant.is_payout_allowed;
+    var maskedId = !!identification_id ? " ".concat(t('masking_symbols')).concat(identification_id) : '';
     var settings = useAppSelector(settingsSelector);
-    var _h = data.verify.responseBody || { contact: {}, id: '' }, contact = _h.contact, id = _h.id;
+    var _f = data.verify.responseBody || { contact: {}, id: '' }, contact = _f.contact, id = _f.id;
     var email = (contact || { email: '' }).email;
     var url = getResetFlowUrl('/password', settings.data.language, PASSWORD_OPERATION_TYPE.RESET_PASSWORD, id);
     var reMapFlowData = function (flows) {
@@ -71,15 +72,13 @@ var SuccessWithFlowButtons = function () {
             var name = _a.name, url = _a.url, status = _a.status;
             var type = status === 'initiated' ? 'pending' : 'completed';
             var title = t("".concat(name, "_flow_").concat(type), {
-                individual_name: username.toLowerCase(),
+                individual_name: username.toLowerCase() + maskedId,
                 business_type: brandName,
                 license_number: t('masking_symbols') + showLastFour(licenseNumber),
                 bank_name: bankName,
                 iban: t('masking_symbols') + iban,
                 tax_id: t('masking_symbols') + showLastFour(taxID)
             });
-            if ("business_flow_completed" === "".concat(name, "_flow_").concat(type))
-                setIsAcceptance(true);
             var isCompleted = status === 'completed' && name !== 'password';
             var isIndividual = name === 'individual';
             var src = isCompleted ? "".concat(name, "_green_icon") : "".concat(name, "_filled_icon");
@@ -96,9 +95,6 @@ var SuccessWithFlowButtons = function () {
             };
         });
         setButtons(mappedFlows);
-        var isAllCompleted = allAreTruthy(flows, 'completed', 'status', 'password');
-        if (isAllCompleted)
-            setIsPayout(true);
     };
     useEffect(function () {
         if ((flows === null || flows === void 0 ? void 0 : flows.length) > 0)

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

@@ -54,7 +54,7 @@ import Link from '@mui/material/Link';
 import { ICONS_NAMES } from '../../../constants';
 import CheckIcon from '@mui/icons-material/Check';
 import { useAppDispatch, useLanguage } from '../../../hooks';
-import { handleOpen, handleCurrentActiveScreen } from '../../../app/settings';
+import { handleOpen, handleCurrentActiveScreen, handleNextScreenStep } from '../../../app/settings';
 import { getScreenNameBasedOnFlow } from '../../../utils';
 import API from '../../../api';
 var Image = styled('img')(function (_a) {
@@ -159,11 +159,11 @@ export default function FlowsButtons(_a) {
                         step_name: 'reset_password_auth',
                         encryption_contract: ['user_credentail.email']
                     };
+                    dispatch(handleNextScreenStep());
                     return [4, API.authService
                             .createAuth(payload)
                             .then(function (response) {
                             var _a;
-                            setLoading(false);
                             var data = response.data;
                             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
                             if (description) {
@@ -173,11 +173,8 @@ export default function FlowsButtons(_a) {
                         })
                             .catch(function (error) {
                             alert(error);
-                            setLoading(false);
                         })
-                            .finally(function () {
-                            setLoading(false);
-                        })];
+                            .finally(function () { })];
                 case 1:
                     _a.sent();
                     return [2];

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

@@ -47,6 +47,20 @@ var ButtonStyled = styled(Button)(function (_a) {
                 easing: theme.transitions.easing.easeInOut,
                 duration: theme.transitions.duration.complex * 2
             })
+        },
+        '&.MuiButton-contained': {
+            color: theme.palette.common.white,
+            backgroundColor: theme.palette.primary.main,
+            '&:hover': {
+                backgroundColor: theme.palette.primary.main
+            },
+            '&:active': {
+                backgroundColor: theme.palette.primary.main
+            },
+            ':disabled': {
+                backgroundColor: theme.palette.primary.main,
+                color: theme.palette.common.white
+            }
         }
     });
 });

package/build/features/tax/Tax.js

@@ -36,11 +36,10 @@ var Tax = memo(function (props) {
     var verifyToken = function () {
         var token = getParameterByName('token');
         var lang = getParameterByName('lang');
+        if (lang)
+            dispatch(handleLanguage(lang));
         if (!token)
             throw new Error('Auth token is not found!');
-        if (!lang)
-            throw new Error('Language is not found!');
-        dispatch(handleLanguage(lang));
         dispatch(verifyLeadToken(token));
     };
     useEffect(function () {

package/build/features/tax/screens/ResetPasswordSuccess/ResetPasswordSuccess.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+export interface ResetPasswordSuccessProps {
+}
+declare const _default: React.MemoExoticComponent<({}: ResetPasswordSuccessProps) => JSX.Element>;
+export default _default;

package/build/features/tax/screens/ResetPasswordSuccess/ResetPasswordSuccess.js

@@ -0,0 +1,9 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import SuccessScreen from '../../../shared/SuccessScreen';
+var ResetPasswordSuccess = function (_a) {
+    var t = useTranslation().t;
+    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: t("reset_password_success_description"), showEmailProviders: true }));
+};
+export default React.memo(ResetPasswordSuccess);

package/build/features/tax/screens/ResetPasswordSuccess/index.d.ts

@@ -0,0 +1,3 @@
+import ResetPasswordSuccess, { ResetPasswordSuccessProps } from './ResetPasswordSuccess';
+export type { ResetPasswordSuccessProps };
+export default ResetPasswordSuccess;

package/build/features/tax/screens/ResetPasswordSuccess/index.js

@@ -0,0 +1,2 @@
+import ResetPasswordSuccess from './ResetPasswordSuccess';
+export default ResetPasswordSuccess;

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

@@ -10,13 +10,13 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import React, { memo, useEffect, useState } from 'react';
+import { memo, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { styled } from '@mui/material/styles';
 import { FlowsButtons } from '../../../shared/Button';
 import { ICONS_NAMES, PASSWORD_OPERATION_TYPE } from '../../../../constants';
 import { useAppSelector, useLanguage } from '../../../../hooks';
-import { allAreTruthy, getResetFlowUrl, showLastFour } from '../../../../utils';
+import { getResetFlowUrl, showLastFour } from '../../../../utils';
 import { taxSelector } from '../../../app/tax/taxStore';
 import Box from '@mui/material/Box';
 import Text from '../../../../components/Text';
@@ -47,19 +47,20 @@ var SuccessWithFlowButtons = function () {
     var _a, _b, _c;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    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(taxSelector).data;
-    var _f = data.verify.responseBody || {}, flows = _f.flows, nameObj = _f.name, entity = _f.entity, brand = _f.brand, bank = _f.bank_account;
-    var _g = useState([]), buttons = _g[0], setButtons = _g[1];
+    var _d = data.verify.responseBody || {}, flows = _d.flows, nameObj = _d.name, entity = _d.entity, brand = _d.brand, bank = _d.bank_account, merchant = _d.merchant, identification_id = _d.identification_id;
+    var _e = useState([]), buttons = _e[0], setButtons = _e[1];
     var username = ((nameObj === null || nameObj === void 0 ? void 0 : nameObj.first) || '') + ' ' + ((nameObj === null || nameObj === void 0 ? void 0 : nameObj.last) || '');
     var licenseNumber = ((_a = entity === null || entity === void 0 ? void 0 : entity.license) === null || _a === void 0 ? void 0 : _a.number) || '';
     var bankName = (bank === null || bank === void 0 ? void 0 : bank.bank_name) || t('bank');
     var iban = showLastFour((bank === null || bank === void 0 ? void 0 : bank.iban) || '');
     var taxID = (entity === null || entity === void 0 ? void 0 : entity.tax_number) || '';
     var brandName = (isAr ? (_b = brand === null || brand === void 0 ? void 0 : brand.name) === null || _b === void 0 ? void 0 : _b.ar : (_c = brand === null || brand === void 0 ? void 0 : brand.name) === null || _c === void 0 ? void 0 : _c.en) || '';
+    var isAcceptance = merchant === null || merchant === void 0 ? void 0 : merchant.is_acceptance_allowed;
+    var isPayout = merchant === null || merchant === void 0 ? void 0 : merchant.is_payout_allowed;
+    var maskedId = !!identification_id ? " ".concat(t('masking_symbols')).concat(identification_id) : '';
     var settings = useAppSelector(settingsSelector);
-    var _h = data.verify.responseBody || { contact: {}, id: '' }, contact = _h.contact, id = _h.id;
+    var _f = data.verify.responseBody || { contact: {}, id: '' }, contact = _f.contact, id = _f.id;
     var email = (contact || { email: '' }).email;
     var url = getResetFlowUrl('/password', settings.data.language, PASSWORD_OPERATION_TYPE.RESET_PASSWORD, id);
     var reMapFlowData = function (flows) {
@@ -71,15 +72,13 @@ var SuccessWithFlowButtons = function () {
             var name = _a.name, url = _a.url, status = _a.status;
             var type = status === 'initiated' ? 'pending' : 'completed';
             var title = t("".concat(name, "_flow_").concat(type), {
-                individual_name: username.toLowerCase(),
+                individual_name: username.toLowerCase() + maskedId,
                 business_type: brandName,
                 license_number: t('masking_symbols') + showLastFour(licenseNumber),
                 bank_name: bankName,
                 iban: t('masking_symbols') + iban,
                 tax_id: t('masking_symbols') + showLastFour(taxID)
             });
-            if ("business_flow_completed" === "".concat(name, "_flow_").concat(type))
-                setIsAcceptance(true);
             var isCompleted = status === 'completed' && name !== 'password';
             var isIndividual = name === 'individual';
             var src = isCompleted ? "".concat(name, "_green_icon") : "".concat(name, "_filled_icon");
@@ -96,9 +95,6 @@ var SuccessWithFlowButtons = function () {
             };
         });
         setButtons(mappedFlows);
-        var isAllCompleted = allAreTruthy(flows, 'completed', 'status', 'password');
-        if (isAllCompleted)
-            setIsPayout(true);
     };
     useEffect(function () {
         if ((flows === null || flows === void 0 ? void 0 : flows.length) > 0)

package/build/utils/string.js

@@ -75,6 +75,7 @@ export var capitalizeTheFirstLetterOfEachWord = function (words) {
 };
 export var getRequestHeaders = function (deviceInfo) {
     var app = deviceInfo.app, browser = deviceInfo.browser, connection = deviceInfo.connection, device = deviceInfo.device, source = deviceInfo.source;
+    console.log('bi:', browser.browser_id);
     return {
         al: encryptString(app.language || ''),
         at: encryptString(source || ''),
@@ -93,7 +94,7 @@ export var getRequestHeaders = function (deviceInfo) {
         bb: encryptString(''),
         bv: encryptString(browser.version || ''),
         bua: encryptString((browser.user_agent || '').substring(0, 80)),
-        bi: encryptString(browser.browser_id || ''),
+        bi: browser.browser_id || '',
         ci: encryptString(connection.ip || ''),
         cm: encryptString(connection.mac || ''),
         l: encryptString((connection.latitude || 0).toString() + '-' + (connection.longitude || 0).toString())

package/package.json

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