@bigbinary/neeto-payments-frontend 1.3.16 → 1.3.18

package/dist/index.cjs.js

@@ -17,8 +17,8 @@ var neetoIcons = require('@bigbinary/neeto-icons');
 var axios = require('axios');
 var neetoCist = require('@bigbinary/neeto-cist');
 var utils$3 = require('@bigbinary/neeto-commons-frontend/utils');
-var reactRouterDom = require('react-router-dom');
 var ramda = require('ramda');
+var reactRouterDom = require('react-router-dom');
 var DateFormat = require('@bigbinary/neeto-molecules/DateFormat');
 var CopyToClipboardButton = require('@bigbinary/neeto-molecules/CopyToClipboardButton');
 var Columns = require('@bigbinary/neeto-molecules/Columns');
@@ -159,7 +159,7 @@ var SEARCH_PROPS$1 = {
 };
 var DASHBOARD_MANDATORY_COLUMNS$2 = ["id", "status", "identifier"];
 var FILTER_COLUMNS$3 = [{
-  key: "createdAt",
+  key: "created_at",
   label: i18next.t("neetoPayments.common.createdAt"),
   node: "created_at",
   type: "date",
@@ -837,14 +837,6 @@ function _toConsumableArray(arr) {
   return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
 }
 
-var useURLSearchParams = function useURLSearchParams() {
-  var _useLocation = reactRouterDom.useLocation(),
-    search = _useLocation.search;
-  return React.useMemo(function () {
-    return new URLSearchParams(search);
-  }, [search]);
-};
-
 function ownKeys$a(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$a(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$a(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$a(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var processSortProperties = function processSortProperties(sortProperties) {
@@ -1038,7 +1030,7 @@ var COLUMNS$3 = [{
 function ownKeys$9(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$9(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$9(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$9(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var useFiltersAndPagination$3 = function useFiltersAndPagination() {
-  var urlSearchParams = useURLSearchParams();
+  var history = reactRouterDom.useHistory();
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isFilterButtonVisible = _useState2[0],
@@ -1055,10 +1047,9 @@ var useFiltersAndPagination$3 = function useFiltersAndPagination() {
     _useState8 = _slicedToArray(_useState7, 2),
     sortProperties = _useState8[0],
     setSortProperties = _useState8[1];
-  var _useState9 = React.useState(TAB$3.all),
-    _useState10 = _slicedToArray(_useState9, 2),
-    tab = _useState10[0],
-    setTab = _useState10[1];
+  var _useQueryParams = reactUtils.useQueryParams(),
+    _useQueryParams$tab = _useQueryParams.tab,
+    tab = _useQueryParams$tab === void 0 ? TAB$3.all : _useQueryParams$tab;
   var _getQueryParams = utils$3.getQueryParams(),
     _getQueryParams$searc = _getQueryParams.searchTerm,
     searchTerm = _getQueryParams$searc === void 0 ? "" : _getQueryParams$searc;
@@ -1066,23 +1057,28 @@ var useFiltersAndPagination$3 = function useFiltersAndPagination() {
     key: "search_term",
     value: searchTerm.trim()
   });
-  var _useState11 = React.useState(neetoFiltersFrontend.buildFiltersFromURL([].concat(_toConsumableArray(FILTER_COLUMNS$3), [searchKeywordProps]))),
+  var _useState9 = React.useState(neetoFiltersFrontend.buildFiltersFromURL([].concat(_toConsumableArray(FILTER_COLUMNS$3), [searchKeywordProps]))),
+    _useState10 = _slicedToArray(_useState9, 2),
+    filters = _useState10[0],
+    setFilters = _useState10[1];
+  var _useState11 = React.useState(0),
     _useState12 = _slicedToArray(_useState11, 2),
-    filters = _useState12[0],
-    setFilters = _useState12[1];
-  var _useState13 = React.useState(0),
-    _useState14 = _slicedToArray(_useState13, 2),
-    dataSize = _useState14[0],
-    setDataSize = _useState14[1];
+    dataSize = _useState12[0],
+    setDataSize = _useState12[1];
   var columnData = tab !== TAB$3.all ? neetoCist.removeBy({
     key: "status"
   }, COLUMNS$3) : COLUMNS$3;
   var handleTabChange = function handleTabChange(tab) {
     var _pageProperties$tab, _pageProperties$tab2;
-    urlSearchParams.set("tab", tab);
-    urlSearchParams.set("page", (_pageProperties$tab = pageProperties[tab]) === null || _pageProperties$tab === void 0 ? void 0 : _pageProperties$tab.page);
-    urlSearchParams.set("page_size", (_pageProperties$tab2 = pageProperties[tab]) === null || _pageProperties$tab2 === void 0 ? void 0 : _pageProperties$tab2.pageSize);
-    setTab(tab);
+    var queryParams = utils$3.getQueryParams({
+      toCamelCase: false
+    });
+    var newParams = {
+      tab: tab,
+      page: (_pageProperties$tab = pageProperties[tab]) === null || _pageProperties$tab === void 0 ? void 0 : _pageProperties$tab.page,
+      page_size: (_pageProperties$tab2 = pageProperties[tab]) === null || _pageProperties$tab2 === void 0 ? void 0 : _pageProperties$tab2.pageSize
+    };
+    history.push(utils$3.buildUrl(window.location.pathname, ramda.mergeLeft(newParams, queryParams)));
   };
   return {
     isFilterButtonVisible: isFilterButtonVisible,
@@ -1099,7 +1095,6 @@ var useFiltersAndPagination$3 = function useFiltersAndPagination() {
     setIsFilterPaneOpen: setIsFilterPaneOpen,
     setPageProperties: setPageProperties,
     setFilters: setFilters,
-    setTab: setTab,
     handleTabChange: handleTabChange,
     setSortProperties: setSortProperties
   };
@@ -1142,10 +1137,9 @@ var useFetchConnectedAccounts = function useFetchConnectedAccounts() {
 };
 
 var List$3 = function List(_ref) {
-  var _pageProperties$tab3, _pageProperties$tab4, _pageProperties$tab5;
+  var _pageProperties$tab, _pageProperties$tab2, _pageProperties$tab3;
   var columnData = _ref.columnData,
     filters = _ref.filters,
-    handleTabChange = _ref.handleTabChange,
     pageProperties = _ref.pageProperties,
     setDataSize = _ref.setDataSize,
     setIsFilterButtonVisible = _ref.setIsFilterButtonVisible,
@@ -1153,7 +1147,6 @@ var List$3 = function List(_ref) {
     setSortProperties = _ref.setSortProperties,
     sortProperties = _ref.sortProperties,
     tab = _ref.tab;
-  var urlSearchParams = useURLSearchParams();
   var history = reactRouterDom.useHistory();
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
@@ -1180,12 +1173,13 @@ var List$3 = function List(_ref) {
     setDataSize(dataSize);
   }, [accounts]);
   var handleTablePagination = function handleTablePagination(page, pageSize) {
-    urlSearchParams.set("tab", tab);
-    urlSearchParams.set("page", page);
-    urlSearchParams.set("page_size", pageSize);
-    history.push({
-      search: urlSearchParams.toString()
+    var queryParams = utils$3.getQueryParams({
+      toCamelCase: false
     });
+    history.push(utils$3.buildUrl(window.location.pathname, ramda.mergeLeft({
+      page: page,
+      page_size: pageSize
+    }, queryParams)));
     setPageProperties(ramda.assoc(tab, {
       page: page,
       pageSize: pageSize
@@ -1195,16 +1189,6 @@ var List$3 = function List(_ref) {
     handleTablePagination(constants.DEFAULT_PAGE_INDEX, constants.DEFAULT_PAGE_SIZE);
     setSortProperties(DEFAULT_SORT_PROPERTIES$1);
   }, [filters, tab]);
-  React.useEffect(function () {
-    var _pageProperties$tab, _pageProperties$tab2;
-    var tab = urlSearchParams.get("tab") || TAB$3.all;
-    var validatedTab = TABS$3.includes(tab) ? tab : TAB$3.all;
-    var page = Number(urlSearchParams.get("page")) || ((_pageProperties$tab = pageProperties[tab]) === null || _pageProperties$tab === void 0 ? void 0 : _pageProperties$tab.page);
-    var pageSize = Number(urlSearchParams.get("page_size")) || ((_pageProperties$tab2 = pageProperties[tab]) === null || _pageProperties$tab2 === void 0 ? void 0 : _pageProperties$tab2.pageSize);
-    handleTabChange(validatedTab);
-    urlSearchParams.set("tab", validatedTab);
-    handleTablePagination(page, pageSize);
-  }, [urlSearchParams]);
   var handleTableChange = function handleTableChange(_, __, sorter) {
     setSortProperties(neetoCist.isPresent(sorter === null || sorter === void 0 ? void 0 : sorter.column) ? {
       sortBy: neetoCist.camelToSnakeCase(sorter.field),
@@ -1224,12 +1208,12 @@ var List$3 = function List(_ref) {
     }));
   }
   return /*#__PURE__*/React__default["default"].createElement(TableWrapper__default["default"], {
-    hasPagination: dataSize > ((_pageProperties$tab3 = pageProperties[tab]) === null || _pageProperties$tab3 === void 0 ? void 0 : _pageProperties$tab3.pageSize)
+    hasPagination: dataSize > ((_pageProperties$tab = pageProperties[tab]) === null || _pageProperties$tab === void 0 ? void 0 : _pageProperties$tab.pageSize)
   }, /*#__PURE__*/React__default["default"].createElement(neetoui.Table, {
     fixedHeight: true,
     allowRowClick: false,
     columnData: getVisibleColumnData(columnData),
-    currentPageNumber: (_pageProperties$tab4 = pageProperties[tab]) === null || _pageProperties$tab4 === void 0 ? void 0 : _pageProperties$tab4.page,
+    currentPageNumber: (_pageProperties$tab2 = pageProperties[tab]) === null || _pageProperties$tab2 === void 0 ? void 0 : _pageProperties$tab2.page,
     handlePageChange: handleTablePagination,
     loading: isFetching,
     rowData: buildRowData({
@@ -1243,7 +1227,7 @@ var List$3 = function List(_ref) {
     paginationProps: {
       showSizeChanger: true,
       hideOnSinglePage: true,
-      pageSize: (_pageProperties$tab5 = pageProperties[tab]) === null || _pageProperties$tab5 === void 0 ? void 0 : _pageProperties$tab5.pageSize,
+      pageSize: (_pageProperties$tab3 = pageProperties[tab]) === null || _pageProperties$tab3 === void 0 ? void 0 : _pageProperties$tab3.pageSize,
       total: dataSize
     },
     onChange: handleTableChange,
@@ -1340,7 +1324,6 @@ var AccountsDashboard = function AccountsDashboard() {
   }), /*#__PURE__*/React__default["default"].createElement(List$3, {
     columnData: columnData,
     filters: filters,
-    handleTabChange: handleTabChange,
     pageProperties: pageProperties,
     setDataSize: setDataSize,
     setIsFilterButtonVisible: setIsFilterButtonVisible,
@@ -1894,32 +1877,32 @@ var FILTER_COLUMNS$1 = [{
   type: "decimal",
   showRuleSelector: true
 }, {
-  key: "paymentAmount",
+  key: "payment_amount",
   label: i18next.t("neetoPayments.common.paymentAmount"),
   node: "payment_intent.amount",
   model: "NeetoPaymentsEngine::Stripe::Transaction",
   type: "decimal",
   showRuleSelector: true
 }, {
-  key: "refundAmount",
+  key: "refund_amount",
   label: i18next.t("neetoPayments.common.refundAmount"),
   node: "amount",
   type: "decimal",
   showRuleSelector: true
 }, {
-  key: "paymentTime",
+  key: "payment_time",
   label: i18next.t("neetoPayments.common.paymentTime"),
   node: "payment_at",
   type: "date",
   showRuleSelector: true
 }, {
-  key: "refundTime",
+  key: "refund_time",
   label: i18next.t("neetoPayments.common.refundTime"),
   node: "updated_at",
   type: "date",
   showRuleSelector: true
 }, {
-  key: "splitTime",
+  key: "split_time",
   label: i18next.t("neetoPayments.common.transferTime"),
   node: "payment_at",
   type: "date",
@@ -1950,9 +1933,9 @@ var buildPaymentColumns$1 = function buildPaymentColumns(_ref) {
 var buildFilterColumns$1 = function buildFilterColumns(tab, kind) {
   var payableEntityColumns = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   var filterColumns = FILTER_COLUMNS$1.filter(function (_ref4) {
-    var _COLUMN_METADATA$key3;
+    var _COLUMN_METADATA$snak;
     var key = _ref4.key;
-    return !((_COLUMN_METADATA$key3 = COLUMN_METADATA$1[key]) !== null && _COLUMN_METADATA$key3 !== void 0 && (_COLUMN_METADATA$key3 = _COLUMN_METADATA$key3.isHidden) !== null && _COLUMN_METADATA$key3 !== void 0 && _COLUMN_METADATA$key3[kind]);
+    return !((_COLUMN_METADATA$snak = COLUMN_METADATA$1[neetoCist.snakeToCamelCase(key)]) !== null && _COLUMN_METADATA$snak !== void 0 && (_COLUMN_METADATA$snak = _COLUMN_METADATA$snak.isHidden) !== null && _COLUMN_METADATA$snak !== void 0 && _COLUMN_METADATA$snak[kind]);
   });
   return ramda.concat(filterColumns, ramda.map(ramda.prop("filterProps"), neetoCist.filterBy({
     isFilterable: true,
@@ -2074,7 +2057,9 @@ var useFiltersAndPagination$2 = function useFiltersAndPagination(_ref) {
   var payableEntityColumns = _ref.payableEntityColumns,
     kind = _ref.kind,
     searchProps = _ref.searchProps;
-  var urlSearchParams = useURLSearchParams();
+  var _useQueryParams = reactUtils.useQueryParams(),
+    _useQueryParams$tab = _useQueryParams.tab,
+    tab = _useQueryParams$tab === void 0 ? TAB$2.all : _useQueryParams$tab;
   var history = reactRouterDom.useHistory();
   var tabs = TABS$2.filter(function (tab) {
     var _TAB_METADATA$tab;
@@ -2096,10 +2081,6 @@ var useFiltersAndPagination$2 = function useFiltersAndPagination(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     sortProperties = _useState8[0],
     setSortProperties = _useState8[1];
-  var _useState9 = React.useState(TAB$2.all),
-    _useState10 = _slicedToArray(_useState9, 2),
-    tab = _useState10[0],
-    setTab = _useState10[1];
   var filterableColumns = buildFilterColumns$1(tab, kind, payableEntityColumns);
   var _getQueryParams = utils$3.getQueryParams(),
     _getQueryParams$searc = _getQueryParams.searchTerm,
@@ -2111,18 +2092,18 @@ var useFiltersAndPagination$2 = function useFiltersAndPagination(_ref) {
     key: "search_term",
     value: searchTerm.trim()
   });
-  var _useState11 = React.useState(neetoFiltersFrontend.buildFiltersFromURL([].concat(_toConsumableArray(filterableColumns), [searchKeywordProps]))),
+  var _useState9 = React.useState(neetoFiltersFrontend.buildFiltersFromURL([].concat(_toConsumableArray(filterableColumns), [searchKeywordProps]))),
+    _useState10 = _slicedToArray(_useState9, 2),
+    filters = _useState10[0],
+    setFilters = _useState10[1];
+  var _useState11 = React.useState(0),
     _useState12 = _slicedToArray(_useState11, 2),
-    filters = _useState12[0],
-    setFilters = _useState12[1];
-  var _useState13 = React.useState(0),
+    dataSize = _useState12[0],
+    setDataSize = _useState12[1];
+  var _useState13 = React.useState(INITIAL_PANE_STATUS),
     _useState14 = _slicedToArray(_useState13, 2),
-    dataSize = _useState14[0],
-    setDataSize = _useState14[1];
-  var _useState15 = React.useState(INITIAL_PANE_STATUS),
-    _useState16 = _slicedToArray(_useState15, 2),
-    paneStatus = _useState16[0],
-    setPaneStatus = _useState16[1];
+    paneStatus = _useState14[0],
+    setPaneStatus = _useState14[1];
   var columns = buildPaymentColumns$1({
     tab: tab,
     kind: kind,
@@ -2134,13 +2115,15 @@ var useFiltersAndPagination$2 = function useFiltersAndPagination(_ref) {
   var modifiedColumns = columns.map(ramda.modify("dataIndex", processDataIndex));
   var handleTabChange = function handleTabChange(tab) {
     var _pageProperties$tab, _pageProperties$tab2;
-    urlSearchParams.set("tab", tab);
-    urlSearchParams.set("page", (_pageProperties$tab = pageProperties[tab]) === null || _pageProperties$tab === void 0 ? void 0 : _pageProperties$tab.page);
-    urlSearchParams.set("page_size", (_pageProperties$tab2 = pageProperties[tab]) === null || _pageProperties$tab2 === void 0 ? void 0 : _pageProperties$tab2.pageSize);
-    history.push({
-      search: urlSearchParams.toString()
+    var queryParams = utils$3.getQueryParams({
+      toCamelCase: false
     });
-    setTab(tab);
+    var newParams = {
+      tab: tab,
+      page: (_pageProperties$tab = pageProperties[tab]) === null || _pageProperties$tab === void 0 ? void 0 : _pageProperties$tab.page,
+      page_size: (_pageProperties$tab2 = pageProperties[tab]) === null || _pageProperties$tab2 === void 0 ? void 0 : _pageProperties$tab2.pageSize
+    };
+    history.push(utils$3.buildUrl(window.location.pathname, ramda.mergeLeft(newParams, queryParams)));
   };
   return {
     isFilterButtonVisible: isFilterButtonVisible,
@@ -2161,7 +2144,6 @@ var useFiltersAndPagination$2 = function useFiltersAndPagination(_ref) {
     setPageProperties: setPageProperties,
     setPaneStatus: setPaneStatus,
     setFilters: setFilters,
-    setTab: setTab,
     handleTabChange: handleTabChange,
     setDataSize: setDataSize,
     setSortProperties: setSortProperties
@@ -4691,7 +4673,7 @@ var Details = function Details(_ref) {
 };
 
 var List$2 = function List(_ref) {
-  var _pageProperties$tab3, _pageProperties$tab4, _pageProperties$tab5;
+  var _pageProperties$tab, _pageProperties$tab2, _pageProperties$tab3;
   var _ref$isPlatformEnable = _ref.isPlatformEnabled,
     isPlatformEnabled = _ref$isPlatformEnable === void 0 ? false : _ref$isPlatformEnable,
     kind = _ref.kind,
@@ -4704,20 +4686,14 @@ var List$2 = function List(_ref) {
     tab = _ref.tab,
     paneStatus = _ref.paneStatus,
     setPaneStatus = _ref.setPaneStatus,
-    handleTabChange = _ref.handleTabChange,
     setDataSize = _ref.setDataSize,
     sortProperties = _ref.sortProperties,
     setSortProperties = _ref.setSortProperties,
     payoutId = _ref.payoutId,
     columns = _ref.columns;
-  var urlSearchParams = useURLSearchParams();
   var history = reactRouterDom.useHistory();
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
-  var tabs = TABS$2.filter(function (tab) {
-    var _TAB_METADATA$tab;
-    return !((_TAB_METADATA$tab = TAB_METADATA$1[tab]) !== null && _TAB_METADATA$tab !== void 0 && (_TAB_METADATA$tab = _TAB_METADATA$tab.isHidden) !== null && _TAB_METADATA$tab !== void 0 && _TAB_METADATA$tab[kind]);
-  });
   var _useHiddenColumns = Columns.useHiddenColumns("stripePaymentDashboard_".concat(kind)),
     hideColumn = _useHiddenColumns.hideColumn,
     _useHiddenColumns$hid = _useHiddenColumns.hiddenColumns,
@@ -4756,11 +4732,13 @@ var List$2 = function List(_ref) {
     setDataSize(dataSize);
   }, [data]);
   var handleTablePaginaton = function handleTablePaginaton(page, pageSize) {
-    urlSearchParams.set("page", page);
-    urlSearchParams.set("page_size", pageSize);
-    history.push({
-      search: urlSearchParams.toString()
+    var queryParams = utils$3.getQueryParams({
+      toCamelCase: false
     });
+    history.push(utils$3.buildUrl(window.location.pathname, ramda.mergeLeft({
+      page: page,
+      page_size: pageSize
+    }, queryParams)));
     setPageProperties(ramda.assoc(tab, {
       page: page,
       pageSize: pageSize
@@ -4770,16 +4748,6 @@ var List$2 = function List(_ref) {
     handleTablePaginaton(constants.DEFAULT_PAGE_INDEX, constants.DEFAULT_PAGE_SIZE);
     setSortProperties(DEFAULT_SORT_PROPERTIES$1);
   }, [filters, tab]);
-  React.useEffect(function () {
-    var _pageProperties$tab, _pageProperties$tab2;
-    var tab = urlSearchParams.get("tab") || TAB$2.all;
-    var validatedTab = tabs.includes(tab) ? tab : TAB$2.all;
-    var page = Number(urlSearchParams.get("page")) || ((_pageProperties$tab = pageProperties[tab]) === null || _pageProperties$tab === void 0 ? void 0 : _pageProperties$tab.page);
-    var pageSize = Number(urlSearchParams.get("page_size")) || ((_pageProperties$tab2 = pageProperties[tab]) === null || _pageProperties$tab2 === void 0 ? void 0 : _pageProperties$tab2.pageSize);
-    handleTabChange(validatedTab);
-    urlSearchParams.set("tab", validatedTab);
-    handleTablePaginaton(page, pageSize);
-  }, [urlSearchParams]);
   var handleTableChange = function handleTableChange(_, __, sorter) {
     setSortProperties(neetoCist.isPresent(sorter === null || sorter === void 0 ? void 0 : sorter.column) ? {
       sortBy: neetoCist.camelToSnakeCase(processDataIndex(sorter.field)),
@@ -4803,12 +4771,12 @@ var List$2 = function List(_ref) {
     return !hiddenColumns.includes(processDataIndex(dataIndex));
   });
   return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(TableWrapper__default["default"], {
-    hasPagination: dataSize > ((_pageProperties$tab3 = pageProperties[tab]) === null || _pageProperties$tab3 === void 0 ? void 0 : _pageProperties$tab3.pageSize)
+    hasPagination: dataSize > ((_pageProperties$tab = pageProperties[tab]) === null || _pageProperties$tab === void 0 ? void 0 : _pageProperties$tab.pageSize)
   }, /*#__PURE__*/React__default["default"].createElement(neetoui.Table, {
     fixedHeight: true,
     allowRowClick: false,
     columnData: visibleColumns,
-    currentPageNumber: (_pageProperties$tab4 = pageProperties[tab]) === null || _pageProperties$tab4 === void 0 ? void 0 : _pageProperties$tab4.page,
+    currentPageNumber: (_pageProperties$tab2 = pageProperties[tab]) === null || _pageProperties$tab2 === void 0 ? void 0 : _pageProperties$tab2.page,
     handlePageChange: handleTablePaginaton,
     loading: isDataFetching,
     rowData: buildRowData({
@@ -4831,7 +4799,7 @@ var List$2 = function List(_ref) {
     paginationProps: {
       showSizeChanger: true,
       hideOnSinglePage: true,
-      pageSize: (_pageProperties$tab5 = pageProperties[tab]) === null || _pageProperties$tab5 === void 0 ? void 0 : _pageProperties$tab5.pageSize,
+      pageSize: (_pageProperties$tab3 = pageProperties[tab]) === null || _pageProperties$tab3 === void 0 ? void 0 : _pageProperties$tab3.pageSize,
       total: dataSize
     },
     onChange: handleTableChange,
@@ -4954,7 +4922,6 @@ var Dashboard = function Dashboard(_ref) {
   }), /*#__PURE__*/React__default["default"].createElement(List$2, {
     columns: columns,
     filters: filters,
-    handleTabChange: handleTabChange,
     holdableId: holdableId,
     isPlatformEnabled: isPlatformEnabled,
     kind: kind,
@@ -4996,13 +4963,13 @@ var SEARCH_PROPS = {
 };
 var DASHBOARD_MANDATORY_COLUMNS = ["id", "status", "identifier"];
 var FILTER_COLUMNS = [{
-  key: "createdAt",
+  key: "created_at",
   label: i18next.t("neetoPayments.common.createdAt"),
   node: "created_at",
   type: "date",
   showRuleSelector: true
 }, {
-  key: "arrivalDate",
+  key: "arrival_date",
   label: i18next.t("neetoPayments.common.arrivalDate"),
   node: "arrival_date",
   type: "date",
@@ -5174,7 +5141,7 @@ var renderPayoutIdentifier$1 = ramda.curry(function (route, _ref) {
 function ownKeys$3(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$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var useFiltersAndPagination$1 = function useFiltersAndPagination(payoutsPageRoute) {
-  var urlSearchParams = useURLSearchParams();
+  var history = reactRouterDom.useHistory();
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isFilterButtonVisible = _useState2[0],
@@ -5191,10 +5158,9 @@ var useFiltersAndPagination$1 = function useFiltersAndPagination(payoutsPageRout
     _useState8 = _slicedToArray(_useState7, 2),
     sortProperties = _useState8[0],
     setSortProperties = _useState8[1];
-  var _useState9 = React.useState(TAB$1.all),
-    _useState10 = _slicedToArray(_useState9, 2),
-    tab = _useState10[0],
-    setTab = _useState10[1];
+  var _useQueryParams = reactUtils.useQueryParams(),
+    _useQueryParams$tab = _useQueryParams.tab,
+    tab = _useQueryParams$tab === void 0 ? TAB$1.all : _useQueryParams$tab;
   var _getQueryParams = utils$3.getQueryParams(),
     _getQueryParams$searc = _getQueryParams.searchTerm,
     searchTerm = _getQueryParams$searc === void 0 ? "" : _getQueryParams$searc;
@@ -5202,14 +5168,14 @@ var useFiltersAndPagination$1 = function useFiltersAndPagination(payoutsPageRout
     key: "search_term",
     value: searchTerm.trim()
   });
-  var _useState11 = React.useState(neetoFiltersFrontend.buildFiltersFromURL([].concat(_toConsumableArray(FILTER_COLUMNS), [searchKeywordProps]))),
+  var _useState9 = React.useState(neetoFiltersFrontend.buildFiltersFromURL([].concat(_toConsumableArray(FILTER_COLUMNS), [searchKeywordProps]))),
+    _useState10 = _slicedToArray(_useState9, 2),
+    filters = _useState10[0],
+    setFilters = _useState10[1];
+  var _useState11 = React.useState(0),
     _useState12 = _slicedToArray(_useState11, 2),
-    filters = _useState12[0],
-    setFilters = _useState12[1];
-  var _useState13 = React.useState(0),
-    _useState14 = _slicedToArray(_useState13, 2),
-    dataSize = _useState14[0],
-    setDataSize = _useState14[1];
+    dataSize = _useState12[0],
+    setDataSize = _useState12[1];
   var identifierColumn = ramda.assoc("render", renderPayoutIdentifier$1(payoutsPageRoute), IDENTIFIER_COLUMN);
   var columns = ramda.insert(1, identifierColumn, COLUMNS$1);
   var columnData = tab !== TAB$1.all ? neetoCist.removeBy({
@@ -5217,10 +5183,15 @@ var useFiltersAndPagination$1 = function useFiltersAndPagination(payoutsPageRout
   }, columns) : columns;
   var handleTabChange = function handleTabChange(tab) {
     var _pageProperties$tab, _pageProperties$tab2;
-    urlSearchParams.set("tab", tab);
-    urlSearchParams.set("page", (_pageProperties$tab = pageProperties[tab]) === null || _pageProperties$tab === void 0 ? void 0 : _pageProperties$tab.page);
-    urlSearchParams.set("page_size", (_pageProperties$tab2 = pageProperties[tab]) === null || _pageProperties$tab2 === void 0 ? void 0 : _pageProperties$tab2.pageSize);
-    setTab(tab);
+    var queryParams = utils$3.getQueryParams({
+      toCamelCase: false
+    });
+    var newParams = {
+      tab: tab,
+      page: (_pageProperties$tab = pageProperties[tab]) === null || _pageProperties$tab === void 0 ? void 0 : _pageProperties$tab.page,
+      page_size: (_pageProperties$tab2 = pageProperties[tab]) === null || _pageProperties$tab2 === void 0 ? void 0 : _pageProperties$tab2.pageSize
+    };
+    history.push(utils$3.buildUrl(window.location.pathname, ramda.mergeLeft(newParams, queryParams)));
   };
   return {
     isFilterButtonVisible: isFilterButtonVisible,
@@ -5237,7 +5208,6 @@ var useFiltersAndPagination$1 = function useFiltersAndPagination(payoutsPageRout
     setIsFilterPaneOpen: setIsFilterPaneOpen,
     setPageProperties: setPageProperties,
     setFilters: setFilters,
-    setTab: setTab,
     handleTabChange: handleTabChange,
     setSortProperties: setSortProperties
   };
@@ -5265,10 +5235,9 @@ var useFetchData$1 = function useFetchData(_ref) {
 };
 
 var List$1 = function List(_ref) {
-  var _pageProperties$tab3, _pageProperties$tab4, _pageProperties$tab5;
+  var _pageProperties$tab, _pageProperties$tab2, _pageProperties$tab3;
   var columnData = _ref.columnData,
     filters = _ref.filters,
-    handleTabChange = _ref.handleTabChange,
     pageProperties = _ref.pageProperties,
     setDataSize = _ref.setDataSize,
     setIsFilterButtonVisible = _ref.setIsFilterButtonVisible,
@@ -5277,7 +5246,6 @@ var List$1 = function List(_ref) {
     sortProperties = _ref.sortProperties,
     tab = _ref.tab,
     isPlatformEnabled = _ref.isPlatformEnabled;
-  var urlSearchParams = useURLSearchParams();
   var history = reactRouterDom.useHistory();
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
@@ -5302,12 +5270,13 @@ var List$1 = function List(_ref) {
     setDataSize(dataSize);
   }, [payouts]);
   var handleTablePagination = function handleTablePagination(page, pageSize) {
-    urlSearchParams.set("tab", tab);
-    urlSearchParams.set("page", page);
-    urlSearchParams.set("page_size", pageSize);
-    history.push({
-      search: urlSearchParams.toString()
+    var queryParams = utils$3.getQueryParams({
+      toCamelCase: false
     });
+    history.push(utils$3.buildUrl(window.location.pathname, ramda.mergeLeft({
+      page: page,
+      page_size: pageSize
+    }, queryParams)));
     setPageProperties(ramda.assoc(tab, {
       page: page,
       pageSize: pageSize
@@ -5317,16 +5286,6 @@ var List$1 = function List(_ref) {
     handleTablePagination(constants.DEFAULT_PAGE_INDEX, constants.DEFAULT_PAGE_SIZE);
     setSortProperties(DEFAULT_SORT_PROPERTIES);
   }, [filters, tab]);
-  React.useEffect(function () {
-    var _pageProperties$tab, _pageProperties$tab2;
-    var tab = urlSearchParams.get("tab") || TAB$1.all;
-    var validatedTab = TABS$1.includes(tab) ? tab : TAB$1.all;
-    var page = Number(urlSearchParams.get("page")) || ((_pageProperties$tab = pageProperties[tab]) === null || _pageProperties$tab === void 0 ? void 0 : _pageProperties$tab.page);
-    var pageSize = Number(urlSearchParams.get("page_size")) || ((_pageProperties$tab2 = pageProperties[tab]) === null || _pageProperties$tab2 === void 0 ? void 0 : _pageProperties$tab2.pageSize);
-    handleTabChange(validatedTab);
-    urlSearchParams.set("tab", validatedTab);
-    handleTablePagination(page, pageSize);
-  }, [urlSearchParams]);
   var handleTableChange = function handleTableChange(_, __, sorter) {
     setSortProperties(neetoCist.isPresent(sorter === null || sorter === void 0 ? void 0 : sorter.column) ? {
       sortBy: neetoCist.camelToSnakeCase(sorter.field),
@@ -5344,12 +5303,12 @@ var List$1 = function List(_ref) {
     }));
   }
   return /*#__PURE__*/React__default["default"].createElement(TableWrapper__default["default"], {
-    hasPagination: dataSize > ((_pageProperties$tab3 = pageProperties[tab]) === null || _pageProperties$tab3 === void 0 ? void 0 : _pageProperties$tab3.pageSize)
+    hasPagination: dataSize > ((_pageProperties$tab = pageProperties[tab]) === null || _pageProperties$tab === void 0 ? void 0 : _pageProperties$tab.pageSize)
   }, /*#__PURE__*/React__default["default"].createElement(neetoui.Table, {
     fixedHeight: true,
     allowRowClick: false,
     columnData: getVisibleColumnData(columnData),
-    currentPageNumber: (_pageProperties$tab4 = pageProperties[tab]) === null || _pageProperties$tab4 === void 0 ? void 0 : _pageProperties$tab4.page,
+    currentPageNumber: (_pageProperties$tab2 = pageProperties[tab]) === null || _pageProperties$tab2 === void 0 ? void 0 : _pageProperties$tab2.page,
     handlePageChange: handleTablePagination,
     loading: isDataFetching,
     rowData: buildRowData({
@@ -5363,7 +5322,7 @@ var List$1 = function List(_ref) {
     paginationProps: {
       showSizeChanger: true,
       hideOnSinglePage: true,
-      pageSize: (_pageProperties$tab5 = pageProperties[tab]) === null || _pageProperties$tab5 === void 0 ? void 0 : _pageProperties$tab5.pageSize,
+      pageSize: (_pageProperties$tab3 = pageProperties[tab]) === null || _pageProperties$tab3 === void 0 ? void 0 : _pageProperties$tab3.pageSize,
       total: dataSize
     },
     onChange: handleTableChange,
@@ -5462,7 +5421,6 @@ var PayoutsDashboard = function PayoutsDashboard(_ref) {
   }), /*#__PURE__*/React__default["default"].createElement(List$1, {
     columnData: columnData,
     filters: filters,
-    handleTabChange: handleTabChange,
     isPlatformEnabled: isPlatformEnabled,
     pageProperties: pageProperties,
     setDataSize: setDataSize,
@@ -6314,7 +6272,6 @@ var useFiltersAndPagination = function useFiltersAndPagination(_ref) {
     kind = _ref.kind,
     initialTabs = _ref.initialTabs,
     tabMetaData = _ref.tabMetaData;
-  var urlSearchParams = useURLSearchParams();
   var history = reactRouterDom.useHistory();
   var tabs = initialTabs.filter(function (tab) {
     var _tabMetaData$tab;
@@ -6336,31 +6293,32 @@ var useFiltersAndPagination = function useFiltersAndPagination(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     pageProperties = _useState8[0],
     setPageProperties = _useState8[1];
-  var _useState9 = React.useState("all"),
-    _useState10 = _slicedToArray(_useState9, 2),
-    tab = _useState10[0],
-    setTab = _useState10[1];
+  var _useQueryParams = reactUtils.useQueryParams(),
+    _useQueryParams$tab = _useQueryParams.tab,
+    tab = _useQueryParams$tab === void 0 ? "all" : _useQueryParams$tab;
   var filterableColumns = buildFilterColumns(payableEntityColumns);
-  var _useState11 = React.useState(neetoFiltersFrontend.buildFiltersFromURL(filterableColumns)),
+  var _useState9 = React.useState(neetoFiltersFrontend.buildFiltersFromURL(filterableColumns)),
+    _useState10 = _slicedToArray(_useState9, 2),
+    filters = _useState10[0],
+    setFilters = _useState10[1];
+  var _useState11 = React.useState(0),
     _useState12 = _slicedToArray(_useState11, 2),
-    filters = _useState12[0],
-    setFilters = _useState12[1];
-  var _useState13 = React.useState(0),
-    _useState14 = _slicedToArray(_useState13, 2),
-    dataSize = _useState14[0],
-    setDataSize = _useState14[1];
+    dataSize = _useState12[0],
+    setDataSize = _useState12[1];
   var _getQueryParams = utils$3.getQueryParams(),
     _getQueryParams$searc = _getQueryParams.searchTerm,
     searchTerm = _getQueryParams$searc === void 0 ? "" : _getQueryParams$searc;
   var handleTabChange = function handleTabChange(tab) {
     var _pageProperties$tab, _pageProperties$tab2;
-    urlSearchParams.set("tab", tab);
-    urlSearchParams.set("page", (_pageProperties$tab = pageProperties[tab]) === null || _pageProperties$tab === void 0 ? void 0 : _pageProperties$tab.page);
-    urlSearchParams.set("page_size", (_pageProperties$tab2 = pageProperties[tab]) === null || _pageProperties$tab2 === void 0 ? void 0 : _pageProperties$tab2.pageSize);
-    history.push({
-      search: urlSearchParams.toString()
+    var queryParams = utils$3.getQueryParams({
+      toCamelCase: false
     });
-    setTab(tab);
+    var newParams = {
+      tab: tab,
+      page: (_pageProperties$tab = pageProperties[tab]) === null || _pageProperties$tab === void 0 ? void 0 : _pageProperties$tab.page,
+      page_size: (_pageProperties$tab2 = pageProperties[tab]) === null || _pageProperties$tab2 === void 0 ? void 0 : _pageProperties$tab2.pageSize
+    };
+    history.push(utils$3.buildUrl(window.location.pathname, ramda.mergeLeft(newParams, queryParams)));
   };
   return {
     isFilterButtonVisible: isFilterButtonVisible,
@@ -6378,7 +6336,6 @@ var useFiltersAndPagination = function useFiltersAndPagination(_ref) {
     setPageProperties: setPageProperties,
     setSortProperties: setSortProperties,
     setFilters: setFilters,
-    setTab: setTab,
     handleTabChange: handleTabChange,
     setDataSize: setDataSize
   };
@@ -6500,7 +6457,7 @@ var useFetchSquareData = function useFetchSquareData(_ref) {
 };
 
 var List = function List(_ref) {
-  var _pageProperties$tab3, _pageProperties$tab4, _pageProperties$tab5;
+  var _pageProperties$tab, _pageProperties$tab2, _pageProperties$tab3;
   var kind = _ref.kind,
     _ref$holdableId = _ref.holdableId,
     holdableId = _ref$holdableId === void 0 ? null : _ref$holdableId,
@@ -6510,12 +6467,9 @@ var List = function List(_ref) {
     payableEntityColumns = _ref.payableEntityColumns,
     setPageProperties = _ref.setPageProperties,
     tab = _ref.tab,
-    tabs = _ref.tabs,
-    handleTabChange = _ref.handleTabChange,
     sortProperties = _ref.sortProperties,
     setSortProperties = _ref.setSortProperties,
     setDataSize = _ref.setDataSize;
-  var urlSearchParams = useURLSearchParams();
   var history = reactRouterDom.useHistory();
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
@@ -6548,26 +6502,18 @@ var List = function List(_ref) {
     setDataSize(dataSize);
   }, [data]);
   var handleTablePaginaton = function handleTablePaginaton(page, pageSize) {
-    urlSearchParams.set("page", page);
-    urlSearchParams.set("page_size", pageSize);
-    history.push({
-      search: urlSearchParams.toString()
+    var queryParams = utils$3.getQueryParams({
+      toCamelCase: false
     });
+    history.push(utils$3.buildUrl(window.location.pathname, ramda.mergeLeft({
+      page: page,
+      page_size: pageSize
+    }, queryParams)));
     setPageProperties(ramda.assoc(tab, {
       page: page,
       pageSize: pageSize
     }));
   };
-  React.useEffect(function () {
-    var _pageProperties$tab, _pageProperties$tab2;
-    var tab = urlSearchParams.get("tab") || TAB.all;
-    var validatedTab = tabs.includes(tab) ? tab : TAB.all;
-    var pageIndex = Number(urlSearchParams.get("page")) || ((_pageProperties$tab = pageProperties[tab]) === null || _pageProperties$tab === void 0 ? void 0 : _pageProperties$tab.page);
-    var pageSize = Number(urlSearchParams.get("page_size")) || ((_pageProperties$tab2 = pageProperties[tab]) === null || _pageProperties$tab2 === void 0 ? void 0 : _pageProperties$tab2.pageSize);
-    handleTabChange(validatedTab);
-    urlSearchParams.set("tab", validatedTab);
-    handleTablePaginaton(pageIndex, pageSize);
-  }, [urlSearchParams]);
   var handleTableChange = function handleTableChange(_, __, sorter) {
     setSortProperties(neetoCist.isPresent(sorter === null || sorter === void 0 ? void 0 : sorter.column) ? {
       sortBy: neetoCist.camelToSnakeCase(sorter.field),
@@ -6587,12 +6533,12 @@ var List = function List(_ref) {
     }));
   }
   return /*#__PURE__*/React__default["default"].createElement(TableWrapper__default["default"], {
-    hasPagination: dataSize > ((_pageProperties$tab3 = pageProperties[tab]) === null || _pageProperties$tab3 === void 0 ? void 0 : _pageProperties$tab3.pageSize)
+    hasPagination: dataSize > ((_pageProperties$tab = pageProperties[tab]) === null || _pageProperties$tab === void 0 ? void 0 : _pageProperties$tab.pageSize)
   }, /*#__PURE__*/React__default["default"].createElement(neetoui.Table, {
+    columnData: columnData,
     fixedHeight: true,
     allowRowClick: false,
-    columnData: columnData,
-    currentPageNumber: (_pageProperties$tab4 = pageProperties[tab]) === null || _pageProperties$tab4 === void 0 ? void 0 : _pageProperties$tab4.page,
+    currentPageNumber: (_pageProperties$tab2 = pageProperties[tab]) === null || _pageProperties$tab2 === void 0 ? void 0 : _pageProperties$tab2.page,
     handlePageChange: handleTablePaginaton,
     loading: isDataFetching,
     rowData: buildRowData({
@@ -6606,7 +6552,7 @@ var List = function List(_ref) {
     paginationProps: {
       showSizeChanger: true,
       hideOnSinglePage: true,
-      pageSize: (_pageProperties$tab5 = pageProperties[tab]) === null || _pageProperties$tab5 === void 0 ? void 0 : _pageProperties$tab5.pageSize,
+      pageSize: (_pageProperties$tab3 = pageProperties[tab]) === null || _pageProperties$tab3 === void 0 ? void 0 : _pageProperties$tab3.pageSize,
       total: dataSize
     },
     onChange: handleTableChange
@@ -6640,8 +6586,6 @@ var SquareDashboard = function SquareDashboard(_ref) {
     sortProperties = filterPaginationState.sortProperties,
     setSortProperties = filterPaginationState.setSortProperties,
     tab = filterPaginationState.tab,
-    tabs = filterPaginationState.tabs,
-    handleTabChange = filterPaginationState.handleTabChange,
     setDataSize = filterPaginationState.setDataSize;
   return /*#__PURE__*/React__default["default"].createElement(FilterWrapper, _extends$1({
     title: isPaymentKind(kind) ? t("neetoPayments.title.squarePayment") : t("neetoPayments.title.squareRefund")
@@ -6651,7 +6595,6 @@ var SquareDashboard = function SquareDashboard(_ref) {
     searchProps: searchProps
   }, filterPaginationState)), /*#__PURE__*/React__default["default"].createElement(List, {
     filters: filters,
-    handleTabChange: handleTabChange,
     holdableId: holdableId,
     kind: kind,
     pageProperties: pageProperties,
@@ -6659,10 +6602,9 @@ var SquareDashboard = function SquareDashboard(_ref) {
     setDataSize: setDataSize,
     setIsFilterButtonVisible: setIsFilterButtonVisible,
     setPageProperties: setPageProperties,
-    tab: tab,
-    tabs: tabs,
+    setSortProperties: setSortProperties,
     sortProperties: sortProperties,
-    setSortProperties: setSortProperties
+    tab: tab
   }));
 };
 var index = reactUtils.withTitle(withReactQuery(SquareDashboard), i18next.t("neetoPayments.common.squarePayments"));
@@ -6987,6 +6929,8 @@ var AccountDetails = function AccountDetails(_ref) {
 var AccountProcessing = function AccountProcessing(_ref) {
   var holdableId = _ref.holdableId,
     returnUrl = _ref.returnUrl;
+  var _useQueryParams = reactUtils.useQueryParams(),
+    app = _useQueryParams.app;
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isAlertOpen = _useState2[0],
@@ -6997,8 +6941,7 @@ var AccountProcessing = function AccountProcessing(_ref) {
     setIsPolling = _useState4[1];
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
-  var urlSearchParams = useURLSearchParams();
-  var isStripeCallback = urlSearchParams.get("app") === "stripe";
+  var isStripeCallback = app === "stripe";
   React.useEffect(function () {
     if (!isStripeCallback) return;
     setIsPolling(true);