[Cleanup] Adjusting Company Switcher Per New Design

package.json

@@ -38,6 +38,7 @@
     "pusher-js": "^8.4.0-rc2",
     "randexp": "^0.5.3",
     "react": "^18.2.0",
+    "react-avatar": "^5.0.3",
     "react-colorful": "^5.6.1",
     "react-date-range": "^1.4.0",
     "react-datepicker": "^4.11.0",

src/common/hooks/useHandleCollapseExpandSidebar.ts

@@ -0,0 +1,37 @@
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+import { useUpdateCompanyUser } from '$app/pages/settings/user/common/hooks/useUpdateCompanyUser';
+import { cloneDeep, set } from 'lodash';
+import { useHandleCurrentUserChangeProperty } from './useHandleCurrentUserChange';
+import { useInjectUserChanges } from './useInjectUserChanges';
+
+export function useHandleCollapseExpandSidebar() {
+  const userChanges = useInjectUserChanges();
+
+  const updateCompanyUser = useUpdateCompanyUser();
+  const handleUserChange = useHandleCurrentUserChangeProperty();
+
+  return (value: boolean) => {
+    handleUserChange('company_user.react_settings.show_mini_sidebar', value);
+
+    if (userChanges) {
+      const updatedUserChanges = cloneDeep(userChanges);
+
+      set(
+        updatedUserChanges,
+        'company_user.react_settings.show_mini_sidebar',
+        value
+      );
+
+      updateCompanyUser(updatedUserChanges);
+    }
+  };
+}

src/common/hooks/useInjectUserChanges.ts

@@ -31,7 +31,7 @@ export function useInjectUserChanges(options?: Options) {
   const changes = useUserChanges();
 
   useEffect(() => {
-    if (changes && options?.overwrite === false) {
+    if (Object.keys(changes || {}).length && !options?.overwrite) {
       // We don't want to overwrite existing changes,
       // so let's just not inject anything if we already have a value,
       // and relative argument.