From 4b1075947a9650c69c055f320eb1a91e69ac4ac6 Mon Sep 17 00:00:00 2001
From: Artyom Savchenko <armisav@gmail.com>
Date: Tue, 25 Nov 2025 10:35:38 +0700
Subject: [PATCH 1/2] Fix billing (#10250)

Signed-off-by: Artem Savchenko <armisav@gmail.com>
---
 .../billing-resources/src/components/Settings.svelte   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/billing-resources/src/components/Settings.svelte b/plugins/billing-resources/src/components/Settings.svelte
index 620e9db1c7..e722be288e 100644
--- a/plugins/billing-resources/src/components/Settings.svelte
+++ b/plugins/billing-resources/src/components/Settings.svelte
@@ -71,7 +71,7 @@
     void (async (loc: Location): Promise<void> => {
       const key = loc.path[5]
       currentGroup = groups.find((g) => g.key === key) ?? groups[0]
-      currentGroupKey = currentGroup.key
+      currentGroupKey = currentGroup?.key
     })(loc)
   })
 
@@ -109,8 +109,10 @@
 
     <Separator name="billingSettings" index={0} color={'var(--theme-divider-color)'} />
 
-    <div class="hulyComponent-content__column content">
-      <Component is={currentGroup.component} />
-    </div>
+    {#if currentGroup != null}
+      <div class="hulyComponent-content__column content">
+        <Component is={currentGroup.component} />
+      </div>
+    {/if}
   </div>
 </div>

From ccec1ae5d6a1dc3cd3c8ade382fa3b36e47e69d5 Mon Sep 17 00:00:00 2001
From: Artyom Savchenko <armisav@gmail.com>
Date: Tue, 25 Nov 2025 12:08:50 +0700
Subject: [PATCH 2/2] Fix uptrace error e.dataset is undefined (#10251)

Signed-off-by: Artem Savchenko <armisav@gmail.com>
---
 .../src/components/extension/toolbar/toolbar.ts                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/text-editor-resources/src/components/extension/toolbar/toolbar.ts b/plugins/text-editor-resources/src/components/extension/toolbar/toolbar.ts
index 9405e844f8..cb7e1cc8e2 100644
--- a/plugins/text-editor-resources/src/components/extension/toolbar/toolbar.ts
+++ b/plugins/text-editor-resources/src/components/extension/toolbar/toolbar.ts
@@ -636,7 +636,7 @@ function resolveCursorPositionFromCoords (view: EditorView, coords: { left: numb
 
 function scanMarker (target: HTMLElement | null, field: string): [boolean, HTMLElement | null] {
   while (target != null) {
-    if (target.dataset[field] === 'true') {
+    if (target.dataset?.[field] === 'true') {
       return [true, target]
     }
     target = target.parentElement