Merge pull request #100 from ulu-telegram/master

fix
ulu-telegram · Nov 17, 2023 · f6d9837 · f6d9837
2 parents 7d45b4c + dd7fbaf
commit f6d9837
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 33 deletions.
diff --git a/src/components/left/main/ForumPanel.tsx b/src/components/left/main/ForumPanel.tsx
@@ -20,7 +20,9 @@ import captureEscKeyListener from '../../../util/captureEscKeyListener';
 import { captureEvents, SwipeDirection } from '../../../util/captureEvents';
 import { waitForTransitionEnd } from '../../../util/cssAnimationEndListeners';
 import { createLocationHash } from '../../../util/routing';
-import { IS_TOUCH_ENV } from '../../../util/windowEnvironment';
+import {
+  IS_ELECTRON, IS_MAC_OS, IS_TOUCH_ENV,
+} from '../../../util/windowEnvironment';
 
 import useAppLayout from '../../../hooks/useAppLayout';
 import { dispatchHeavyAnimationEvent } from '../../../hooks/useHeavyAnimationCheck';
@@ -216,6 +218,9 @@ const ForumPanel: FC<OwnProps & StateProps> = ({
       )}
       onTransitionEnd={!isOpen ? onCloseAnimationEnd : undefined}
     >
+      {IS_ELECTRON && IS_MAC_OS && (
+        <div className="electron-top-block" />
+      )}
       <div id="TopicListHeader" className="left-header">
         <Button
           round

diff --git a/src/components/left/main/LeftMainHeader.tsx b/src/components/left/main/LeftMainHeader.tsx
@@ -183,10 +183,15 @@ const LeftMainHeader: FC<OwnProps & StateProps> = ({
 
   const MainButton: FC<{ onTrigger: () => void }> = useMemo(() => {
     return ({ onTrigger }) => (
-      <UluHeaderProfile
+      <>
+        {IS_ELECTRON && (
+          <div className="electron-top-block" />
+        )}
+        <UluHeaderProfile
         // eslint-disable-next-line react/jsx-no-bind
-        onClick={hasMenu ? onTrigger : () => onReset()}
-      />
+          onClick={hasMenu ? onTrigger : () => onReset()}
+        />
+      </>
     );
   }, [hasMenu, onReset]);
 
@@ -293,35 +298,30 @@ const LeftMainHeader: FC<OwnProps & StateProps> = ({
             {isCurrentUserPremium && <StatusButton />}
           </>
         ) : (
-          <>
-            {IS_ELECTRON && (
-              <div className="electron-top-block" />
-            )}
-            <div className={styles.profileWrapper}>
-              <DropdownMenu
-                trigger={MainButton}
-                footer={`${APP_NAME} ${versionString}`}
-                className={buildClassName(
-                  'main-menu',
-                  lang.isRtl && 'rtl',
-                  shouldHideSearch && lang.isRtl && 'right-aligned',
-                  shouldDisableDropdownMenuTransitionRef.current && lang.isRtl && 'disable-transition',
-                )}
-                forceOpen={isBotMenuOpen}
-                positionX={shouldHideSearch && lang.isRtl ? 'right' : 'left'}
-                onTransitionEnd={lang.isRtl ? handleDropdownMenuTransitionEnd : undefined}
-              >
-                <LeftSideMenuItems
-                  onSelectArchived={onSelectArchived}
-                  onSelectContacts={onSelectContacts}
-                  onSelectSettings={onSelectSettings}
-                  onBotMenuOpened={markBotMenuOpen}
-                  onBotMenuClosed={unmarkBotMenuOpen}
-                />
-              </DropdownMenu>
-              <UluSearchButton onClick={handleSearchFocus} />
-            </div>
-          </>
+          <div className={styles.profileWrapper}>
+            <DropdownMenu
+              trigger={MainButton}
+              footer={`${APP_NAME} ${versionString}`}
+              className={buildClassName(
+                'main-menu',
+                lang.isRtl && 'rtl',
+                shouldHideSearch && lang.isRtl && 'right-aligned',
+                shouldDisableDropdownMenuTransitionRef.current && lang.isRtl && 'disable-transition',
+              )}
+              forceOpen={isBotMenuOpen}
+              positionX={shouldHideSearch && lang.isRtl ? 'right' : 'left'}
+              onTransitionEnd={lang.isRtl ? handleDropdownMenuTransitionEnd : undefined}
+            >
+              <LeftSideMenuItems
+                onSelectArchived={onSelectArchived}
+                onSelectContacts={onSelectContacts}
+                onSelectSettings={onSelectSettings}
+                onBotMenuOpened={markBotMenuOpen}
+                onBotMenuClosed={unmarkBotMenuOpen}
+              />
+            </DropdownMenu>
+            <UluSearchButton onClick={handleSearchFocus} />
+          </div>
         ) }
         {hasPasscode && (
           <Button