Merge pull request #1562 from ecency/bugfix/sidebar-npe-error

Fixed sidebar error when open it immediately after page load

Author: feruzm

src/common/components/decks/deck-toolbar/deck-toolbar.tsx

@@ -89,7 +89,6 @@ export const DeckToolbar = ({ isExpanded, setIsExpanded, history }: Props) => {
           setIsExpanded={setIsExpanded}
         />
         <DeckToolbarBaseActions
-          history={history}
           isExpanded={isExpanded}
           history={history}
           setIsExpanded={setIsExpanded}

src/common/components/navbar/sidebar/navbar-side-user-info.tsx

@@ -16,7 +16,7 @@ export function NavbarSideUserInfo({ history }: { history: History }) {
       <ProfileLink history={history} username={activeUser!.username} addAccount={addAccount}>
         <UserAvatar username={activeUser!.username} size="medium" />
       </ProfileLink>
-      {activeUser!.data && (
+      {activeUser?.data.__loaded && (
         <div>
           <div className="font-semibold">{activeUser?.username}</div>
           <div className="flex flex-col text-xs">