Merge branch 'master' into feature/america

2023-06-12 10:05:03 -07:00
parent bccfc127f3 91279c27fe
commit f9633505a2
30 changed files with 466 additions and 155 deletions
--- a/client/src/pages/shop/shop.page.component.jsx
+++ b/client/src/pages/shop/shop.page.component.jsx
@@ -42,6 +42,10 @@ export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
    ]);
  }, [t, setSelectedHeader, setBreadcrumbs, bodyshop.shopname]);

+  useEffect(() => {
+    if (!search.tab) history.push({ search: "?tab=info" });
+  }, [history, search]);
+
  return (
    <RbacWrapper action="shop:config">
      <Tabs