From 051da1edaf34195c0e941de138e8ec784a4bccb7 Mon Sep 17 00:00:00 2001
From: Miodec <jack@monkeytype.com>
Date: Sat, 28 Mar 2026 09:18:57 +0100
Subject: [PATCH 1/2] chore: bump tsgolint

---
 backend/package.json              |   2 +-
 frontend/package.json             |   2 +-
 package.json                      |   2 +-
 packages/contracts/package.json   |   2 +-
 packages/funbox/package.json      |   2 +-
 packages/release/package.json     |   2 +-
 packages/schemas/package.json     |   2 +-
 packages/tsup-config/package.json |   2 +-
 packages/util/package.json        |   2 +-
 pnpm-lock.yaml                    | 172 ++++++++++++++++++++----------
 10 files changed, 122 insertions(+), 68 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 18846ac2cfb5..69aa41970fde 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -81,7 +81,7 @@
     "concurrently": "8.2.2",
     "openapi3-ts": "2.0.2",
     "oxlint": "1.57.0",
-    "oxlint-tsgolint": "0.17.3",
+    "oxlint-tsgolint": "0.18.1",
     "readline-sync": "1.4.10",
     "supertest": "7.1.4",
     "testcontainers": "11.11.0",
diff --git a/frontend/package.json b/frontend/package.json
index f21c61bc9744..c7708e197781 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -107,7 +107,7 @@
     "magic-string": "0.30.17",
     "normalize.css": "8.0.1",
     "oxlint": "1.57.0",
-    "oxlint-tsgolint": "0.17.3",
+    "oxlint-tsgolint": "0.18.1",
     "postcss": "8.5.8",
     "sass": "1.70.0",
     "solid-devtools": "0.34.5",
diff --git a/package.json b/package.json
index 6d904664f6b4..97972f8961d8 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "only-allow": "1.2.1",
     "oxfmt": "0.42.0",
     "oxlint": "1.57.0",
-    "oxlint-tsgolint": "0.17.3",
+    "oxlint-tsgolint": "0.18.1",
     "prettier": "3.7.1",
     "turbo": "2.7.5",
     "vitest": "4.1.0",
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index e7d95e4eac01..2b0fc15dc638 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -30,7 +30,7 @@
     "@monkeytype/typescript-config": "workspace:*",
     "madge": "8.0.0",
     "oxlint": "1.57.0",
-    "oxlint-tsgolint": "0.17.3",
+    "oxlint-tsgolint": "0.18.1",
     "tsup": "8.4.0",
     "typescript": "6.0.2",
     "vitest": "4.1.0"
diff --git a/packages/funbox/package.json b/packages/funbox/package.json
index 94c8df162bf2..b83d33359745 100644
--- a/packages/funbox/package.json
+++ b/packages/funbox/package.json
@@ -26,7 +26,7 @@
     "@monkeytype/typescript-config": "workspace:*",
     "madge": "8.0.0",
     "oxlint": "1.57.0",
-    "oxlint-tsgolint": "0.17.3",
+    "oxlint-tsgolint": "0.18.1",
     "tsup": "8.4.0",
     "typescript": "6.0.2",
     "vitest": "4.1.0"
diff --git a/packages/release/package.json b/packages/release/package.json
index 0af5879cb9a9..607340d5cc00 100644
--- a/packages/release/package.json
+++ b/packages/release/package.json
@@ -21,6 +21,6 @@
   "devDependencies": {
     "nodemon": "3.1.14",
     "oxlint": "1.57.0",
-    "oxlint-tsgolint": "0.17.3"
+    "oxlint-tsgolint": "0.18.1"
   }
 }
diff --git a/packages/schemas/package.json b/packages/schemas/package.json
index 92558b389261..0f1aa91928a7 100644
--- a/packages/schemas/package.json
+++ b/packages/schemas/package.json
@@ -27,7 +27,7 @@
     "@monkeytype/typescript-config": "workspace:*",
     "madge": "8.0.0",
     "oxlint": "1.57.0",
-    "oxlint-tsgolint": "0.17.3",
+    "oxlint-tsgolint": "0.18.1",
     "tsup": "8.4.0",
     "typescript": "6.0.2",
     "vitest": "4.1.0"
diff --git a/packages/tsup-config/package.json b/packages/tsup-config/package.json
index 6f5145109ebd..1566e37f049a 100644
--- a/packages/tsup-config/package.json
+++ b/packages/tsup-config/package.json
@@ -18,7 +18,7 @@
   "devDependencies": {
     "@monkeytype/typescript-config": "workspace:*",
     "oxlint": "1.57.0",
-    "oxlint-tsgolint": "0.17.3",
+    "oxlint-tsgolint": "0.18.1",
     "typescript": "6.0.2"
   },
   "peerDependencies": {
diff --git a/packages/util/package.json b/packages/util/package.json
index 3762c03e65a9..ac955125d710 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -21,7 +21,7 @@
     "@monkeytype/typescript-config": "workspace:*",
     "madge": "8.0.0",
     "oxlint": "1.57.0",
-    "oxlint-tsgolint": "0.17.3",
+    "oxlint-tsgolint": "0.18.1",
     "tsup": "8.4.0",
     "typescript": "6.0.2",
     "vitest": "4.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 50270802713f..cd659ee9049b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -46,10 +46,10 @@ importers:
         version: 0.42.0
       oxlint:
         specifier: 1.57.0
-        version: 1.57.0(oxlint-tsgolint@0.17.3)
+        version: 1.57.0(oxlint-tsgolint@0.18.1)
       oxlint-tsgolint:
-        specifier: 0.17.3
-        version: 0.17.3
+        specifier: 0.18.1
+        version: 0.18.1
       prettier:
         specifier: 3.7.1
         version: 3.7.1
@@ -242,10 +242,10 @@ importers:
         version: 2.0.2
       oxlint:
         specifier: 1.57.0
-        version: 1.57.0(oxlint-tsgolint@0.17.3)
+        version: 1.57.0(oxlint-tsgolint@0.18.1)
       oxlint-tsgolint:
-        specifier: 0.17.3
-        version: 0.17.3
+        specifier: 0.18.1
+        version: 0.18.1
       readline-sync:
         specifier: 1.4.10
         version: 1.4.10
@@ -513,10 +513,10 @@ importers:
         version: 8.0.1
       oxlint:
         specifier: 1.57.0
-        version: 1.57.0(oxlint-tsgolint@0.17.3)
+        version: 1.57.0(oxlint-tsgolint@0.18.1)
       oxlint-tsgolint:
-        specifier: 0.17.3
-        version: 0.17.3
+        specifier: 0.18.1
+        version: 0.18.1
       postcss:
         specifier: 8.5.8
         version: 8.5.8
@@ -650,10 +650,10 @@ importers:
         version: 8.0.0(typescript@6.0.2)
       oxlint:
         specifier: 1.57.0
-        version: 1.57.0(oxlint-tsgolint@0.17.3)
+        version: 1.57.0(oxlint-tsgolint@0.18.1)
       oxlint-tsgolint:
-        specifier: 0.17.3
-        version: 0.17.3
+        specifier: 0.18.1
+        version: 0.18.1
       tsup:
         specifier: 8.4.0
         version: 8.4.0(jiti@2.6.1)(postcss@8.5.8)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.2)
@@ -662,7 +662,7 @@ importers:
         version: 6.0.2
       vitest:
         specifier: 4.1.0
-        version: 4.1.0(@opentelemetry/api@1.8.0)(@types/node@24.9.1)(happy-dom@20.0.10)(jsdom@27.4.0)(vite@8.0.1(@types/node@24.9.1)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))
+        version: 4.1.0(@types/node@24.9.1)(happy-dom@20.0.10)(jsdom@27.4.0)(vite@8.0.1(@types/node@24.9.1)(esbuild@0.25.11)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))
 
   packages/funbox:
     dependencies:
@@ -684,10 +684,10 @@ importers:
         version: 8.0.0(typescript@6.0.2)
       oxlint:
         specifier: 1.57.0
-        version: 1.57.0(oxlint-tsgolint@0.17.3)
+        version: 1.57.0(oxlint-tsgolint@0.18.1)
       oxlint-tsgolint:
-        specifier: 0.17.3
-        version: 0.17.3
+        specifier: 0.18.1
+        version: 0.18.1
       tsup:
         specifier: 8.4.0
         version: 8.4.0(jiti@2.6.1)(postcss@8.5.8)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.2)
@@ -721,10 +721,10 @@ importers:
         version: 3.1.14
       oxlint:
         specifier: 1.57.0
-        version: 1.57.0(oxlint-tsgolint@0.17.3)
+        version: 1.57.0(oxlint-tsgolint@0.18.1)
       oxlint-tsgolint:
-        specifier: 0.17.3
-        version: 0.17.3
+        specifier: 0.18.1
+        version: 0.18.1
 
   packages/schemas:
     dependencies:
@@ -743,10 +743,10 @@ importers:
         version: 8.0.0(typescript@6.0.2)
       oxlint:
         specifier: 1.57.0
-        version: 1.57.0(oxlint-tsgolint@0.17.3)
+        version: 1.57.0(oxlint-tsgolint@0.18.1)
       oxlint-tsgolint:
-        specifier: 0.17.3
-        version: 0.17.3
+        specifier: 0.18.1
+        version: 0.18.1
       tsup:
         specifier: 8.4.0
         version: 8.4.0(jiti@2.6.1)(postcss@8.5.8)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.2)
@@ -768,10 +768,10 @@ importers:
         version: link:../typescript-config
       oxlint:
         specifier: 1.57.0
-        version: 1.57.0(oxlint-tsgolint@0.17.3)
+        version: 1.57.0(oxlint-tsgolint@0.18.1)
       oxlint-tsgolint:
-        specifier: 0.17.3
-        version: 0.17.3
+        specifier: 0.18.1
+        version: 0.18.1
       typescript:
         specifier: 6.0.2
         version: 6.0.2
@@ -791,10 +791,10 @@ importers:
         version: 8.0.0(typescript@6.0.2)
       oxlint:
         specifier: 1.57.0
-        version: 1.57.0(oxlint-tsgolint@0.17.3)
+        version: 1.57.0(oxlint-tsgolint@0.18.1)
       oxlint-tsgolint:
-        specifier: 0.17.3
-        version: 0.17.3
+        specifier: 0.18.1
+        version: 0.18.1
       tsup:
         specifier: 8.4.0
         version: 8.4.0(jiti@2.6.1)(postcss@8.5.8)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.2)
@@ -2758,33 +2758,33 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@oxlint-tsgolint/darwin-arm64@0.17.3':
-    resolution: {integrity: sha512-5aDl4mxXWs+Bj02pNrX6YY6v9KMZjLIytXoqolLEo0dfBNVeZUonZgJAa/w0aUmijwIRrBhxEzb42oLuUtfkGw==}
+  '@oxlint-tsgolint/darwin-arm64@0.18.1':
+    resolution: {integrity: sha512-CxSd15ZwHn70UJFTXVvy76bZ9zwI097cVyjvUFmYRJwvkQF3VnrTf2oe1gomUacErksvtqLgn9OKvZhLMYwvog==}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxlint-tsgolint/darwin-x64@0.17.3':
-    resolution: {integrity: sha512-gPBy4DS5ueCgXzko20XsNZzDe/Cxde056B+QuPLGvz05CGEAtmRfpImwnyY2lAXXjPL+SmnC/OYexu8zI12yHQ==}
+  '@oxlint-tsgolint/darwin-x64@0.18.1':
+    resolution: {integrity: sha512-LE7VW/T/VcKhl3Z1ev5BusrxdlQ3DWweSeOB+qpBeur2h8+vCWq+M7tCO29C7lveBDfx1+rNwj4aiUVlA+Qs+g==}
     cpu: [x64]
     os: [darwin]
 
-  '@oxlint-tsgolint/linux-arm64@0.17.3':
-    resolution: {integrity: sha512-+pkunvCfB6pB0G9qHVVXUao3nqzXQPo4O3DReIi+5nGa+bOU3J3Srgy+Zb8VyOL+WDsSMJ+U7+r09cKHWhz3hg==}
+  '@oxlint-tsgolint/linux-arm64@0.18.1':
+    resolution: {integrity: sha512-2AG8YIXVJJbnM0rcsJmzzWOjZXBu5REwowgUpbHZueF7OYM3wR7Xu8pXEpAojEHAtYYZ3X4rpPoetomkJx7kCw==}
     cpu: [arm64]
     os: [linux]
 
-  '@oxlint-tsgolint/linux-x64@0.17.3':
-    resolution: {integrity: sha512-/kW5oXtBThu4FjmgIBthdmMjWLzT3M1TEDQhxDu7hQU5xDeTd60CDXb2SSwKCbue9xu7MbiFoJu83LN0Z/d38g==}
+  '@oxlint-tsgolint/linux-x64@0.18.1':
+    resolution: {integrity: sha512-f8vDYPEdiwpA2JaDEkadTXfuqIgweQ8zcL4SX75EN2kkW2oAynjN7cd8m86uXDgB0JrcyOywbRtwnXdiIzXn2A==}
     cpu: [x64]
     os: [linux]
 
-  '@oxlint-tsgolint/win32-arm64@0.17.3':
-    resolution: {integrity: sha512-NMELRvbz4Ed4dxg8WiqZxtu3k4OJEp2B9KInZW+BMfqEqbwZdEJY83tbqz2hD1EjKO2akrqBQ0GpRUJEkd8kKw==}
+  '@oxlint-tsgolint/win32-arm64@0.18.1':
+    resolution: {integrity: sha512-fBdML05KMDAL9ebWeoHIzkyI86Eq6r9YH5UDRuXJ9vAIo1EnKo0ti7hLUxNdc2dy2FF/T4k98p5wkkXvLyXqfA==}
     cpu: [arm64]
     os: [win32]
 
-  '@oxlint-tsgolint/win32-x64@0.17.3':
-    resolution: {integrity: sha512-+pJ7r8J3SLPws5uoidVplZc8R/lpKyKPE6LoPGv9BME00Y1VjT6jWGx/dtUN8PWvcu3iTC6k+8u3ojFSJNmWTg==}
+  '@oxlint-tsgolint/win32-x64@0.18.1':
+    resolution: {integrity: sha512-cYZMhNrsq9ZZ3OUWHyawqiS+c8HfieYG0zuZP2LbEuWWPfdZM/22iAlo608J+27G1s9RXQhvgX6VekwWbXbD7A==}
     cpu: [x64]
     os: [win32]
 
@@ -8344,8 +8344,8 @@ packages:
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
-  oxlint-tsgolint@0.17.3:
-    resolution: {integrity: sha512-1eh4bcpOMw0e7+YYVxmhFc2mo/V6hJ2+zfukqf+GprvVn3y94b69M/xNrYLmx5A+VdYe0i/bJ2xOs6Hp/jRmRA==}
+  oxlint-tsgolint@0.18.1:
+    resolution: {integrity: sha512-Hgb0wMfuXBYL0ddY+1hAG8IIfC40ADwPnBuUaC6ENAuCtTF4dHwsy7mCYtQ2e7LoGvfoSJRY0+kqQRiembJ/jQ==}
     hasBin: true
 
   oxlint@1.57.0:
@@ -12003,7 +12003,7 @@ snapshots:
 
   '@eslint/eslintrc@3.3.3':
     dependencies:
-      ajv: 6.14.0
+      ajv: 6.12.6
       debug: 4.4.3(supports-color@5.5.0)
       espree: 10.4.0
       globals: 14.0.0
@@ -13067,22 +13067,22 @@ snapshots:
   '@oxfmt/binding-win32-x64-msvc@0.42.0':
     optional: true
 
-  '@oxlint-tsgolint/darwin-arm64@0.17.3':
+  '@oxlint-tsgolint/darwin-arm64@0.18.1':
     optional: true
 
-  '@oxlint-tsgolint/darwin-x64@0.17.3':
+  '@oxlint-tsgolint/darwin-x64@0.18.1':
     optional: true
 
-  '@oxlint-tsgolint/linux-arm64@0.17.3':
+  '@oxlint-tsgolint/linux-arm64@0.18.1':
     optional: true
 
-  '@oxlint-tsgolint/linux-x64@0.17.3':
+  '@oxlint-tsgolint/linux-x64@0.18.1':
     optional: true
 
-  '@oxlint-tsgolint/win32-arm64@0.17.3':
+  '@oxlint-tsgolint/win32-arm64@0.18.1':
     optional: true
 
-  '@oxlint-tsgolint/win32-x64@0.17.3':
+  '@oxlint-tsgolint/win32-x64@0.18.1':
     optional: true
 
   '@oxlint/binding-android-arm-eabi@1.57.0':
@@ -14725,6 +14725,14 @@ snapshots:
     optionalDependencies:
       vite: 8.0.1(@types/node@20.5.1)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2)
 
+  '@vitest/mocker@4.1.0(vite@8.0.1(@types/node@24.9.1)(esbuild@0.25.11)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))':
+    dependencies:
+      '@vitest/spy': 4.1.0
+      estree-walker: 3.0.3
+      magic-string: 0.30.21
+    optionalDependencies:
+      vite: 8.0.1(@types/node@24.9.1)(esbuild@0.25.11)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2)
+
   '@vitest/mocker@4.1.0(vite@8.0.1(@types/node@24.9.1)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.70.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))':
     dependencies:
       '@vitest/spy': 4.1.0
@@ -19497,16 +19505,16 @@ snapshots:
       '@oxfmt/binding-win32-ia32-msvc': 0.42.0
       '@oxfmt/binding-win32-x64-msvc': 0.42.0
 
-  oxlint-tsgolint@0.17.3:
+  oxlint-tsgolint@0.18.1:
     optionalDependencies:
-      '@oxlint-tsgolint/darwin-arm64': 0.17.3
-      '@oxlint-tsgolint/darwin-x64': 0.17.3
-      '@oxlint-tsgolint/linux-arm64': 0.17.3
-      '@oxlint-tsgolint/linux-x64': 0.17.3
-      '@oxlint-tsgolint/win32-arm64': 0.17.3
-      '@oxlint-tsgolint/win32-x64': 0.17.3
-
-  oxlint@1.57.0(oxlint-tsgolint@0.17.3):
+      '@oxlint-tsgolint/darwin-arm64': 0.18.1
+      '@oxlint-tsgolint/darwin-x64': 0.18.1
+      '@oxlint-tsgolint/linux-arm64': 0.18.1
+      '@oxlint-tsgolint/linux-x64': 0.18.1
+      '@oxlint-tsgolint/win32-arm64': 0.18.1
+      '@oxlint-tsgolint/win32-x64': 0.18.1
+
+  oxlint@1.57.0(oxlint-tsgolint@0.18.1):
     optionalDependencies:
       '@oxlint/binding-android-arm-eabi': 1.57.0
       '@oxlint/binding-android-arm64': 1.57.0
@@ -19527,7 +19535,7 @@ snapshots:
       '@oxlint/binding-win32-arm64-msvc': 1.57.0
       '@oxlint/binding-win32-ia32-msvc': 1.57.0
       '@oxlint/binding-win32-x64-msvc': 1.57.0
-      oxlint-tsgolint: 0.17.3
+      oxlint-tsgolint: 0.18.1
 
   p-defer@3.0.0: {}
 
@@ -21875,6 +21883,23 @@ snapshots:
       tsx: 4.21.0
       yaml: 2.8.2
 
+  vite@8.0.1(@types/node@24.9.1)(esbuild@0.25.11)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2):
+    dependencies:
+      lightningcss: 1.32.0
+      picomatch: 4.0.3
+      postcss: 8.5.8
+      rolldown: 1.0.0-rc.10
+      tinyglobby: 0.2.15
+    optionalDependencies:
+      '@types/node': 24.9.1
+      esbuild: 0.25.11
+      fsevents: 2.3.3
+      jiti: 2.6.1
+      sass: 1.98.0
+      terser: 5.46.1
+      tsx: 4.21.0
+      yaml: 2.8.2
+
   vite@8.0.1(@types/node@24.9.1)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.70.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2):
     dependencies:
       lightningcss: 1.32.0
@@ -22006,6 +22031,35 @@ snapshots:
     transitivePeerDependencies:
       - msw
 
+  vitest@4.1.0(@types/node@24.9.1)(happy-dom@20.0.10)(jsdom@27.4.0)(vite@8.0.1(@types/node@24.9.1)(esbuild@0.25.11)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2)):
+    dependencies:
+      '@vitest/expect': 4.1.0
+      '@vitest/mocker': 4.1.0(vite@8.0.1(@types/node@24.9.1)(esbuild@0.25.11)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))
+      '@vitest/pretty-format': 4.1.0
+      '@vitest/runner': 4.1.0
+      '@vitest/snapshot': 4.1.0
+      '@vitest/spy': 4.1.0
+      '@vitest/utils': 4.1.0
+      es-module-lexer: 2.0.0
+      expect-type: 1.3.0
+      magic-string: 0.30.21
+      obug: 2.1.1
+      pathe: 2.0.3
+      picomatch: 4.0.3
+      std-env: 4.0.0
+      tinybench: 2.9.0
+      tinyexec: 1.0.2
+      tinyglobby: 0.2.15
+      tinyrainbow: 3.0.3
+      vite: 8.0.1(@types/node@24.9.1)(esbuild@0.25.11)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2)
+      why-is-node-running: 2.3.0
+    optionalDependencies:
+      '@types/node': 24.9.1
+      happy-dom: 20.0.10
+      jsdom: 27.4.0
+    transitivePeerDependencies:
+      - msw
+
   vitest@4.1.0(@types/node@24.9.1)(happy-dom@20.0.10)(jsdom@27.4.0)(vite@8.0.1(@types/node@24.9.1)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.70.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2)):
     dependencies:
       '@vitest/expect': 4.1.0

From 1e305aca4ecb5eaf20297f1786d63666df82d048 Mon Sep 17 00:00:00 2001
From: Seif Soliman <byseif21@gmail.com>
Date: Sat, 28 Mar 2026 11:46:21 +0200
Subject: [PATCH 2/2] fix: resolve global auth state reactivity and quote
 search rtl layouts (@byseif21) (#7735)

---
 .../ts/components/modals/QuoteSearchModal.tsx | 25 +++++++++++--------
 frontend/src/ts/firebase.ts                   |  3 ++-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/frontend/src/ts/components/modals/QuoteSearchModal.tsx b/frontend/src/ts/components/modals/QuoteSearchModal.tsx
index 497792ed0165..5cbd83f36890 100644
--- a/frontend/src/ts/components/modals/QuoteSearchModal.tsx
+++ b/frontend/src/ts/components/modals/QuoteSearchModal.tsx
@@ -15,7 +15,7 @@ import { Config } from "../../config/store";
 import { isCaptchaAvailable } from "../../controllers/captcha-controller";
 import QuotesController, { Quote } from "../../controllers/quotes-controller";
 import * as DB from "../../db";
-import { isAuthenticated } from "../../firebase";
+import { isLoggedIn } from "../../states/core";
 import { hideLoaderBar, showLoaderBar } from "../../states/loader-bar";
 import {
   hideModalAndClearChain,
@@ -100,12 +100,12 @@ function getLengthDesc(quote: Quote): string {
 function Item(props: {
   quote: Quote;
   matchedTerms: string[];
-  dataBalloonDirection: string;
+  isRtl: boolean;
   onSelect: () => void;
   onReport: () => void;
   onToggleFavorite: () => Promise<boolean>;
 }): JSXElement {
-  const loggedOut = (): boolean => !isAuthenticated();
+  const loggedOut = (): boolean => !isLoggedIn();
   const [isFav, setIsFav] = createSignal(
     // oxlint-disable-next-line solid/reactivity -- intentionally reading once as initial value
     !loggedOut() && QuotesController.isQuoteFavorite(props.quote),
@@ -169,7 +169,7 @@ function Item(props: {
                 }}
                 balloon={{
                   text: "Report quote",
-                  position: props.dataBalloonDirection as "left" | "right",
+                  position: props.isRtl ? "right" : "left",
                 }}
               />
               <Button
@@ -184,7 +184,7 @@ function Item(props: {
                 }}
                 balloon={{
                   text: "Favorite quote",
-                  position: props.dataBalloonDirection as "left" | "right",
+                  position: props.isRtl ? "right" : "left",
                 }}
               />
             </div>
@@ -213,7 +213,7 @@ export function QuoteSearchModal(): JSXElement {
     quotes: Quote[];
     matchedTerms: string[];
   }>({ quotes: [], matchedTerms: [] });
-  const [dataBalloonDirection, setDataBalloonDirection] = createSignal("left");
+  const [isRtl, setIsRtl] = createSignal(false);
   const [favVersion, setFavVersion] = createSignal(0);
 
   const debouncedSearch = debounce(250, (text: string) => {
@@ -374,7 +374,7 @@ export function QuoteSearchModal(): JSXElement {
 
   const handleAfterShow = async (): Promise<void> => {
     const quotesLanguage = await getLanguage(Config.language);
-    setDataBalloonDirection(quotesLanguage?.rightToLeft ? "right" : "left");
+    setIsRtl(quotesLanguage?.rightToLeft ?? false);
     const { quotes: fetchedQuotes } = await QuotesController.getQuotes(
       Config.language,
     );
@@ -455,7 +455,7 @@ export function QuoteSearchModal(): JSXElement {
         <div class="flex flex-col justify-between gap-2 sm:flex-row">
           <div class="text-2xl text-sub">Quote search</div>
           <div class="grid gap-2">
-            <Show when={isAuthenticated()}>
+            <Show when={isLoggedIn()}>
               <Button
                 fa={{ icon: "fa-plus" }}
                 text="Submit a quote"
@@ -509,7 +509,7 @@ export function QuoteSearchModal(): JSXElement {
               }}
             />
           </div>
-          <Show when={isAuthenticated()}>
+          <Show when={isLoggedIn()}>
             <Button
               variant="button"
               fa={{ icon: "fa-heart", fixedWidth: true }}
@@ -518,13 +518,16 @@ export function QuoteSearchModal(): JSXElement {
             />
           </Show>
         </div>
-        <div class="grid content-baseline gap-2 overflow-y-auto" dir="auto">
+        <div
+          class="grid content-baseline gap-2 overflow-y-auto"
+          dir={isRtl() ? "rtl" : undefined}
+        >
           <For each={pageQuotes()}>
             {(quote) => (
               <Item
                 quote={quote}
                 matchedTerms={searchResults().matchedTerms}
-                dataBalloonDirection={dataBalloonDirection()}
+                isRtl={isRtl()}
                 onSelect={() => applyQuote(quote.id)}
                 onReport={() => showQuoteReportModal(quote.id)}
                 // oxlint-disable-next-line solid/reactivity, typescript-eslint/promise-function-async -- fire-and-forget, no reactive tracking needed
diff --git a/frontend/src/ts/firebase.ts b/frontend/src/ts/firebase.ts
index 3a45a7244ec2..2c030b7ea7b6 100644
--- a/frontend/src/ts/firebase.ts
+++ b/frontend/src/ts/firebase.ts
@@ -69,8 +69,8 @@ export async function init(callback: ReadyCallback): Promise<void> {
 
     onAuthStateChanged(Auth, async (user) => {
       if (!ignoreAuthCallback) {
-        await callback(true, user);
         setUserId(user?.uid ?? null);
+        await callback(true, user);
       }
     });
   } catch (e) {
@@ -159,6 +159,7 @@ export async function signInWithPopup(
     googleSignUpEvent.dispatch({ signedInUser, isNewUser: true });
   } else {
     ignoreAuthCallback = false;
+    setUserId(signedInUser.user.uid);
     await readyCallback?.(true, signedInUser.user);
   }
 }