diff --git a/packages/client/src/pages/PortalSettings/categories/common/index.js b/packages/client/src/pages/PortalSettings/categories/common/index.js index a6f8771d2b..afda2978c2 100644 --- a/packages/client/src/pages/PortalSettings/categories/common/index.js +++ b/packages/client/src/pages/PortalSettings/categories/common/index.js @@ -67,13 +67,6 @@ const TabsCommon = (props) => { } }, [tReady, isLoadedSubmenu]); - const load = async () => { - const currentTab = getCurrentTab(); - await loadBaseInfo( - !isMobileView ? (currentTab === 0 ? "general" : "branding") : "", - ); - }; - const data = [ { id: "general", @@ -92,6 +85,24 @@ const TabsCommon = (props) => { }, ]; + const getCurrentTabId = () => { + const path = location.pathname; + const currentTab = data.find((item) => path.includes(item.id)); + return currentTab !== -1 && data.length ? currentTab.id : data[0].id; + }; + + const currentTabId = getCurrentTabId(); + + const load = async () => { + await loadBaseInfo( + !isMobileView + ? currentTabId === "general" + ? "general" + : "branding" + : "", + ); + }; + const onSelect = (e) => { navigate( combineUrl( @@ -102,14 +113,6 @@ const TabsCommon = (props) => { ); }; - const getCurrentTabId = () => { - const path = location.pathname; - const currentTab = data.find((item) => path.includes(item.id)); - return currentTab !== -1 && data.length ? currentTab.id : data[0].id; - }; - - const currentTabId = getCurrentTabId(); - if (!isLoadedSubmenu) return ; return ( diff --git a/public/images/notifications/android.png b/public/images/notifications/android.png index f9c54bb2da..87ed5f993f 100644 Binary files a/public/images/notifications/android.png and b/public/images/notifications/android.png differ diff --git a/public/images/notifications/apple.png b/public/images/notifications/apple.png index 34005ee236..ecb566166e 100644 Binary files a/public/images/notifications/apple.png and b/public/images/notifications/apple.png differ diff --git a/public/images/notifications/connect.png b/public/images/notifications/connect.png new file mode 100644 index 0000000000..d86d45816d Binary files /dev/null and b/public/images/notifications/connect.png differ diff --git a/public/images/notifications/drupal.png b/public/images/notifications/drupal.png new file mode 100644 index 0000000000..0c80121805 Binary files /dev/null and b/public/images/notifications/drupal.png differ diff --git a/public/images/notifications/integration.gif b/public/images/notifications/integration.gif new file mode 100644 index 0000000000..30e4f6a2f9 Binary files /dev/null and b/public/images/notifications/integration.gif differ diff --git a/public/images/notifications/linux.png b/public/images/notifications/linux.png index 9cb2ffde99..6321be7bc3 100644 Binary files a/public/images/notifications/linux.png and b/public/images/notifications/linux.png differ diff --git a/public/images/notifications/onlyoffice.png b/public/images/notifications/onlyoffice.png new file mode 100644 index 0000000000..140bab44f6 Binary files /dev/null and b/public/images/notifications/onlyoffice.png differ diff --git a/public/images/notifications/windows.png b/public/images/notifications/windows.png index c8853b1cf4..7ac1d8797e 100644 Binary files a/public/images/notifications/windows.png and b/public/images/notifications/windows.png differ diff --git a/public/images/notifications/wordpress.png b/public/images/notifications/wordpress.png new file mode 100644 index 0000000000..aecb79f9a8 Binary files /dev/null and b/public/images/notifications/wordpress.png differ diff --git a/public/images/notifications/zapier.png b/public/images/notifications/zapier.png new file mode 100644 index 0000000000..c72e611de8 Binary files /dev/null and b/public/images/notifications/zapier.png differ diff --git a/public/images/notifications/zoom.png b/public/images/notifications/zoom.png new file mode 100644 index 0000000000..fdc124a656 Binary files /dev/null and b/public/images/notifications/zoom.png differ