From a8ec304f7420270ebcf05d0751860152c9eb913c Mon Sep 17 00:00:00 2001
From: Felicio Mununga <felicio@users.noreply.github.com>
Date: Mon, 15 May 2023 21:29:36 +0200
Subject: [PATCH] fix incorrectly resolved conflicts

---
 apps/web/src/app.tsx                       | 10 +++++-----
 apps/web/src/hooks/use-scroll-position.tsx |  2 +-
 apps/web/tsconfig.json                     | 10 ----------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/apps/web/src/app.tsx b/apps/web/src/app.tsx
index aa8b6f2f..3d430fdc 100644
--- a/apps/web/src/app.tsx
+++ b/apps/web/src/app.tsx
@@ -29,7 +29,7 @@ const updateProperty = (property: string, value: number) => {
 }
 
 function App() {
-  const [loading, setLoading] = useState(false)
+  const [loading /*, setLoading*/] = useState(false)
   const [showMembers, setShowMembers] = useState(false)
 
   // TODO: Use it to simulate loading
@@ -61,14 +61,14 @@ function App() {
   useResizeObserver<HTMLDivElement>({
     ref: topbarRef,
     onResize({ height }) {
-      updateProperty('--topbar-height', height)
+      updateProperty('--topbar-height', height!)
     },
   })
 
   useResizeObserver<HTMLDivElement>({
     ref: composerRef,
     onResize({ height }) {
-      updateProperty('--composer-height', height)
+      updateProperty('--composer-height', height!)
     },
   })
 
@@ -77,7 +77,7 @@ function App() {
   })
 
   useEffect(() => {
-    contentRef.current.scrollTop = contentRef.current.scrollHeight
+    contentRef.current!.scrollTop = contentRef.current!.scrollHeight
   }, [selectedChannel])
 
   return (
@@ -97,7 +97,7 @@ function App() {
         <div id="topbar" ref={topbarRef}>
           <Topbar
             blur={scrollPosition !== 'top'}
-            channel={selectedChannel}
+            channel={selectedChannel!}
             showMembers={showMembers}
             onMembersPress={() => setShowMembers(show => !show)}
             pinnedMessages={[
diff --git a/apps/web/src/hooks/use-scroll-position.tsx b/apps/web/src/hooks/use-scroll-position.tsx
index 395c0887..7d82e194 100644
--- a/apps/web/src/hooks/use-scroll-position.tsx
+++ b/apps/web/src/hooks/use-scroll-position.tsx
@@ -16,7 +16,7 @@ export function useScrollPosition(options: Options) {
   positionRef.current = position
 
   useEffect(() => {
-    const node = ref.current
+    const node = ref.current!
 
     const handleScroll = () => {
       if (!node) return
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
index 690a5f7a..ff4a8068 100644
--- a/apps/web/tsconfig.json
+++ b/apps/web/tsconfig.json
@@ -3,17 +3,7 @@
   "compilerOptions": {
     "target": "ESNext",
     "lib": ["dom", "dom.iterable", "esnext"],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "strict": false,
-    "forceConsistentCasingInFileNames": true,
-    "noEmit": true,
-    "incremental": true,
-    "esModuleInterop": true,
     "module": "esnext",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
     "jsx": "react-jsx"
   },
   "include": ["src"]