From 0ce1a1aa5cb747a5de739f94a271d7bc4f8e4182 Mon Sep 17 00:00:00 2001
From: Michael Gartner <mclicks@gmail.com>
Date: Tue, 3 Mar 2026 11:47:11 -0600
Subject: [PATCH 1/2] Refactor HomePersonalSettings component to streamline
 migration flow and improve UI responsiveness. Adjusted dialog structure and
 button actions for better user experience during relation migration. Removed
 unused imports from migrateRelations utility.

---
 .../settings/HomePersonalSettings.tsx         | 93 +++++++++----------
 apps/roam/src/utils/migrateRelations.ts       |  2 -
 2 files changed, 45 insertions(+), 50 deletions(-)

diff --git a/apps/roam/src/components/settings/HomePersonalSettings.tsx b/apps/roam/src/components/settings/HomePersonalSettings.tsx
index fe63908a8..1aeb640e7 100644
--- a/apps/roam/src/components/settings/HomePersonalSettings.tsx
+++ b/apps/roam/src/components/settings/HomePersonalSettings.tsx
@@ -293,13 +293,11 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
         }}
         style={{ width: "600px" }}
       >
-        {isOngoing ? (
-          <div className={Classes.DIALOG_BODY}>
+        <div className={Classes.DIALOG_BODY}>
+          {isOngoing ? (
             <p>Migrating relations, please wait</p>
-          </div>
-        ) : (
-          <>
-            <div className={Classes.DIALOG_BODY}>
+          ) : (
+            <>
               <p>
                 Activating the faster relations system will migrate all
                 previously created relations and newly created relations will
@@ -308,58 +306,57 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
                 deleted; however, they will not be accessible until you
                 reactivate the faster relation system.
               </p>
-              {activeRelationMigration === RelationMigrationDialog.activate ? (
-                <div className="flex justify-center">
-                  <div className="mt-1 inline-block align-middle">
-                    <Label className="!my-0 pr-2">Relations</Label>
-                  </div>
-                  <pre className="m-0 p-1.5 pt-2">{numExistingRelations}</pre>
+              {activeRelationMigration ===
+              RelationMigrationDialog.reactivate ? (
+                <div className="flex flex-col items-center">
+                  <Label className=" font-semibold">Relations</Label>
+                  <pre className="m-0 rounded border border-gray-300 bg-gray-50 p-2 text-center">
+                    {numExistingRelations}
+                  </pre>
                 </div>
-              ) : (
-                ""
-              )}
-            </div>
-            <div className={Classes.DIALOG_FOOTER}>
-              <div className={Classes.DIALOG_FOOTER_ACTIONS}>
+              ) : null}
+            </>
+          )}
+        </div>
+        {!isOngoing && (
+          <div className={Classes.DIALOG_FOOTER}>
+            <div className={Classes.DIALOG_FOOTER_ACTIONS}>
+              <Button
+                small
+                onClick={() => {
+                  setActiveRelationMigration(RelationMigrationDialog.none);
+                }}
+              >
+                Cancel
+              </Button>
+              {activeRelationMigration ===
+              RelationMigrationDialog.reactivate ? (
                 <Button
                   small
+                  intent={Intent.PRIMARY}
                   onClick={() => {
+                    setStoredRelations(true);
                     setActiveRelationMigration(RelationMigrationDialog.none);
                   }}
                 >
-                  Cancel
+                  Reactivate without Migration
                 </Button>
+              ) : null}
+              <Button
+                small
+                intent={Intent.PRIMARY}
+                onClick={() => {
+                  setIsOngoing(true);
+                  void startMigration();
+                }}
+              >
                 {activeRelationMigration ===
-                RelationMigrationDialog.reactivate ? (
-                  <Button
-                    small
-                    intent={Intent.PRIMARY}
-                    onClick={() => {
-                      setStoredRelations(true);
-                      setActiveRelationMigration(RelationMigrationDialog.none);
-                    }}
-                  >
-                    Reactivate without Migration
-                  </Button>
-                ) : (
-                  ""
-                )}
-                <Button
-                  small
-                  intent={Intent.PRIMARY}
-                  onClick={() => {
-                    setIsOngoing(true);
-                    void startMigration();
-                  }}
-                >
-                  {activeRelationMigration ===
-                  RelationMigrationDialog.reactivate
-                    ? "Migrate again and Reactivate"
-                    : "Activate and Migrate"}
-                </Button>
-              </div>
+                RelationMigrationDialog.reactivate
+                  ? "Migrate again and Reactivate"
+                  : "Activate and Migrate"}
+              </Button>
             </div>
-          </>
+          </div>
         )}
       </Dialog>
       <Dialog
diff --git a/apps/roam/src/utils/migrateRelations.ts b/apps/roam/src/utils/migrateRelations.ts
index 3f4ecb027..14f103671 100644
--- a/apps/roam/src/utils/migrateRelations.ts
+++ b/apps/roam/src/utils/migrateRelations.ts
@@ -2,8 +2,6 @@ import getRelationData from "./getRelationData";
 import getBlockProps from "./getBlockProps";
 import type { json } from "./getBlockProps";
 import setBlockProps from "./setBlockProps";
-import { getSetting, setSetting } from "./extensionSettings";
-import { USE_REIFIED_RELATIONS } from "~/data/userSettings";
 import internalError from "./internalError";
 import {
   createReifiedRelation,

From 08e2c7bd690bfb41841000cd5d1878227e3cfefb Mon Sep 17 00:00:00 2001
From: Michael Gartner <mclicks@gmail.com>
Date: Tue, 3 Mar 2026 11:52:48 -0600
Subject: [PATCH 2/2] format

---
 apps/roam/src/components/settings/HomePersonalSettings.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/roam/src/components/settings/HomePersonalSettings.tsx b/apps/roam/src/components/settings/HomePersonalSettings.tsx
index 1aeb640e7..9ef6df75d 100644
--- a/apps/roam/src/components/settings/HomePersonalSettings.tsx
+++ b/apps/roam/src/components/settings/HomePersonalSettings.tsx
@@ -309,7 +309,7 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
               {activeRelationMigration ===
               RelationMigrationDialog.reactivate ? (
                 <div className="flex flex-col items-center">
-                  <Label className=" font-semibold">Relations</Label>
+                  <Label className="font-semibold">Relations</Label>
                   <pre className="m-0 rounded border border-gray-300 bg-gray-50 p-2 text-center">
                     {numExistingRelations}
                   </pre>
@@ -350,8 +350,7 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
                   void startMigration();
                 }}
               >
-                {activeRelationMigration ===
-                RelationMigrationDialog.reactivate
+                {activeRelationMigration === RelationMigrationDialog.reactivate
                   ? "Migrate again and Reactivate"
                   : "Activate and Migrate"}
               </Button>