Update desktop layout

tonkeeper · Mar 5, 2024 · 59a32f3 · 59a32f3
1 parent 3da4051
commit 59a32f3
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 16 deletions.
diff --git a/apps/desktop/src/app/App.tsx b/apps/desktop/src/app/App.tsx
@@ -157,7 +157,9 @@ const ThemeAndContent = () => {
     );
 };
 
-const FullSizeWrapper = styled(Container)``;
+const FullSizeWrapper = styled(Container)`
+    max-width: 800px;
+`;
 
 const Wrapper = styled.div`
     box-sizing: border-box;
@@ -210,6 +212,8 @@ const SecondColumn = styled.div`
 const FullSizeWrapperBounded = styled(FullSizeWrapper)`
     max-height: 100%;
     overflow: auto;
+
+    justify-content: center;
 `;
 
 export const Loader: FC = () => {
@@ -304,18 +308,16 @@ export const Content: FC<{
 
     if (!activeWallet || location.pathname.startsWith(AppRoute.import)) {
         return (
-            <FullSizeWrapperBounded>
-                <Suspense fallback={<Loading />}>
-                    <InitializeContainer fullHeight={false}>
-                        <Routes>
-                            <Route
-                                path={any(AppRoute.import)}
-                                element={<ImportRouter listOfAuth={listOfAuth} />}
-                            />
-                            <Route path="*" element={<Initialize />} />
-                        </Routes>
-                    </InitializeContainer>
-                </Suspense>
+            <FullSizeWrapperBounded className="full-size-wrapper">
+                <InitializeContainer fullHeight={false}>
+                    <Routes>
+                        <Route
+                            path={any(AppRoute.import)}
+                            element={<ImportRouter listOfAuth={listOfAuth} />}
+                        />
+                        <Route path="*" element={<Initialize />} />
+                    </Routes>
+                </InitializeContainer>
             </FullSizeWrapperBounded>
         );
     }

diff --git a/apps/desktop/src/electron/cookieStorage.ts b/apps/desktop/src/electron/cookieStorage.ts
@@ -20,6 +20,8 @@ export class CookieStore extends Store {
             Record<string, Record<string, Record<string, Cookie>>>
         >(this.key);
 
+        if (!result) return;
+
         Object.keys(result).forEach(domain => {
             Object.keys(result[domain]).forEach(path => {
                 Object.keys(result[domain][path]).forEach(name => {

diff --git a/apps/desktop/src/electron/mainWindow.ts b/apps/desktop/src/electron/mainWindow.ts
@@ -40,8 +40,8 @@ export abstract class MainWindow {
             icon: icon,
             width: 1150,
             minWidth: 1100,
-            height: 700,
-            minHeight: 600,
+            height: 750,
+            minHeight: 700,
             resizable: isDev,
             autoHideMenuBar: process.platform != 'darwin',
             webPreferences: {

diff --git a/packages/uikit/src/components/create/Words.tsx b/packages/uikit/src/components/create/Words.tsx
@@ -339,6 +339,12 @@ const Inputs = styled.div`
     @media (max-width: 768px) {
         grid-template-rows: repeat(24, minmax(0, 1fr));
     }
+
+    ${p =>
+        p.theme.displayType === 'full-width' &&
+        css`
+            grid-template-rows: repeat(8, minmax(0, 1fr));
+        `}
 `;
 
 const seeIfValidWord = (word: string) => {

diff --git a/packages/uikit/src/pages/import/Initialize.tsx b/packages/uikit/src/pages/import/Initialize.tsx
@@ -1,4 +1,4 @@
-import React, { FC, PropsWithChildren, useState } from 'react';
+import { FC, PropsWithChildren, useState } from 'react';
 import styled, { css } from 'styled-components';
 import { CenterContainer } from '../../components/Layout';
 import { H1 } from '../../components/Text';
@@ -17,6 +17,14 @@ const Block = styled.div<{ fullHeight: boolean }>`
     box-sizing: border-box;
     position: relative;
 
+    ${p =>
+        p.theme.displayType === 'full-width' &&
+        css`
+            height: auto;
+            min-height: unset;
+            position: static;
+        `}
+
     ${props =>
         props.fullHeight
             ? css`

diff --git a/packages/uikit/src/styles/globalStyle.ts b/packages/uikit/src/styles/globalStyle.ts
@@ -55,6 +55,8 @@ export const GlobalStyleCss = css`
 
     .win32 #body::-webkit-scrollbar,
     .linux #body::-webkit-scrollbar,
+    .win32 .full-size-wrapper::-webkit-scrollbar,
+    .linux .full-size-wrapper::-webkit-scrollbar,
     .win32 .notification-overlay::-webkit-scrollbar,
     .linux .notification-overlay::-webkit-scrollbar,
     .win32 .dialog-content::-webkit-scrollbar,