@bigbinary/neeto-payments-frontend 1.4.15 → 1.4.16

package/dist/index.js

@@ -6,28 +6,45 @@ import { useQueryParams, withTitle, useMutationWithInvalidation, withT, useState
 import { buildFiltersFromURL, Bar } from '@bigbinary/neeto-filters-frontend';
 import Header from '@bigbinary/neeto-molecules/Header';
 import SubHeader from '@bigbinary/neeto-molecules/SubHeader';
-import { Toastr, Modal, Typography, Button, Tooltip, Tag, NoData, Table, Tab, Pane, Spinner, Alert, Label, Radio } from '@bigbinary/neetoui';
+import Tab from '@bigbinary/neetoui/Tab';
+import Typography from '@bigbinary/neetoui/Typography';
 import { useTranslation, Trans } from 'react-i18next';
 import { QueryClient, QueryCache, QueryClientProvider, useMutation, useQuery } from 'react-query';
 import { ReactQueryDevtools } from 'react-query/devtools';
 import { DEFAULT_STALE_TIME, DEFAULT_PAGE_INDEX, DEFAULT_PAGE_SIZE } from '@bigbinary/neeto-commons-frontend/constants';
+import Toastr from '@bigbinary/neetoui/Toastr';
 import { Download, Down, Right } from '@bigbinary/neeto-icons';
+import Button from '@bigbinary/neetoui/Button';
+import Modal from '@bigbinary/neetoui/Modal';
 import axios from 'axios';
 import { createSubscription, getQueryParams, buildUrl, dateFormat } from '@bigbinary/neeto-commons-frontend/utils';
 import { isEmpty, assoc, modify, concat, curry, pipe, split, map, join, mergeLeft, equals, sortBy, prop, evolve, insert, mergeDeepLeft, pluck } from 'ramda';
 import { useHistory } from 'react-router-dom';
 import DateFormat from '@bigbinary/neeto-molecules/DateFormat';
+import Tag from '@bigbinary/neetoui/Tag';
+import Tooltip from '@bigbinary/neetoui/Tooltip';
 import CopyToClipboardButton from '@bigbinary/neeto-molecules/CopyToClipboardButton';
 import { useHiddenColumns } from '@bigbinary/neeto-molecules/Columns';
 import PageLoader from '@bigbinary/neeto-molecules/PageLoader';
 import TableWrapper from '@bigbinary/neeto-molecules/TableWrapper';
+import Table from '@bigbinary/neetoui/Table';
+import NoData from '@bigbinary/neetoui/NoData';
 import require$$0 from 'util';
+import Pane from '@bigbinary/neetoui/Pane';
 import { useParams } from 'react-router-dom/cjs/react-router-dom';
 import classNames from 'classnames';
+import Spinner from '@bigbinary/neetoui/Spinner';
+import Alert from '@bigbinary/neetoui/Alert';
 import { Finish as Finish$1, Modal as Modal$1, Demo } from 'neetointegrations';
-import { Form, Select, Input, Button as Button$1 } from '@bigbinary/neetoui/formik';
+import Label from '@bigbinary/neetoui/Label';
+import Select from '@bigbinary/neetoui/formik/Select';
+import Form from '@bigbinary/neetoui/formik/Form';
+import ActionBlock from '@bigbinary/neetoui/formik/ActionBlock';
 import * as yup from 'yup';
+import Radio from '@bigbinary/neetoui/Radio';
+import Input from '@bigbinary/neetoui/formik/Input';
 import MoreDropdown from '@bigbinary/neeto-molecules/MoreDropdown';
+import QRCodeImage from 'qrcode.react';
 import { globalProps } from '@bigbinary/neeto-commons-frontend/initializers';
 
 function _arrayWithHoles(arr) {
@@ -7183,6 +7200,7 @@ var AccountForm = function AccountForm(_ref) {
     returnUrl = _ref.returnUrl;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
+  var history = useHistory();
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isPolling = _useState2[0],
@@ -7246,11 +7264,16 @@ var AccountForm = function AccountForm(_ref) {
     name: "country",
     options: buildCountryOptions(countries),
     placeholder: t("neetoPayments.integrationModal.form.placeholder")
-  }), /*#__PURE__*/React__default.createElement(Button, {
-    disabled: isCreating || isPolling,
-    label: submitButtonLabel,
-    loading: isCreating || isPolling,
-    type: "submit"
+  }), /*#__PURE__*/React__default.createElement(ActionBlock, {
+    cancelButtonProps: {
+      onClick: function onClick() {
+        return history.goBack();
+      }
+    },
+    isSubmitting: isCreating || isPolling,
+    submitButtonProps: {
+      label: submitButtonLabel
+    }
   })));
 };
 
@@ -9138,12 +9161,14 @@ var StripeConnect = function StripeConnect(_ref) {
 };
 
 var VALIDATION_SCHEMA$1 = yup.object({
-  upiId: yup.string().matches(/^[a-zA-Z0-9.-]{2,256}@[a-zA-Z0-9][a-zA-Z0-9-]{1,63}$/, t$1("neetoPayments.upi.form.validation.invalidUpi")).required(t$1("neetoPayments.upi.form.validation.required"))
+  upiId: yup.string().matches(/^[a-zA-Z0-9.-]{2,256}@[a-zA-Z][a-zA-Z]{2,64}$/, t$1("neetoPayments.upi.form.validation.invalidUpi")).required(t$1("neetoPayments.upi.form.validation.required"))
 });
 
-var Add = withT(function (_ref) {
-  var t = _ref.t,
-    handleCreateUpiId = _ref.handleCreateUpiId;
+var Add = function Add(_ref) {
+  var handleCreateUpiId = _ref.handleCreateUpiId;
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  var history = useHistory();
   return /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(Form, {
     formikProps: {
       initialValues: {
@@ -9156,13 +9181,20 @@ var Add = withT(function (_ref) {
     className: "space-y-3"
   }, /*#__PURE__*/React__default.createElement(Input, {
     className: "w-64",
-    label: t("neetoPayments.common.upiId"),
-    name: "upiId"
-  }), /*#__PURE__*/React__default.createElement(Button$1, {
-    label: t("neetoPayments.upi.form.add"),
-    type: "submit"
+    label: t("neetoPayments.upi.form.enterUpi"),
+    name: "upiId",
+    placeholder: t("neetoPayments.upi.form.enterUpi")
+  }), /*#__PURE__*/React__default.createElement(ActionBlock, {
+    cancelButtonProps: {
+      onClick: function onClick() {
+        return history.goBack();
+      }
+    },
+    submitButtonProps: {
+      label: t("neetoPayments.upi.form.add")
+    }
   }))));
-});
+};
 
 var getColumnData = function getColumnData(handleDeleteClick) {
   return [{
@@ -9256,14 +9288,10 @@ var UpiConnect = function UpiConnect(_ref) {
     handleDeleteUpiId = _ref$handleDeleteUpiI === void 0 ? noop : _ref$handleDeleteUpiI,
     _ref$handleCreateUpiI = _ref.handleCreateUpiId,
     handleCreateUpiId = _ref$handleCreateUpiI === void 0 ? noop : _ref$handleCreateUpiI;
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
   if (isLoading) return /*#__PURE__*/React__default.createElement(Spinner, null);
   return /*#__PURE__*/React__default.createElement("div", {
     className: "flex w-full max-w-3xl flex-col items-start space-y-6"
-  }, /*#__PURE__*/React__default.createElement(Typography, {
-    style: "h2"
-  }, t("neetoPayments.common.upiIds")), /*#__PURE__*/React__default.createElement(Add, {
+  }, /*#__PURE__*/React__default.createElement(Add, {
     handleCreateUpiId: handleCreateUpiId
   }), /*#__PURE__*/React__default.createElement(List$1, {
     handleDeleteUpiId: handleDeleteUpiId,
@@ -9326,11 +9354,15 @@ var VALIDATION_SCHEMA = yup.object({
   transactionId: yup.string().required(t$1("neetoPayments.upi.payment.transaction.required")).min(6, t$1("neetoPayments.upi.payment.transaction.sixCharacters")).max(6, t$1("neetoPayments.upi.payment.transaction.sixCharacters"))
 });
 
+var vpaIdToQrCodeValue = function vpaIdToQrCodeValue(vpaId) {
+  return "upi://pay?pa=".concat(vpaId);
+};
+
 function ownKeys$2(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var UpiPayment = function UpiPayment(_ref) {
-  var _ref$vpas = _ref.vpas,
-    vpas = _ref$vpas === void 0 ? [] : _ref$vpas,
+  var _ref$fee = _ref.fee,
+    fee = _ref$fee === void 0 ? {} : _ref$fee,
     _ref$onSubmit = _ref.onSubmit,
     onSubmit = _ref$onSubmit === void 0 ? noop : _ref$onSubmit,
     _ref$onBackClick = _ref.onBackClick,
@@ -9338,7 +9370,7 @@ var UpiPayment = function UpiPayment(_ref) {
     payableId = _ref.payableId;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var vpaIds = pluck("address", vpas).join(" ");
+  var vpaIds = pluck("address", fee === null || fee === void 0 ? void 0 : fee.vpas);
   var _useCreateUpiPayment = useCreateUpiPayment({}),
     createPayment = _useCreateUpiPayment.mutate;
   var handleSubmit = function handleSubmit(values) {
@@ -9357,29 +9389,41 @@ var UpiPayment = function UpiPayment(_ref) {
       },
       validationSchema: VALIDATION_SCHEMA
     }
-  }, /*#__PURE__*/React__default.createElement(Typography, null, /*#__PURE__*/React__default.createElement(Trans, {
-    components: {
-      b: /*#__PURE__*/React__default.createElement("strong", null)
-    },
-    values: {
-      vpaIds: vpaIds
-    },
-    i18nKey: vpas.length > 1 ? "neetoPayments.upi.payment.vpasText" : "neetoPayments.upi.payment.vpaText"
+  }, /*#__PURE__*/React__default.createElement(Typography, {
+    style: "body1"
+  }, t("neetoPayments.upi.payment.vpaText", {
+    count: vpaIds.length
+  })), isPresent(vpaIds) && /*#__PURE__*/React__default.createElement("div", {
+    className: "grid grid-cols-1 gap-8 gap-y-4 sm:grid-cols-2"
+  }, vpaIds.map(function (vpaId) {
+    return /*#__PURE__*/React__default.createElement("div", {
+      className: "flex flex-col items-center justify-center",
+      key: vpaId
+    }, /*#__PURE__*/React__default.createElement(QRCodeImage, {
+      size: 256,
+      style: {
+        width: 80,
+        height: 80
+      },
+      value: vpaIdToQrCodeValue(vpaId)
+    }), /*#__PURE__*/React__default.createElement(Typography, {
+      className: "mt-2 w-full break-words text-center",
+      style: "body2"
+    }, vpaId));
   })), /*#__PURE__*/React__default.createElement(Input, {
     required: true,
     label: t("neetoPayments.upi.payment.transaction.label"),
     name: "transactionId",
     placeholder: t("neetoPayments.upi.payment.transaction.placeholder")
-  }), /*#__PURE__*/React__default.createElement("div", {
-    className: "flex space-x-4"
-  }, /*#__PURE__*/React__default.createElement(Button$1, {
-    label: t("neetoPayments.upi.payment.buttons.submit"),
-    type: "submit"
-  }), /*#__PURE__*/React__default.createElement(Button$1, {
-    label: t("neetoPayments.upi.payment.buttons.back"),
-    style: "secondary",
-    onClick: onBackClick
-  }))));
+  }), /*#__PURE__*/React__default.createElement(ActionBlock, {
+    cancelButtonProps: {
+      label: t("neetoPayments.upi.payment.buttons.back"),
+      onClick: onBackClick
+    },
+    submitButtonProps: {
+      label: t("neetoPayments.upi.payment.buttons.submit")
+    }
+  })));
 };
 
 var TAB = {