From 5040c061e34c3da3b87982f546d9e0fec159308c Mon Sep 17 00:00:00 2001
From: atticusofsparta <atticusofsparta@protonmail.com>
Date: Thu, 26 Jun 2025 11:05:14 -0600
Subject: [PATCH 01/13] fix(hyperbeam): add hyperbeam url to dev settings

---
 .../tables/UndernamesSubtable.tsx             |   3 +-
 .../data-display/tables/UndernamesTable.tsx   |   3 +-
 src/components/devtools/NetworkSettings.tsx   | 121 ++++++++++++++++++
 .../forms/DomainSettings/DomainSettings.tsx   |  11 +-
 .../NameTokenSelector/NameTokenSelector.tsx   |  15 +--
 .../PrimaryNameModal/PrimaryNameModal.tsx     |   2 +
 .../EditUndernameModal/EditUndernameModal.tsx |   5 +-
 .../ReassignNameModal/ReassignNameModal.tsx   |   1 +
 .../ReturnNameModal/ReturnNameModal.tsx       |   1 +
 .../UpgradeDomainModal/UpgradeDomainModal.tsx |   1 +
 .../UpgradeDomainsModal.tsx                   |   1 +
 src/components/pages/Register/Checkout.tsx    |   1 +
 src/components/pages/Register/Register.tsx    |   8 +-
 .../pages/Transaction/TransactionReview.tsx   |   1 +
 src/hooks/useDomainInfo.tsx                   |   5 +-
 src/state/actions/dispatchANTInteraction.ts   |   8 ++
 src/state/actions/dispatchArIOInteraction.ts  |   7 +-
 src/utils/constants.ts                        |   4 +
 src/utils/network.ts                          |  10 +-
 19 files changed, 191 insertions(+), 17 deletions(-)

diff --git a/src/components/data-display/tables/UndernamesSubtable.tsx b/src/components/data-display/tables/UndernamesSubtable.tsx
index 671a61883..c732bfdaa 100644
--- a/src/components/data-display/tables/UndernamesSubtable.tsx
+++ b/src/components/data-display/tables/UndernamesSubtable.tsx
@@ -56,7 +56,7 @@ const UndernamesSubtable = ({
   antId: string;
   state?: AoANTState | null;
 }) => {
-  const [{ arioProcessId, antAoClient }] = useGlobalState();
+  const [{ arioProcessId, antAoClient, aoNetwork }] = useGlobalState();
   const [{ wallet, walletAddress }] = useWalletState();
   const isOwner = walletAddress
     ? state?.Owner === walletAddress.toString()
@@ -295,6 +295,7 @@ const UndernamesSubtable = ({
               dispatchTransactionState,
               dispatchArNSState,
               ao: antAoClient,
+              aoNetwork,
             }).then(() => {
               eventEmitter.emit('success', {
                 message: (
diff --git a/src/components/data-display/tables/UndernamesTable.tsx b/src/components/data-display/tables/UndernamesTable.tsx
index 418aba444..453729b4d 100644
--- a/src/components/data-display/tables/UndernamesTable.tsx
+++ b/src/components/data-display/tables/UndernamesTable.tsx
@@ -99,7 +99,7 @@ const UndernamesTable = ({
   refresh?: () => void;
 }) => {
   const [searchParams, setSearchParams] = useSearchParams();
-  const [{ arioProcessId, antAoClient }] = useGlobalState();
+  const [{ arioProcessId, antAoClient, aoNetwork }] = useGlobalState();
   const [{ wallet, walletAddress }] = useWalletState();
   const isOwner = walletAddress
     ? state?.Owner === walletAddress.toString()
@@ -153,6 +153,7 @@ const UndernamesTable = ({
         dispatchTransactionState,
         dispatchArNSState,
         ao: antAoClient,
+        aoNetwork,
       });
       eventEmitter.emit('success', {
         name: 'Manage Undernames',
diff --git a/src/components/devtools/NetworkSettings.tsx b/src/components/devtools/NetworkSettings.tsx
index e612adf95..cef817807 100644
--- a/src/components/devtools/NetworkSettings.tsx
+++ b/src/components/devtools/NetworkSettings.tsx
@@ -18,6 +18,7 @@ import { Collapse, Input, Space } from 'antd';
 import { List } from 'lucide-react';
 import { useEffect, useState } from 'react';
 
+import Switch from '../inputs/Switch';
 import ArweaveID, { ArweaveIdTypes } from '../layout/ArweaveID/ArweaveID';
 import SelectGatewayModal from './SelectGatewayModal/SelectGatewayModal';
 import './styles.css';
@@ -57,6 +58,14 @@ function NetworkSettings() {
   const [validTurboPaymentUrl, setValidTurboPaymentUrl] =
     useState<boolean>(true);
 
+  const [newHyperbeamUrl, setNewHyperbeamUrl] = useState<string>(
+    aoNetwork.HYPERBEAM.URL,
+  );
+  const [validHyperbeamUrl, setValidHyperbeamUrl] = useState<boolean>(true);
+  const [hyperbeamEnabled, setHyperbeamEnabled] = useState<boolean>(
+    aoNetwork.HYPERBEAM.ENABLED,
+  );
+
   function reset() {
     // gateway
     setNewGateway(NETWORK_DEFAULTS.ARWEAVE.HOST);
@@ -78,6 +87,14 @@ function NetworkSettings() {
     setNewTurboPaymentUrl(NETWORK_DEFAULTS.TURBO.PAYMENT_URL);
     setValidTurboPaymentUrl(true);
     updateTurboNetwork(NETWORK_DEFAULTS.TURBO);
+    // hyperbeam network
+    setNewHyperbeamUrl(NETWORK_DEFAULTS.AO.HYPERBEAM.URL);
+    setValidHyperbeamUrl(true);
+    setHyperbeamEnabled(NETWORK_DEFAULTS.AO.HYPERBEAM.ENABLED);
+    updateHyperbeamAoNetwork({
+      URL: NETWORK_DEFAULTS.AO.HYPERBEAM.URL,
+      ENABLED: NETWORK_DEFAULTS.AO.HYPERBEAM.ENABLED,
+    });
   }
 
   useEffect(() => {
@@ -94,6 +111,12 @@ function NetworkSettings() {
     setValidSuAddress(true);
   }, [aoNetwork.ARIO]);
 
+  useEffect(() => {
+    setNewHyperbeamUrl(aoNetwork.HYPERBEAM.URL);
+    setValidHyperbeamUrl(true);
+    setHyperbeamEnabled(aoNetwork.HYPERBEAM.ENABLED);
+  }, [aoNetwork.HYPERBEAM]);
+
   async function updateGateway(gate: string) {
     try {
       if (!isValidGateway(gate)) {
@@ -196,6 +219,24 @@ function NetworkSettings() {
     });
   }
 
+  function updateHyperbeamAoNetwork(config: {
+    URL?: string;
+    ENABLED?: boolean;
+  }) {
+    try {
+      const newConfig = {
+        ...aoNetwork,
+        ...{ HYPERBEAM: { ...aoNetwork.HYPERBEAM, ...config } },
+      };
+      dispatchGlobalState({
+        type: 'setAONetwork',
+        payload: newConfig,
+      });
+    } catch (error) {
+      eventEmitter.emit('error', error);
+    }
+  }
+
   return (
     <div className="flex" style={{ width: '100%' }}>
       <Space direction="vertical" style={{ width: '100%' }}>
@@ -565,6 +606,86 @@ function NetworkSettings() {
                   </div>
                 }
               />
+              <span className="flex w-fit  whitespace-nowrap items-center bg-primary-thin rounded-t-md px-4 py-1 border-x-2 border-t-2 border-primary text-md text-primary font-semibold mt-2 gap-4 justify-center">
+                Hyperbeam URL:{' '}
+                <span className="text-white pl-2 flex">
+                  {aoNetwork.HYPERBEAM.URL}
+                </span>
+                <span className="text-white pl-2">
+                  ({aoNetwork.HYPERBEAM.ENABLED ? 'Enabled' : 'Disabled'})
+                </span>
+                <div className="flex flex-row items-center gap-2 mt-2 bg-dark-grey p-2 rounded-md">
+                  <span className="text-white font-semibold">
+                    Enable Hyperbeam:
+                  </span>
+                  <Switch
+                    checked={hyperbeamEnabled}
+                    onChange={(checked) => {
+                      setHyperbeamEnabled(checked);
+                      updateHyperbeamAoNetwork({ ENABLED: checked });
+                    }}
+                  />
+                  <button
+                    className="bg-primary-thin text-white h-full flex w-fit p-1 rounded-sm text-xs"
+                    onClick={() => {
+                      setHyperbeamEnabled(
+                        NETWORK_DEFAULTS.AO.HYPERBEAM.ENABLED,
+                      );
+                      updateHyperbeamAoNetwork({
+                        ENABLED: NETWORK_DEFAULTS.AO.HYPERBEAM.ENABLED,
+                      });
+                    }}
+                  >
+                    reset
+                  </button>
+                </div>
+              </span>
+
+              <Input
+                className="bg-background justify-center items-center"
+                placeholder="Enter custom Hyperbeam URL"
+                value={newHyperbeamUrl}
+                onChange={(e) => {
+                  setValidHyperbeamUrl(isValidURL(e.target.value.trim()));
+                  setNewHyperbeamUrl(e.target.value.trim());
+                }}
+                onClear={() => setNewHyperbeamUrl('')}
+                onPressEnter={(e) =>
+                  updateHyperbeamAoNetwork({
+                    URL: e.currentTarget.value.trim(),
+                  })
+                }
+                variant="outlined"
+                status={validHyperbeamUrl ? '' : 'error'}
+                addonAfter={
+                  <div className="flex flex-row" style={{ gap: '5px' }}>
+                    <button
+                      disabled={!validHyperbeamUrl}
+                      className="bg-primary text-black h-full flex w-fit p-1 rounded-sm text-xs"
+                      onClick={() =>
+                        updateHyperbeamAoNetwork({
+                          URL: newHyperbeamUrl.trim(),
+                        })
+                      }
+                    >
+                      Set Hyperbeam URL
+                    </button>
+                    <button
+                      className="bg-primary-thin text-white h-full flex w-fit p-1 rounded-sm text-xs"
+                      onClick={() => {
+                        setNewHyperbeamUrl(NETWORK_DEFAULTS.AO.HYPERBEAM.URL);
+                        setValidHyperbeamUrl(true);
+                        updateHyperbeamAoNetwork({
+                          URL: NETWORK_DEFAULTS.AO.HYPERBEAM.URL,
+                        });
+                      }}
+                    >
+                      reset
+                    </button>
+                  </div>
+                }
+              />
+
               <div className="flex flex-row p-2 justify-end items-center">
                 <button
                   className="p-2 text-white border-2 border-black hover:bg-primary hover:text-black bg-primary-thin rounded-md font-bold"
diff --git a/src/components/forms/DomainSettings/DomainSettings.tsx b/src/components/forms/DomainSettings/DomainSettings.tsx
index 541c2d354..c32b7fc93 100644
--- a/src/components/forms/DomainSettings/DomainSettings.tsx
+++ b/src/components/forms/DomainSettings/DomainSettings.tsx
@@ -78,7 +78,7 @@ function DomainSettings({
   const queryClient = useQueryClient();
   const navigate = useNavigate();
 
-  const [{ arioProcessId, antAoClient }] = useGlobalState();
+  const [{ arioProcessId, antAoClient, aoNetwork }] = useGlobalState();
   const [{ interactionResult }, dispatchTransactionState] =
     useTransactionState();
   const [, dispatchArNSState] = useArNSState();
@@ -298,6 +298,7 @@ function DomainSettings({
                   dispatchTransactionState,
                   dispatchArNSState,
                   ao: antAoClient,
+                  aoNetwork,
                 })
               }
             />
@@ -361,6 +362,7 @@ function DomainSettings({
                   dispatchTransactionState,
                   dispatchArNSState,
                   ao: antAoClient,
+                  aoNetwork,
                 })
               }
             />
@@ -380,6 +382,7 @@ function DomainSettings({
                   dispatchTransactionState,
                   dispatchArNSState,
                   ao: antAoClient,
+                  aoNetwork,
                 })
               }
             />
@@ -408,6 +411,7 @@ function DomainSettings({
                   dispatchTransactionState,
                   dispatchArNSState,
                   ao: antAoClient,
+                  aoNetwork,
                 })
               }
             />
@@ -434,6 +438,7 @@ function DomainSettings({
                   dispatchTransactionState,
                   dispatchArNSState,
                   ao: antAoClient,
+                  aoNetwork,
                 })
               }
             />
@@ -456,6 +461,7 @@ function DomainSettings({
                   dispatchTransactionState,
                   dispatchArNSState,
                   ao: antAoClient,
+                  aoNetwork,
                 })
               }
             />
@@ -488,6 +494,7 @@ function DomainSettings({
                   dispatchTransactionState,
                   dispatchArNSState,
                   ao: antAoClient,
+                  aoNetwork,
                 })
               }
             />
@@ -509,6 +516,7 @@ function DomainSettings({
                   dispatchTransactionState,
                   dispatchArNSState,
                   ao: antAoClient,
+                  aoNetwork,
                 })
               }
             />
@@ -530,6 +538,7 @@ function DomainSettings({
                   dispatchTransactionState,
                   dispatchArNSState,
                   ao: antAoClient,
+                  aoNetwork,
                 })
               }
             />
diff --git a/src/components/inputs/text/NameTokenSelector/NameTokenSelector.tsx b/src/components/inputs/text/NameTokenSelector/NameTokenSelector.tsx
index 80c6b4313..24ba0d7eb 100644
--- a/src/components/inputs/text/NameTokenSelector/NameTokenSelector.tsx
+++ b/src/components/inputs/text/NameTokenSelector/NameTokenSelector.tsx
@@ -31,7 +31,7 @@ function NameTokenSelector({
 }: {
   selectedTokenCallback: (id: ArweaveTransactionID | undefined) => void;
 }) {
-  const [{ arweaveDataProvider, antAoClient }] = useGlobalState();
+  const [{ arweaveDataProvider, antAoClient, aoNetwork }] = useGlobalState();
   const [{ walletAddress }] = useWalletState();
 
   const [searchText, setSearchText] = useState<string>();
@@ -108,19 +108,15 @@ function NameTokenSelector({
       }
 
       const fetchedprocessIds: Array<ArweaveTransactionID> = [];
-      // const fetchedprocessIds = await arweaveDataProvider
-      //   .getContractsForWallet({
-      //     address,
-      //   })
-      //   .catch(() => {
-      //     throw new Error('Unable to get contracts for wallet');
-      //   });
 
       const validImports = imports.length
         ? await Promise.all(
             imports.map(async (id: ArweaveTransactionID) => {
               try {
                 const contract = ANT.init({
+                  hyperbeamUrl: aoNetwork.HYPERBEAM.ENABLED
+                    ? aoNetwork.HYPERBEAM.URL
+                    : undefined,
                   process: new AOProcess({
                     processId: id.toString(),
                     ao: antAoClient,
@@ -168,6 +164,9 @@ function NameTokenSelector({
       }[] = await Promise.all(
         processIds.map(async (processId) => {
           const contract = ANT.init({
+            hyperbeamUrl: aoNetwork.HYPERBEAM.ENABLED
+              ? aoNetwork.HYPERBEAM.URL
+              : undefined,
             process: new AOProcess({
               processId: processId.toString(),
               ao: antAoClient,
diff --git a/src/components/modals/PrimaryNameModal/PrimaryNameModal.tsx b/src/components/modals/PrimaryNameModal/PrimaryNameModal.tsx
index 329f840e1..2ae31309e 100644
--- a/src/components/modals/PrimaryNameModal/PrimaryNameModal.tsx
+++ b/src/components/modals/PrimaryNameModal/PrimaryNameModal.tsx
@@ -182,6 +182,7 @@ function PrimaryNameModal({
             processId: arioProcessId,
             fundFrom: fundingSource,
             dispatch: dispatchTransactionState,
+            aoNetwork,
           });
 
           break;
@@ -199,6 +200,7 @@ function PrimaryNameModal({
             dispatchTransactionState,
             dispatchArNSState,
             ao: aoClient,
+            aoNetwork,
           });
           queryClient.resetQueries({
             queryKey: ['primary-name'],
diff --git a/src/components/modals/ant-management/EditUndernameModal/EditUndernameModal.tsx b/src/components/modals/ant-management/EditUndernameModal/EditUndernameModal.tsx
index 55d416914..f77e4206a 100644
--- a/src/components/modals/ant-management/EditUndernameModal/EditUndernameModal.tsx
+++ b/src/components/modals/ant-management/EditUndernameModal/EditUndernameModal.tsx
@@ -32,7 +32,7 @@ function EditUndernameModal({
   closeModal: () => void;
   payloadCallback: (payload: SetRecordPayload) => void;
 }) {
-  const [{ arweaveDataProvider, antAoClient }] = useGlobalState();
+  const [{ arweaveDataProvider, antAoClient, aoNetwork }] = useGlobalState();
   const isMobile = useIsMobile();
   const targetIdRef = useRef<HTMLInputElement>(null);
   const ttlRef = useRef<HTMLInputElement>(null);
@@ -50,6 +50,9 @@ function EditUndernameModal({
   async function load(id: ArweaveTransactionID) {
     try {
       const contract = ANT.init({
+        hyperbeamUrl: aoNetwork.HYPERBEAM.ENABLED
+          ? aoNetwork.HYPERBEAM.URL
+          : undefined,
         process: new AOProcess({
           processId: id.toString(),
           ao: antAoClient,
diff --git a/src/components/modals/ant-management/ReassignNameModal/ReassignNameModal.tsx b/src/components/modals/ant-management/ReassignNameModal/ReassignNameModal.tsx
index c2c5f112d..9cbb5138f 100644
--- a/src/components/modals/ant-management/ReassignNameModal/ReassignNameModal.tsx
+++ b/src/components/modals/ant-management/ReassignNameModal/ReassignNameModal.tsx
@@ -136,6 +136,7 @@ export function ReassignNameModal({
         dispatchArNSState,
         owner: walletAddress.toString(),
         ao: aoClient,
+        aoNetwork,
       });
       eventEmitter.emit('success', {
         message: (
diff --git a/src/components/modals/ant-management/ReturnNameModal/ReturnNameModal.tsx b/src/components/modals/ant-management/ReturnNameModal/ReturnNameModal.tsx
index 34cf802a3..d1034e5b9 100644
--- a/src/components/modals/ant-management/ReturnNameModal/ReturnNameModal.tsx
+++ b/src/components/modals/ant-management/ReturnNameModal/ReturnNameModal.tsx
@@ -60,6 +60,7 @@ export function ReturnNameModal({
         dispatchArNSState,
         owner: walletAddress.toString(),
         ao: antAoClient,
+        aoNetwork,
       });
       eventEmitter.emit('success', {
         message: (
diff --git a/src/components/modals/ant-management/UpgradeDomainModal/UpgradeDomainModal.tsx b/src/components/modals/ant-management/UpgradeDomainModal/UpgradeDomainModal.tsx
index 7ebdedd62..4c94b39b0 100644
--- a/src/components/modals/ant-management/UpgradeDomainModal/UpgradeDomainModal.tsx
+++ b/src/components/modals/ant-management/UpgradeDomainModal/UpgradeDomainModal.tsx
@@ -105,6 +105,7 @@ function UpgradeDomainModal({
         processId: domainData.processId,
         owner: walletAddress.toString(),
         ao: antAoClient,
+        aoNetwork,
         signer,
         dispatchTransactionState,
         dispatchArNSState,
diff --git a/src/components/modals/ant-management/UpgradeDomainsModal/UpgradeDomainsModal.tsx b/src/components/modals/ant-management/UpgradeDomainsModal/UpgradeDomainsModal.tsx
index be5a2ef7b..f5aeb93d6 100644
--- a/src/components/modals/ant-management/UpgradeDomainsModal/UpgradeDomainsModal.tsx
+++ b/src/components/modals/ant-management/UpgradeDomainsModal/UpgradeDomainsModal.tsx
@@ -135,6 +135,7 @@ function UpgradeDomainsModal({
                 processId: domainData.processId,
                 owner: walletAddress.toString(),
                 ao: antAoClient,
+                aoNetwork,
                 signer,
                 dispatchTransactionState,
                 dispatchArNSState,
diff --git a/src/components/pages/Register/Checkout.tsx b/src/components/pages/Register/Checkout.tsx
index 86168b3a8..984ba5c43 100644
--- a/src/components/pages/Register/Checkout.tsx
+++ b/src/components/pages/Register/Checkout.tsx
@@ -323,6 +323,7 @@ function Checkout() {
             ? 'turbo'
             : fundingSource,
         turboArNSClient: turbo,
+        aoNetwork,
       });
     } catch (error) {
       eventEmitter.emit('error', error);
diff --git a/src/components/pages/Register/Register.tsx b/src/components/pages/Register/Register.tsx
index 84711207e..915bf6177 100644
--- a/src/components/pages/Register/Register.tsx
+++ b/src/components/pages/Register/Register.tsx
@@ -45,8 +45,9 @@ import PageLoader from '../../layout/progress/PageLoader/PageLoader';
 import './styles.css';
 
 function RegisterNameForm() {
-  const [{ arweaveDataProvider, arioTicker, arioProcessId, antAoClient }] =
-    useGlobalState();
+  const [
+    { arweaveDataProvider, arioTicker, arioProcessId, antAoClient, aoNetwork },
+  ] = useGlobalState();
   const [
     { domain, leaseDuration, registrationType, antID, targetId },
     dispatchRegisterState,
@@ -126,6 +127,9 @@ function RegisterNameForm() {
     });
 
     const contract = ANT.init({
+      hyperbeamUrl: aoNetwork.HYPERBEAM.ENABLED
+        ? aoNetwork.HYPERBEAM.URL
+        : undefined,
       process: new AOProcess({
         processId: id.toString(),
         ao: antAoClient,
diff --git a/src/components/pages/Transaction/TransactionReview.tsx b/src/components/pages/Transaction/TransactionReview.tsx
index d7b9b8ea9..a5063e3a5 100644
--- a/src/components/pages/Transaction/TransactionReview.tsx
+++ b/src/components/pages/Transaction/TransactionReview.tsx
@@ -125,6 +125,7 @@ function TransactionReview() {
         ao: aoClient,
         scheduler: aoNetwork.ARIO.SCHEDULER,
         fundFrom: fundingSource,
+        aoNetwork,
       });
     } catch (error) {
       eventEmitter.emit('error', error);
diff --git a/src/hooks/useDomainInfo.tsx b/src/hooks/useDomainInfo.tsx
index 0e3328a02..c3502f28c 100644
--- a/src/hooks/useDomainInfo.tsx
+++ b/src/hooks/useDomainInfo.tsx
@@ -100,6 +100,9 @@ export function buildDomainInfoQuery({
       }
 
       const antProcess = ANT.init({
+        hyperbeamUrl: aoNetwork.HYPERBEAM.ENABLED
+          ? aoNetwork.HYPERBEAM.URL
+          : undefined,
         process: new AOProcess({
           processId,
           ao: antAo,
@@ -108,7 +111,7 @@ export function buildDomainInfoQuery({
       });
 
       const state = await queryClient
-        .fetchQuery(buildAntStateQuery({ processId, ao: antAo }))
+        .fetchQuery(buildAntStateQuery({ processId, ao: antAo, aoNetwork }))
         .catch((e) => {
           captureException(e);
           errors.push(
diff --git a/src/state/actions/dispatchANTInteraction.ts b/src/state/actions/dispatchANTInteraction.ts
index a2fd84710..a182bfabd 100644
--- a/src/state/actions/dispatchANTInteraction.ts
+++ b/src/state/actions/dispatchANTInteraction.ts
@@ -27,6 +27,7 @@ export default async function dispatchANTInteraction({
   processId,
   signer,
   owner,
+  aoNetwork,
   dispatchTransactionState,
   dispatchArNSState,
   ao,
@@ -38,6 +39,7 @@ export default async function dispatchANTInteraction({
   signer: ContractSigner;
   owner: string;
   processId: string;
+  aoNetwork: typeof NETWORK_DEFAULTS.AO;
   dispatchTransactionState: Dispatch<TransactionAction>;
   dispatchArNSState: Dispatch<ArNSAction>;
   ao: AoClient;
@@ -60,6 +62,9 @@ export default async function dispatchANTInteraction({
     1000 * 10,
   );
   const antProcess = ANT.init({
+    hyperbeamUrl: aoNetwork.HYPERBEAM.ENABLED
+      ? aoNetwork.HYPERBEAM.URL
+      : undefined,
     process: new AOProcess({ processId, ao }),
     signer,
   });
@@ -234,6 +239,9 @@ export default async function dispatchANTInteraction({
         await stepCallback('Validating state migration...');
         // validate new ANT is a valid ANT
         const newAnt = ANT.init({
+          hyperbeamUrl: aoNetwork.HYPERBEAM.ENABLED
+            ? aoNetwork.HYPERBEAM.URL
+            : undefined,
           process: new AOProcess({
             processId: newAntId,
             ao,
diff --git a/src/state/actions/dispatchArIOInteraction.ts b/src/state/actions/dispatchArIOInteraction.ts
index 9f60177de..74da3a977 100644
--- a/src/state/actions/dispatchArIOInteraction.ts
+++ b/src/state/actions/dispatchArIOInteraction.ts
@@ -21,7 +21,7 @@ import {
   ContractInteraction,
 } from '@src/types';
 import { createAntStateForOwner, lowerCaseDomain, sleep } from '@src/utils';
-import { WRITE_OPTIONS } from '@src/utils/constants';
+import { NETWORK_DEFAULTS, WRITE_OPTIONS } from '@src/utils/constants';
 import eventEmitter from '@src/utils/events';
 import { queryClient } from '@src/utils/network';
 import { Dispatch } from 'react';
@@ -36,6 +36,7 @@ export default async function dispatchArIOInteraction({
   signer,
   ao,
   antAo,
+  aoNetwork,
   scheduler = DEFAULT_SCHEDULER_ID,
   fundFrom,
   turboArNSClient,
@@ -49,6 +50,7 @@ export default async function dispatchArIOInteraction({
   signer?: ContractSigner;
   ao?: AoClient;
   antAo?: AoClient;
+  aoNetwork: typeof NETWORK_DEFAULTS.AO;
   scheduler?: string;
   fundFrom?: FundFrom | 'fiat';
   turboArNSClient?: TurboArNSClient;
@@ -226,6 +228,9 @@ export default async function dispatchArIOInteraction({
         await sleep(2000);
 
         const antProcess = ANT.init({
+          hyperbeamUrl: aoNetwork.HYPERBEAM.ENABLED
+            ? aoNetwork.HYPERBEAM.URL
+            : undefined,
           signer,
           process: new AOProcess({
             ao: antAo,
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index a8a453002..2c74866fe 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -126,6 +126,10 @@ export const STRIPE_PUBLISHABLE_KEY =
 
 export const NETWORK_DEFAULTS = {
   AO: {
+    HYPERBEAM: {
+      URL: 'https://hyperbeam.ario.permaweb.services',
+      ENABLED: false,
+    },
     ARIO: {
       CU_URL: ARIO_AO_CU_URL, // ao public cu: https://cu.ao-testnet.xyz
       MU_URL: 'https://mu.ao-testnet.xyz',
diff --git a/src/utils/network.ts b/src/utils/network.ts
index 25858a1f9..cc0f99acb 100644
--- a/src/utils/network.ts
+++ b/src/utils/network.ts
@@ -18,6 +18,7 @@ import {
 import { del, get, set } from 'idb-keyval';
 
 import { isArweaveTransactionID } from '.';
+import { NETWORK_DEFAULTS } from './constants';
 
 /**
  * Creates an Indexed DB persister
@@ -48,9 +49,11 @@ export const queryClient = new QueryClient({
 export function buildAntStateQuery({
   processId,
   ao,
+  aoNetwork,
 }: {
   processId: string;
   ao: AoClient;
+  aoNetwork: typeof NETWORK_DEFAULTS.AO;
 }): {
   queryKey: ['ant', string] | string[];
   queryFn: () => Promise<AoANTState | null>;
@@ -62,7 +65,12 @@ export function buildAntStateQuery({
       if (!processId || !isArweaveTransactionID(processId))
         throw new Error('Must provide a valid process id');
 
-      const ant = ANT.init({ process: new AOProcess({ processId, ao }) });
+      const ant = ANT.init({
+        hyperbeamUrl: aoNetwork.HYPERBEAM.ENABLED
+          ? aoNetwork.HYPERBEAM.URL
+          : undefined,
+        process: new AOProcess({ processId, ao }),
+      });
       return await ant.getState();
     },
     staleTime: Infinity,

From aaa866ef5a16604db7b9581577bca24448636dfb Mon Sep 17 00:00:00 2001
From: atticusofsparta <atticusofsparta@protonmail.com>
Date: Thu, 26 Jun 2025 12:10:17 -0600
Subject: [PATCH 02/13] fix(settings): update settings to persist in local
 storage

---
 src/App.tsx                                   |  2 +
 src/hooks/index.ts                            |  1 +
 src/hooks/useSyncSettings/useSyncSettings.tsx | 83 +++++++++++++++++++
 src/state/contexts/GlobalState.tsx            | 75 ++++++++++++++---
 4 files changed, 151 insertions(+), 10 deletions(-)
 create mode 100644 src/hooks/useSyncSettings/useSyncSettings.tsx

diff --git a/src/App.tsx b/src/App.tsx
index aacae1f4b..7b3ec361e 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -18,6 +18,7 @@ import Checkout from './components/pages/Register/Checkout';
 import ArNSSettings from './components/pages/Settings/ArNSSettings';
 import NetworkSettings from './components/pages/Settings/NetworkSettings';
 import SettingsOverview from './components/pages/Settings/SettingsOverview';
+import useSyncSettings from './hooks/useSyncSettings/useSyncSettings';
 import useWanderEvents from './hooks/useWanderEvents/useWanderEvents';
 import './index.css';
 import { useGlobalState } from './state';
@@ -71,6 +72,7 @@ const sentryCreateBrowserRouter =
 
 function App() {
   useWanderEvents();
+  useSyncSettings();
   const [{ turboNetwork }] = useGlobalState();
 
   const stripePromise = useMemo(() => {
diff --git a/src/hooks/index.ts b/src/hooks/index.ts
index 82c899bfb..7d828b0e0 100644
--- a/src/hooks/index.ts
+++ b/src/hooks/index.ts
@@ -2,3 +2,4 @@ export * from './useIsMobile/useIsMobile';
 export * from './useLongPress/useLongPress';
 export * from './useIsFocused/useIsFocused';
 export * from './useRegistrationStatus/useRegistrationStatus';
+export * from './useSyncSettings/useSyncSettings';
diff --git a/src/hooks/useSyncSettings/useSyncSettings.tsx b/src/hooks/useSyncSettings/useSyncSettings.tsx
new file mode 100644
index 000000000..3aba1a1fe
--- /dev/null
+++ b/src/hooks/useSyncSettings/useSyncSettings.tsx
@@ -0,0 +1,83 @@
+import { useGlobalState, useWalletState } from '@src/state';
+import { useEffect } from 'react';
+
+const SETTINGS_STORAGE_KEY = 'arNS_settings';
+
+interface NetworkSettings {
+  gateway: string;
+  aoNetwork: {
+    ARIO: {
+      CU_URL: string;
+      MU_URL: string;
+      SCHEDULER: string;
+    };
+    ANT: {
+      CU_URL: string;
+      MU_URL: string;
+      SCHEDULER: string;
+      GRAPHQL_URL: string;
+    };
+    HYPERBEAM: {
+      URL: string;
+      ENABLED: boolean;
+    };
+  };
+  turboNetwork: {
+    UPLOAD_URL: string;
+    PAYMENT_URL: string;
+    GATEWAY_URL: string;
+    WALLETS_URL: string;
+    STRIPE_PUBLISHABLE_KEY: string;
+  };
+}
+
+interface ArNSSettings {
+  arioProcessId: string;
+}
+
+interface Settings {
+  network: NetworkSettings;
+  arns: ArNSSettings;
+}
+
+function useSyncSettings() {
+  const [{ gateway, aoNetwork, turboNetwork, arioProcessId }] =
+    useGlobalState();
+  const [{ walletAddress }] = useWalletState();
+
+  // Save settings when they change
+  useEffect(() => {
+    if (!walletAddress) {
+      return;
+    }
+
+    const settings: Settings = {
+      network: {
+        gateway,
+        aoNetwork,
+        turboNetwork,
+      },
+      arns: {
+        arioProcessId,
+      },
+    };
+
+    // Save to wallet-specific key
+    const walletKey = `${SETTINGS_STORAGE_KEY}_${walletAddress}`;
+
+    // Also save to a "last" key for persistence across wallet switches
+    const lastKey = `${SETTINGS_STORAGE_KEY}_last`;
+
+    try {
+      localStorage.setItem(walletKey, JSON.stringify(settings));
+      localStorage.setItem(lastKey, JSON.stringify(settings));
+      console.log('Settings saved to localStorage:', walletKey, settings);
+    } catch (error) {
+      console.error('Failed to save settings to localStorage:', error);
+    }
+  }, [walletAddress, gateway, aoNetwork, turboNetwork, arioProcessId]);
+
+  return null;
+}
+
+export default useSyncSettings;
diff --git a/src/state/contexts/GlobalState.tsx b/src/state/contexts/GlobalState.tsx
index 61b26c86b..3fa3ca70a 100644
--- a/src/state/contexts/GlobalState.tsx
+++ b/src/state/contexts/GlobalState.tsx
@@ -18,7 +18,6 @@ import React, {
 import { ArweaveCompositeDataProvider } from '../../services/arweave/ArweaveCompositeDataProvider';
 import { SimpleArweaveDataProvider } from '../../services/arweave/SimpleArweaveDataProvider';
 import {
-  ARIO_AO_CU_URL,
   ARIO_PROCESS_ID,
   ARWEAVE_HOST,
   DEFAULT_ARWEAVE,
@@ -26,13 +25,69 @@ import {
 } from '../../utils/constants';
 import type { GlobalAction } from '../reducers/GlobalReducer';
 
+const SETTINGS_STORAGE_KEY = 'arNS_settings';
+
+// Function to load settings from localStorage
+function loadSettingsFromStorage(): {
+  gateway: string;
+  aoNetwork: typeof NETWORK_DEFAULTS.AO;
+  turboNetwork: typeof NETWORK_DEFAULTS.TURBO;
+  arioProcessId: string;
+} | null {
+  try {
+    // Try to get the last used wallet address from localStorage
+    const walletType = localStorage.getItem('walletType');
+
+    // Try multiple storage keys to find saved settings
+    const possibleKeys = [
+      walletType ? `${SETTINGS_STORAGE_KEY}_${walletType}` : null,
+      `${SETTINGS_STORAGE_KEY}_default`,
+      `${SETTINGS_STORAGE_KEY}_last`,
+    ].filter(Boolean);
+
+    for (const storageKey of possibleKeys) {
+      const savedSettings = localStorage.getItem(storageKey!);
+
+      if (savedSettings) {
+        const settings = JSON.parse(savedSettings);
+        console.log(
+          'Loading settings from localStorage:',
+          storageKey,
+          settings,
+        );
+
+        return {
+          gateway: settings.network?.gateway || ARWEAVE_HOST,
+          aoNetwork: settings.network?.aoNetwork || NETWORK_DEFAULTS.AO,
+          turboNetwork:
+            settings.network?.turboNetwork || NETWORK_DEFAULTS.TURBO,
+          arioProcessId: settings.arns?.arioProcessId || ARIO_PROCESS_ID,
+        };
+      }
+    }
+  } catch (error) {
+    console.error('Failed to load settings from localStorage:', error);
+  }
+
+  return null;
+}
+
 export const defaultArweave = new SimpleArweaveDataProvider(DEFAULT_ARWEAVE);
+
+// Load saved settings or use defaults
+const savedSettings = loadSettingsFromStorage();
+const initialGateway = savedSettings?.gateway || ARWEAVE_HOST;
+const initialAoNetwork = savedSettings?.aoNetwork || NETWORK_DEFAULTS.AO;
+const initialTurboNetwork =
+  savedSettings?.turboNetwork || NETWORK_DEFAULTS.TURBO;
+const initialArioProcessId = savedSettings?.arioProcessId || ARIO_PROCESS_ID;
+
 export const defaultArIO = ARIO.init({
-  paymentUrl: NETWORK_DEFAULTS.TURBO.PAYMENT_URL,
+  paymentUrl: initialTurboNetwork.PAYMENT_URL,
   process: new AOProcess({
-    processId: ARIO_PROCESS_ID,
+    processId: initialArioProcessId,
     ao: connect({
-      CU_URL: ARIO_AO_CU_URL,
+      CU_URL: initialAoNetwork.ARIO.CU_URL,
     }),
   }),
 });
@@ -52,13 +107,13 @@ export type GlobalState = {
 };
 
 const initialState: GlobalState = {
-  arioProcessId: ARIO_PROCESS_ID,
+  arioProcessId: initialArioProcessId,
   arioTicker: 'ARIO',
-  gateway: ARWEAVE_HOST,
-  aoNetwork: NETWORK_DEFAULTS.AO,
-  turboNetwork: NETWORK_DEFAULTS.TURBO,
-  aoClient: connect(NETWORK_DEFAULTS.AO.ARIO),
-  antAoClient: connect(NETWORK_DEFAULTS.AO.ANT),
+  gateway: initialGateway,
+  aoNetwork: initialAoNetwork,
+  turboNetwork: initialTurboNetwork,
+  aoClient: connect(initialAoNetwork.ARIO),
+  antAoClient: connect(initialAoNetwork.ANT),
   blockHeight: undefined,
   lastBlockUpdateTimestamp: undefined,
   arweaveDataProvider: new ArweaveCompositeDataProvider({

From c99e2998d4ec4dd983deafd7150011fecf73b06e Mon Sep 17 00:00:00 2001
From: atticusofsparta <atticusofsparta@protonmail.com>
Date: Thu, 26 Jun 2025 12:22:16 -0600
Subject: [PATCH 03/13] fix(useANT): update useANT to use aoNetwork

---
 src/hooks/useANT/useANT.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hooks/useANT/useANT.tsx b/src/hooks/useANT/useANT.tsx
index 33e1b2f4d..c4e8bd3ac 100644
--- a/src/hooks/useANT/useANT.tsx
+++ b/src/hooks/useANT/useANT.tsx
@@ -5,11 +5,12 @@ import { useQuery } from '@tanstack/react-query';
 import { useEffect, useState } from 'react';
 
 export function useANT(id?: string) {
-  const [{ antAoClient }] = useGlobalState();
+  const [{ antAoClient, aoNetwork }] = useGlobalState();
   const result = useQuery(
     buildAntStateQuery({
       processId: id!,
       ao: antAoClient,
+      aoNetwork,
     }),
   );
   const [data, setData] = useState<{

From 9bd195235bbc0a7f77caa1b74f71bbf02f4d0e16 Mon Sep 17 00:00:00 2001
From: atticusofsparta <atticusofsparta@protonmail.com>
Date: Thu, 26 Jun 2025 14:29:09 -0600
Subject: [PATCH 04/13] fix(sdk): use latest alpha

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e90a0bd66..2f30f6c07 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@ant-design/icons": "5.4.0",
-    "@ar.io/sdk": "^3.14.0-alpha.8",
+    "@ar.io/sdk": "^3.14.1-alpha.1",
     "@ardrive/turbo-sdk": "^1.23.1",
     "@permaweb/aoconnect": "^0.0.59",
     "@radix-ui/react-checkbox": "^1.1.4",
diff --git a/yarn.lock b/yarn.lock
index 25105c0b4..1252fbbb5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -111,10 +111,10 @@
     winston "^3.13.0"
     zod "^3.23.8"
 
-"@ar.io/sdk@^3.14.0-alpha.8":
-  version "3.14.0-alpha.8"
-  resolved "https://registry.npmjs.org/@ar.io/sdk/-/sdk-3.14.0-alpha.8.tgz#ac07dafd1a7e3b0674473a724b5906b009f3f34d"
-  integrity sha512-a3j6uQR2Q4LDP8FBF7T2b0MB3CngHBFpgV1o4/3K7yRJZJrH51ty6gTW6XpqOwLzVAxpTfoXLgUe3UHd/Cq4Wg==
+"@ar.io/sdk@^3.14.1-alpha.1":
+  version "3.14.1-alpha.1"
+  resolved "https://registry.npmjs.org/@ar.io/sdk/-/sdk-3.14.1-alpha.1.tgz#bd782eda426a3076a0218ed714425d5cfb40d94a"
+  integrity sha512-Fc6prGVeC4kuWV5UoSGUMCAKvOqEvl1coJ5uqRtvLxHOQBezG0ZGjAcSGz6tKaW3vfzthrzxkaTt9NvJEceW/A==
   dependencies:
     "@dha-team/arbundles" "^1.0.1"
     "@permaweb/aoconnect" "0.0.68"

From 3e8cea3492fb3af9fd4e0cf95d77ef84bfa9e59c Mon Sep 17 00:00:00 2001
From: atticusofsparta <atticusofsparta@protonmail.com>
Date: Fri, 27 Jun 2025 11:54:31 -0600
Subject: [PATCH 05/13] fix(build): fix types

---
 src/components/devtools/NetworkSettings.tsx   | 100 ++++++------------
 .../PrimaryNameModal/PrimaryNameModal.tsx     |   1 +
 .../UpgradeDomainModal/UpgradeDomainModal.tsx |   1 -
 .../UpgradeDomainsModal.tsx                   |   1 -
 src/components/pages/Register/Checkout.tsx    |  13 ++-
 .../pages/Transaction/TransactionReview.tsx   |   3 +-
 src/hooks/useSyncSettings/useSyncSettings.tsx |   6 +-
 src/state/actions/dispatchArIOInteraction.ts  |   6 +-
 src/state/contexts/GlobalState.tsx            |   4 +-
 src/state/reducers/GlobalReducer.ts           |   9 ++
 src/utils/constants.ts                        |   4 -
 11 files changed, 62 insertions(+), 86 deletions(-)

diff --git a/src/components/devtools/NetworkSettings.tsx b/src/components/devtools/NetworkSettings.tsx
index cef817807..9590721f8 100644
--- a/src/components/devtools/NetworkSettings.tsx
+++ b/src/components/devtools/NetworkSettings.tsx
@@ -18,7 +18,6 @@ import { Collapse, Input, Space } from 'antd';
 import { List } from 'lucide-react';
 import { useEffect, useState } from 'react';
 
-import Switch from '../inputs/Switch';
 import ArweaveID, { ArweaveIdTypes } from '../layout/ArweaveID/ArweaveID';
 import SelectGatewayModal from './SelectGatewayModal/SelectGatewayModal';
 import './styles.css';
@@ -27,7 +26,14 @@ const Panel = Collapse.Panel;
 
 function NetworkSettings() {
   const [
-    { gateway, aoNetwork, arioProcessId, arioContract, turboNetwork },
+    {
+      gateway,
+      aoNetwork,
+      arioProcessId,
+      arioContract,
+      turboNetwork,
+      hyperbeamUrl,
+    },
     dispatchGlobalState,
   ] = useGlobalState();
   const [{ wallet }] = useWalletState();
@@ -59,12 +65,9 @@ function NetworkSettings() {
     useState<boolean>(true);
 
   const [newHyperbeamUrl, setNewHyperbeamUrl] = useState<string>(
-    aoNetwork.HYPERBEAM.URL,
+    hyperbeamUrl || '',
   );
   const [validHyperbeamUrl, setValidHyperbeamUrl] = useState<boolean>(true);
-  const [hyperbeamEnabled, setHyperbeamEnabled] = useState<boolean>(
-    aoNetwork.HYPERBEAM.ENABLED,
-  );
 
   function reset() {
     // gateway
@@ -88,12 +91,11 @@ function NetworkSettings() {
     setValidTurboPaymentUrl(true);
     updateTurboNetwork(NETWORK_DEFAULTS.TURBO);
     // hyperbeam network
-    setNewHyperbeamUrl(NETWORK_DEFAULTS.AO.HYPERBEAM.URL);
+    setNewHyperbeamUrl(NETWORK_DEFAULTS.AO.ARIO.HYPERBEAM_URL || '');
     setValidHyperbeamUrl(true);
-    setHyperbeamEnabled(NETWORK_DEFAULTS.AO.HYPERBEAM.ENABLED);
-    updateHyperbeamAoNetwork({
-      URL: NETWORK_DEFAULTS.AO.HYPERBEAM.URL,
-      ENABLED: NETWORK_DEFAULTS.AO.HYPERBEAM.ENABLED,
+    dispatchGlobalState({
+      type: 'setHyperbeamUrl',
+      payload: NETWORK_DEFAULTS.AO.ARIO.HYPERBEAM_URL || undefined,
     });
   }
 
@@ -112,10 +114,9 @@ function NetworkSettings() {
   }, [aoNetwork.ARIO]);
 
   useEffect(() => {
-    setNewHyperbeamUrl(aoNetwork.HYPERBEAM.URL);
+    setNewHyperbeamUrl(hyperbeamUrl || '');
     setValidHyperbeamUrl(true);
-    setHyperbeamEnabled(aoNetwork.HYPERBEAM.ENABLED);
-  }, [aoNetwork.HYPERBEAM]);
+  }, [hyperbeamUrl]);
 
   async function updateGateway(gate: string) {
     try {
@@ -219,24 +220,6 @@ function NetworkSettings() {
     });
   }
 
-  function updateHyperbeamAoNetwork(config: {
-    URL?: string;
-    ENABLED?: boolean;
-  }) {
-    try {
-      const newConfig = {
-        ...aoNetwork,
-        ...{ HYPERBEAM: { ...aoNetwork.HYPERBEAM, ...config } },
-      };
-      dispatchGlobalState({
-        type: 'setAONetwork',
-        payload: newConfig,
-      });
-    } catch (error) {
-      eventEmitter.emit('error', error);
-    }
-  }
-
   return (
     <div className="flex" style={{ width: '100%' }}>
       <Space direction="vertical" style={{ width: '100%' }}>
@@ -609,36 +592,11 @@ function NetworkSettings() {
               <span className="flex w-fit  whitespace-nowrap items-center bg-primary-thin rounded-t-md px-4 py-1 border-x-2 border-t-2 border-primary text-md text-primary font-semibold mt-2 gap-4 justify-center">
                 Hyperbeam URL:{' '}
                 <span className="text-white pl-2 flex">
-                  {aoNetwork.HYPERBEAM.URL}
-                </span>
-                <span className="text-white pl-2">
-                  ({aoNetwork.HYPERBEAM.ENABLED ? 'Enabled' : 'Disabled'})
+                  {hyperbeamUrl || ''}
                 </span>
-                <div className="flex flex-row items-center gap-2 mt-2 bg-dark-grey p-2 rounded-md">
-                  <span className="text-white font-semibold">
-                    Enable Hyperbeam:
-                  </span>
-                  <Switch
-                    checked={hyperbeamEnabled}
-                    onChange={(checked) => {
-                      setHyperbeamEnabled(checked);
-                      updateHyperbeamAoNetwork({ ENABLED: checked });
-                    }}
-                  />
-                  <button
-                    className="bg-primary-thin text-white h-full flex w-fit p-1 rounded-sm text-xs"
-                    onClick={() => {
-                      setHyperbeamEnabled(
-                        NETWORK_DEFAULTS.AO.HYPERBEAM.ENABLED,
-                      );
-                      updateHyperbeamAoNetwork({
-                        ENABLED: NETWORK_DEFAULTS.AO.HYPERBEAM.ENABLED,
-                      });
-                    }}
-                  >
-                    reset
-                  </button>
-                </div>
+                {!hyperbeamUrl && (
+                  <span className="text-red-500 font-bold">DISABLED</span>
+                )}
               </span>
 
               <Input
@@ -651,8 +609,9 @@ function NetworkSettings() {
                 }}
                 onClear={() => setNewHyperbeamUrl('')}
                 onPressEnter={(e) =>
-                  updateHyperbeamAoNetwork({
-                    URL: e.currentTarget.value.trim(),
+                  dispatchGlobalState({
+                    type: 'setHyperbeamUrl',
+                    payload: e.currentTarget.value.trim(),
                   })
                 }
                 variant="outlined"
@@ -663,8 +622,9 @@ function NetworkSettings() {
                       disabled={!validHyperbeamUrl}
                       className="bg-primary text-black h-full flex w-fit p-1 rounded-sm text-xs"
                       onClick={() =>
-                        updateHyperbeamAoNetwork({
-                          URL: newHyperbeamUrl.trim(),
+                        dispatchGlobalState({
+                          type: 'setHyperbeamUrl',
+                          payload: newHyperbeamUrl.trim(),
                         })
                       }
                     >
@@ -673,10 +633,14 @@ function NetworkSettings() {
                     <button
                       className="bg-primary-thin text-white h-full flex w-fit p-1 rounded-sm text-xs"
                       onClick={() => {
-                        setNewHyperbeamUrl(NETWORK_DEFAULTS.AO.HYPERBEAM.URL);
+                        setNewHyperbeamUrl(
+                          NETWORK_DEFAULTS.AO.ARIO.HYPERBEAM_URL || '',
+                        );
                         setValidHyperbeamUrl(true);
-                        updateHyperbeamAoNetwork({
-                          URL: NETWORK_DEFAULTS.AO.HYPERBEAM.URL,
+                        dispatchGlobalState({
+                          type: 'setHyperbeamUrl',
+                          payload:
+                            NETWORK_DEFAULTS.AO.ARIO.HYPERBEAM_URL || undefined,
                         });
                       }}
                     >
diff --git a/src/components/modals/PrimaryNameModal/PrimaryNameModal.tsx b/src/components/modals/PrimaryNameModal/PrimaryNameModal.tsx
index 70393289a..8cabfa3a2 100644
--- a/src/components/modals/PrimaryNameModal/PrimaryNameModal.tsx
+++ b/src/components/modals/PrimaryNameModal/PrimaryNameModal.tsx
@@ -183,6 +183,7 @@ function PrimaryNameModal({
             fundFrom: fundingSource,
             dispatch: dispatchTransactionState,
             aoNetwork,
+            hyperbeamUrl,
           });
 
           break;
diff --git a/src/components/modals/ant-management/UpgradeDomainModal/UpgradeDomainModal.tsx b/src/components/modals/ant-management/UpgradeDomainModal/UpgradeDomainModal.tsx
index 4c94b39b0..7ebdedd62 100644
--- a/src/components/modals/ant-management/UpgradeDomainModal/UpgradeDomainModal.tsx
+++ b/src/components/modals/ant-management/UpgradeDomainModal/UpgradeDomainModal.tsx
@@ -105,7 +105,6 @@ function UpgradeDomainModal({
         processId: domainData.processId,
         owner: walletAddress.toString(),
         ao: antAoClient,
-        aoNetwork,
         signer,
         dispatchTransactionState,
         dispatchArNSState,
diff --git a/src/components/modals/ant-management/UpgradeDomainsModal/UpgradeDomainsModal.tsx b/src/components/modals/ant-management/UpgradeDomainsModal/UpgradeDomainsModal.tsx
index f5aeb93d6..be5a2ef7b 100644
--- a/src/components/modals/ant-management/UpgradeDomainsModal/UpgradeDomainsModal.tsx
+++ b/src/components/modals/ant-management/UpgradeDomainsModal/UpgradeDomainsModal.tsx
@@ -135,7 +135,6 @@ function UpgradeDomainsModal({
                 processId: domainData.processId,
                 owner: walletAddress.toString(),
                 ao: antAoClient,
-                aoNetwork,
                 signer,
                 dispatchTransactionState,
                 dispatchArNSState,
diff --git a/src/components/pages/Register/Checkout.tsx b/src/components/pages/Register/Checkout.tsx
index 984ba5c43..62d7366c1 100644
--- a/src/components/pages/Register/Checkout.tsx
+++ b/src/components/pages/Register/Checkout.tsx
@@ -39,8 +39,16 @@ import { useNavigate } from 'react-router-dom';
 // on completion routes to transaction/complete
 function Checkout() {
   const navigate = useNavigate();
-  const [{ arioContract, arioProcessId, aoNetwork, aoClient, arioTicker }] =
-    useGlobalState();
+  const [
+    {
+      arioContract,
+      arioProcessId,
+      aoNetwork,
+      aoClient,
+      arioTicker,
+      hyperbeamUrl,
+    },
+  ] = useGlobalState();
   const turbo = useTurboArNSClient();
   const [, dispatchArNSState] = useArNSState();
   const [{ walletAddress, wallet }] = useWalletState();
@@ -324,6 +332,7 @@ function Checkout() {
             : fundingSource,
         turboArNSClient: turbo,
         aoNetwork,
+        hyperbeamUrl,
       });
     } catch (error) {
       eventEmitter.emit('error', error);
diff --git a/src/components/pages/Transaction/TransactionReview.tsx b/src/components/pages/Transaction/TransactionReview.tsx
index a5063e3a5..952e15ab0 100644
--- a/src/components/pages/Transaction/TransactionReview.tsx
+++ b/src/components/pages/Transaction/TransactionReview.tsx
@@ -33,7 +33,7 @@ import { getTransactionHeader } from './transaction-headers';
 // on completion routes to transaction/complete
 function TransactionReview() {
   const navigate = useNavigate();
-  const [{ arioContract, arioProcessId, aoNetwork, aoClient }] =
+  const [{ arioContract, arioProcessId, aoNetwork, aoClient, hyperbeamUrl }] =
     useGlobalState();
   const [, dispatchArNSState] = useArNSState();
   const [{ walletAddress, wallet }] = useWalletState();
@@ -126,6 +126,7 @@ function TransactionReview() {
         scheduler: aoNetwork.ARIO.SCHEDULER,
         fundFrom: fundingSource,
         aoNetwork,
+        hyperbeamUrl,
       });
     } catch (error) {
       eventEmitter.emit('error', error);
diff --git a/src/hooks/useSyncSettings/useSyncSettings.tsx b/src/hooks/useSyncSettings/useSyncSettings.tsx
index 3aba1a1fe..c4f764cbd 100644
--- a/src/hooks/useSyncSettings/useSyncSettings.tsx
+++ b/src/hooks/useSyncSettings/useSyncSettings.tsx
@@ -10,16 +10,14 @@ interface NetworkSettings {
       CU_URL: string;
       MU_URL: string;
       SCHEDULER: string;
+      HYPERBEAM_URL?: string;
     };
     ANT: {
       CU_URL: string;
       MU_URL: string;
       SCHEDULER: string;
       GRAPHQL_URL: string;
-    };
-    HYPERBEAM: {
-      URL: string;
-      ENABLED: boolean;
+      HYPERBEAM_URL?: string;
     };
   };
   turboNetwork: {
diff --git a/src/state/actions/dispatchArIOInteraction.ts b/src/state/actions/dispatchArIOInteraction.ts
index d05c48cb6..4450feea9 100644
--- a/src/state/actions/dispatchArIOInteraction.ts
+++ b/src/state/actions/dispatchArIOInteraction.ts
@@ -37,6 +37,7 @@ export default async function dispatchArIOInteraction({
   ao,
   antAo,
   aoNetwork,
+  hyperbeamUrl,
   scheduler = DEFAULT_SCHEDULER_ID,
   fundFrom,
   turboArNSClient,
@@ -51,6 +52,7 @@ export default async function dispatchArIOInteraction({
   ao?: AoClient;
   antAo?: AoClient;
   aoNetwork: typeof NETWORK_DEFAULTS.AO;
+  hyperbeamUrl?: string;
   scheduler?: string;
   fundFrom?: FundFrom | 'fiat';
   turboArNSClient?: TurboArNSClient;
@@ -228,9 +230,7 @@ export default async function dispatchArIOInteraction({
         await sleep(2000);
 
         const antProcess = ANT.init({
-          hyperbeamUrl: aoNetwork.HYPERBEAM.ENABLED
-            ? aoNetwork.HYPERBEAM.URL
-            : undefined,
+          hyperbeamUrl: hyperbeamUrl,
           signer,
           // we're not using hyperbeam here as we're writing to the contract
           process: new AOProcess({
diff --git a/src/state/contexts/GlobalState.tsx b/src/state/contexts/GlobalState.tsx
index 8d8174598..12f424aaf 100644
--- a/src/state/contexts/GlobalState.tsx
+++ b/src/state/contexts/GlobalState.tsx
@@ -104,7 +104,7 @@ export type GlobalState = {
   lastBlockUpdateTimestamp?: number;
   arweaveDataProvider: ArweaveCompositeDataProvider;
   arioContract: AoARIORead | AoARIOWrite;
-  hyperbeamUrl: string;
+  hyperbeamUrl?: string;
 };
 
 const initialState: GlobalState = {
@@ -115,7 +115,7 @@ const initialState: GlobalState = {
   turboNetwork: initialTurboNetwork,
   aoClient: connect(initialAoNetwork.ARIO),
   antAoClient: connect(initialAoNetwork.ANT),
-  hyperbeamUrl: NETWORK_DEFAULTS.AO.ARIO.HYPERBEAM_URL,
+  hyperbeamUrl: NETWORK_DEFAULTS.AO.ARIO.HYPERBEAM_URL || undefined,
   blockHeight: undefined,
   lastBlockUpdateTimestamp: undefined,
   arweaveDataProvider: new ArweaveCompositeDataProvider({
diff --git a/src/state/reducers/GlobalReducer.ts b/src/state/reducers/GlobalReducer.ts
index e7a59006a..ba39ca358 100644
--- a/src/state/reducers/GlobalReducer.ts
+++ b/src/state/reducers/GlobalReducer.ts
@@ -43,6 +43,10 @@ export type GlobalAction =
   | {
       type: 'setIoTicker';
       payload: string;
+    }
+  | {
+      type: 'setHyperbeamUrl';
+      payload: string | undefined;
     };
 
 export const reducer = (
@@ -103,6 +107,11 @@ export const reducer = (
         ...state,
         arioProcessId: action.payload,
       };
+    case 'setHyperbeamUrl':
+      return {
+        ...state,
+        hyperbeamUrl: action.payload,
+      };
     default:
       return state;
   }
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 06a65e9aa..ef44c2a3f 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -126,10 +126,6 @@ export const STRIPE_PUBLISHABLE_KEY =
 
 export const NETWORK_DEFAULTS = {
   AO: {
-    HYPERBEAM: {
-      URL: 'https://hyperbeam.ario.permaweb.services',
-      ENABLED: false,
-    },
     ARIO: {
       CU_URL: ARIO_AO_CU_URL, // ao public cu: https://cu.ao-testnet.xyz
       MU_URL: 'https://mu.ao-testnet.xyz',

From d667f329a3c83e108ca4eb263e89d06f4f182611 Mon Sep 17 00:00:00 2001
From: atticusofsparta <atticusofsparta@protonmail.com>
Date: Thu, 17 Jul 2025 10:09:36 -0600
Subject: [PATCH 06/13] fix(hyperbeamUrl): add hb url to configs and persist
 setting

---
 ._dist                                        | Bin 0 -> 4096 bytes
 .../data-display/tables/DomainsTable.tsx      |   3 ++-
 .../layout/Breadcrumbs/Breadcrumbs.tsx        |   3 ++-
 .../PrimaryNameModal/PrimaryNameModal.tsx     |   3 ++-
 .../ReassignNameModal/ReassignNameModal.tsx   |   1 +
 .../ReturnNameModal/ReturnNameModal.tsx       |   1 +
 .../UpgradeDomainModal/UpgradeDomainModal.tsx |   6 +++--
 .../UpgradeDomainsModal.tsx                   |   7 +++--
 src/components/pages/Manage/Manage.tsx        |   3 ++-
 src/components/pages/Register/Checkout.tsx    |   3 ++-
 .../pages/Transaction/TransactionReview.tsx   |   3 ++-
 src/hooks/useDomainInfo.tsx                   |  16 ++++++++---
 src/hooks/useSyncSettings/useSyncSettings.tsx |  25 +++++++++++++++---
 src/state/actions/dispatchANTInteraction.ts   |   2 ++
 src/state/actions/dispatchANTUpdate.ts        |   3 +++
 src/state/actions/dispatchArIOInteraction.ts  |   5 ++--
 src/state/actions/dispatchArNSUpdate.ts       |   3 +++
 src/state/contexts/ArNSState.tsx              |   8 +++---
 src/state/contexts/GlobalState.tsx            |   5 +++-
 src/state/contexts/TransactionState.tsx       |   3 ++-
 20 files changed, 79 insertions(+), 24 deletions(-)
 create mode 100644 ._dist

diff --git a/._dist b/._dist
new file mode 100644
index 0000000000000000000000000000000000000000..aeb70832a7e153adb5f9b2abbe3b2453a02820ee
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vf+zv$
zV3+~K+-O=D5#plB`MG+D1qC^&dId%KWvO|IdC92^j7$tlk@sJ1c%HKaP3tIkGz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nu!jJsvkAgrAQzI6S*%c$TAW{6l$@%N
ymS2>ukeOGKnpcvUpO=`EQ>l=XnpUEal#`g34eSd;bq#3>)&Fp>$S}zL{|^9N*C{pt

literal 0
HcmV?d00001

diff --git a/src/components/data-display/tables/DomainsTable.tsx b/src/components/data-display/tables/DomainsTable.tsx
index 3f84f713a..f0ca793f3 100644
--- a/src/components/data-display/tables/DomainsTable.tsx
+++ b/src/components/data-display/tables/DomainsTable.tsx
@@ -121,7 +121,7 @@ const DomainsTable = ({
   const navigate = useNavigate();
   const [searchParams] = useSearchParams();
   const [{ walletAddress }] = useWalletState();
-  const [{ arioProcessId, aoNetwork }] = useGlobalState();
+  const [{ arioProcessId, aoNetwork, hyperbeamUrl }] = useGlobalState();
   const [{ loading: loadingArnsState }, dispatchArNSState] = useArNSState();
   const { data: antVersion } = useLatestANTVersion();
   const antModuleId = antVersion?.moduleId ?? null;
@@ -362,6 +362,7 @@ const DomainsTable = ({
                       aoNetwork,
                       queryClient,
                       walletAddress,
+                      hyperbeamUrl,
                       dispatch: dispatchArNSState,
                     });
                   }}
diff --git a/src/components/layout/Breadcrumbs/Breadcrumbs.tsx b/src/components/layout/Breadcrumbs/Breadcrumbs.tsx
index c0f77c11e..b1c22b0a2 100644
--- a/src/components/layout/Breadcrumbs/Breadcrumbs.tsx
+++ b/src/components/layout/Breadcrumbs/Breadcrumbs.tsx
@@ -24,7 +24,7 @@ export type NavItem = {
 export const ANT_FLAG = 'ant-flag';
 
 function Breadcrumbs() {
-  const [{ aoNetwork }] = useGlobalState();
+  const [{ aoNetwork, hyperbeamUrl }] = useGlobalState();
   const queryClient = useQueryClient();
   const location = useLocation();
   const path = location.pathname.split('/');
@@ -63,6 +63,7 @@ function Breadcrumbs() {
           buildDomainInfoQuery({
             antId: processId,
             aoNetwork,
+            hyperbeamUrl,
           }),
         );
         const name = domainInfo?.name;
diff --git a/src/components/modals/PrimaryNameModal/PrimaryNameModal.tsx b/src/components/modals/PrimaryNameModal/PrimaryNameModal.tsx
index 8cabfa3a2..eadc71db1 100644
--- a/src/components/modals/PrimaryNameModal/PrimaryNameModal.tsx
+++ b/src/components/modals/PrimaryNameModal/PrimaryNameModal.tsx
@@ -182,7 +182,7 @@ function PrimaryNameModal({
             processId: arioProcessId,
             fundFrom: fundingSource,
             dispatch: dispatchTransactionState,
-            aoNetwork,
+
             hyperbeamUrl,
           });
 
@@ -241,6 +241,7 @@ function PrimaryNameModal({
         aoNetwork: aoNetwork,
         walletAddress,
         queryClient,
+        hyperbeamUrl,
       });
 
       closeModal();
diff --git a/src/components/modals/ant-management/ReassignNameModal/ReassignNameModal.tsx b/src/components/modals/ant-management/ReassignNameModal/ReassignNameModal.tsx
index 1c34779e2..2fcc8ce0f 100644
--- a/src/components/modals/ant-management/ReassignNameModal/ReassignNameModal.tsx
+++ b/src/components/modals/ant-management/ReassignNameModal/ReassignNameModal.tsx
@@ -168,6 +168,7 @@ export function ReassignNameModal({
         arioProcessId,
         dispatch: dispatchArNSState,
         aoNetworkSettings: aoNetwork,
+        hyperbeamUrl,
       });
       handleClose();
     } catch (error) {
diff --git a/src/components/modals/ant-management/ReturnNameModal/ReturnNameModal.tsx b/src/components/modals/ant-management/ReturnNameModal/ReturnNameModal.tsx
index 7bd503d57..75567da20 100644
--- a/src/components/modals/ant-management/ReturnNameModal/ReturnNameModal.tsx
+++ b/src/components/modals/ant-management/ReturnNameModal/ReturnNameModal.tsx
@@ -92,6 +92,7 @@ export function ReturnNameModal({
         arioProcessId,
         dispatch: dispatchArNSState,
         aoNetworkSettings: aoNetwork,
+        hyperbeamUrl,
       });
       setShow(false);
       navigate('/manage');
diff --git a/src/components/modals/ant-management/UpgradeDomainModal/UpgradeDomainModal.tsx b/src/components/modals/ant-management/UpgradeDomainModal/UpgradeDomainModal.tsx
index 7ebdedd62..110e6b4fd 100644
--- a/src/components/modals/ant-management/UpgradeDomainModal/UpgradeDomainModal.tsx
+++ b/src/components/modals/ant-management/UpgradeDomainModal/UpgradeDomainModal.tsx
@@ -37,8 +37,9 @@ function UpgradeDomainModal({
   domain: string;
 }) {
   const queryClient = useQueryClient();
-  const [{ antAoClient, aoNetwork, arioContract, arioProcessId }] =
-    useGlobalState();
+  const [
+    { antAoClient, aoNetwork, arioContract, arioProcessId, hyperbeamUrl },
+  ] = useGlobalState();
   const [, dispatchArNSState] = useArNSState();
   const [{ wallet, walletAddress }] = useWalletState();
   const [, dispatchTransactionState] = useTransactionState();
@@ -74,6 +75,7 @@ function UpgradeDomainModal({
           arioContract,
           arioProcessId,
           aoNetwork,
+          hyperbeamUrl,
           wallet,
         }),
       );
diff --git a/src/components/modals/ant-management/UpgradeDomainsModal/UpgradeDomainsModal.tsx b/src/components/modals/ant-management/UpgradeDomainsModal/UpgradeDomainsModal.tsx
index be5a2ef7b..69ec7054e 100644
--- a/src/components/modals/ant-management/UpgradeDomainsModal/UpgradeDomainsModal.tsx
+++ b/src/components/modals/ant-management/UpgradeDomainsModal/UpgradeDomainsModal.tsx
@@ -41,8 +41,9 @@ function UpgradeDomainsModal({
   visible: boolean;
   setVisible: (visible: boolean) => void;
 }) {
-  const [{ antAoClient, aoNetwork, arioProcessId, arioContract }] =
-    useGlobalState();
+  const [
+    { antAoClient, aoNetwork, arioProcessId, arioContract, hyperbeamUrl },
+  ] = useGlobalState();
   const [{ wallet, walletAddress }] = useWalletState();
   const [accepted, setAccepted] = useState(false);
   const [domainsToUpgrade, setDomainsToUpgrade] = useState<string[]>([]);
@@ -104,6 +105,7 @@ function UpgradeDomainsModal({
                   arioContract,
                   arioProcessId,
                   aoNetwork,
+                  hyperbeamUrl,
                   wallet,
                 }),
               );
@@ -185,6 +187,7 @@ function UpgradeDomainsModal({
         walletAddress: walletAddress!,
         arioProcessId: arioProcessId,
         aoNetworkSettings: aoNetwork,
+        hyperbeamUrl,
       });
       handleClose();
     }
diff --git a/src/components/pages/Manage/Manage.tsx b/src/components/pages/Manage/Manage.tsx
index f792f3cc8..4e08b9094 100644
--- a/src/components/pages/Manage/Manage.tsx
+++ b/src/components/pages/Manage/Manage.tsx
@@ -16,7 +16,7 @@ import { RefreshIcon, SearchIcon } from '../../icons';
 import './styles.css';
 
 function Manage() {
-  const [{ arioProcessId, aoNetwork }] = useGlobalState();
+  const [{ arioProcessId, aoNetwork, hyperbeamUrl }] = useGlobalState();
   const [{ loading: loadingArnsState, domains, ants }, dispatchArNSState] =
     useArNSState();
   const { data: antVersion } = useLatestANTVersion();
@@ -100,6 +100,7 @@ function Manage() {
                           walletAddress: walletAddress,
                           arioProcessId,
                           aoNetworkSettings: aoNetwork,
+                          hyperbeamUrl,
                         })
                       : eventEmitter.emit('error', {
                           name: 'Manage Assets',
diff --git a/src/components/pages/Register/Checkout.tsx b/src/components/pages/Register/Checkout.tsx
index 62d7366c1..15f877476 100644
--- a/src/components/pages/Register/Checkout.tsx
+++ b/src/components/pages/Register/Checkout.tsx
@@ -331,7 +331,7 @@ function Checkout() {
             ? 'turbo'
             : fundingSource,
         turboArNSClient: turbo,
-        aoNetwork,
+
         hyperbeamUrl,
       });
     } catch (error) {
@@ -343,6 +343,7 @@ function Checkout() {
           arioProcessId,
           walletAddress,
           aoNetworkSettings: aoNetwork,
+          hyperbeamUrl,
         });
       }
     }
diff --git a/src/components/pages/Transaction/TransactionReview.tsx b/src/components/pages/Transaction/TransactionReview.tsx
index 952e15ab0..77baeb499 100644
--- a/src/components/pages/Transaction/TransactionReview.tsx
+++ b/src/components/pages/Transaction/TransactionReview.tsx
@@ -125,7 +125,7 @@ function TransactionReview() {
         ao: aoClient,
         scheduler: aoNetwork.ARIO.SCHEDULER,
         fundFrom: fundingSource,
-        aoNetwork,
+
         hyperbeamUrl,
       });
     } catch (error) {
@@ -137,6 +137,7 @@ function TransactionReview() {
           arioProcessId,
           walletAddress,
           aoNetworkSettings: aoNetwork,
+          hyperbeamUrl,
         });
       }
     }
diff --git a/src/hooks/useDomainInfo.tsx b/src/hooks/useDomainInfo.tsx
index c1a216e80..d7711de7c 100644
--- a/src/hooks/useDomainInfo.tsx
+++ b/src/hooks/useDomainInfo.tsx
@@ -58,6 +58,7 @@ export function buildDomainInfoQuery({
   arioProcessId,
   aoNetwork,
   wallet,
+  hyperbeamUrl,
 }: {
   domain?: string;
   antId?: string;
@@ -65,14 +66,21 @@ export function buildDomainInfoQuery({
   arioProcessId?: string;
   aoNetwork: typeof NETWORK_DEFAULTS.AO;
   wallet?: ArNSWalletConnector;
+  hyperbeamUrl?: string;
 }): Parameters<typeof useQuery<DomainInfo>>[0] {
   return {
     // we are verbose here to enable predictable keys. Passing in the entire params as a single object can have unpredictable side effects
-    queryKey: ['domainInfo', domain, antId, arioProcessId, aoNetwork],
+    queryKey: [
+      'domainInfo',
+      domain,
+      antId,
+      arioProcessId,
+      aoNetwork,
+      hyperbeamUrl,
+    ],
     queryFn: async () => {
       const errors: Error[] = [];
       const antAo = connect(aoNetwork.ANT);
-      const hyperbeamUrl = aoNetwork.ANT.HYPERBEAM_URL;
 
       const arnsRecords =
         domain && arioContract && arioProcessId
@@ -198,7 +206,8 @@ export default function useDomainInfo({
   domain?: string;
   antId?: string;
 }) {
-  const [{ arioContract, arioProcessId, aoNetwork }] = useGlobalState();
+  const [{ arioContract, arioProcessId, aoNetwork, hyperbeamUrl }] =
+    useGlobalState();
   const [{ wallet }] = useWalletState();
 
   // TODO: this should be modified or removed
@@ -209,6 +218,7 @@ export default function useDomainInfo({
       aoNetwork,
       arioContract,
       arioProcessId,
+      hyperbeamUrl,
       wallet,
     }),
   );
diff --git a/src/hooks/useSyncSettings/useSyncSettings.tsx b/src/hooks/useSyncSettings/useSyncSettings.tsx
index c4f764cbd..b59ee8240 100644
--- a/src/hooks/useSyncSettings/useSyncSettings.tsx
+++ b/src/hooks/useSyncSettings/useSyncSettings.tsx
@@ -1,10 +1,11 @@
 import { useGlobalState, useWalletState } from '@src/state';
-import { useEffect } from 'react';
+import { useEffect, useRef } from 'react';
 
 const SETTINGS_STORAGE_KEY = 'arNS_settings';
 
 interface NetworkSettings {
   gateway: string;
+  hyperbeamUrl?: string;
   aoNetwork: {
     ARIO: {
       CU_URL: string;
@@ -39,9 +40,10 @@ interface Settings {
 }
 
 function useSyncSettings() {
-  const [{ gateway, aoNetwork, turboNetwork, arioProcessId }] =
+  const [{ gateway, hyperbeamUrl, aoNetwork, turboNetwork, arioProcessId }] =
     useGlobalState();
   const [{ walletAddress }] = useWalletState();
+  const isInitialLoad = useRef(true);
 
   // Save settings when they change
   useEffect(() => {
@@ -49,9 +51,19 @@ function useSyncSettings() {
       return;
     }
 
+    // Skip saving on initial load when hyperbeamUrl is undefined
+    // This prevents overwriting saved settings with undefined on first load
+    if (isInitialLoad.current && hyperbeamUrl === undefined) {
+      isInitialLoad.current = false;
+      return;
+    }
+
+    isInitialLoad.current = false;
+
     const settings: Settings = {
       network: {
         gateway,
+        hyperbeamUrl,
         aoNetwork,
         turboNetwork,
       },
@@ -73,7 +85,14 @@ function useSyncSettings() {
     } catch (error) {
       console.error('Failed to save settings to localStorage:', error);
     }
-  }, [walletAddress, gateway, aoNetwork, turboNetwork, arioProcessId]);
+  }, [
+    walletAddress,
+    gateway,
+    hyperbeamUrl,
+    aoNetwork,
+    turboNetwork,
+    arioProcessId,
+  ]);
 
   return null;
 }
diff --git a/src/state/actions/dispatchANTInteraction.ts b/src/state/actions/dispatchANTInteraction.ts
index 26f64f7cb..a8a43260b 100644
--- a/src/state/actions/dispatchANTInteraction.ts
+++ b/src/state/actions/dispatchANTInteraction.ts
@@ -256,6 +256,7 @@ export default async function dispatchANTInteraction({
           buildDomainInfoQuery({
             antId: processId,
             aoNetwork: NETWORK_DEFAULTS.AO,
+            hyperbeamUrl,
           }),
         );
 
@@ -320,6 +321,7 @@ export default async function dispatchANTInteraction({
             buildDomainInfoQuery({
               antId: newAntId,
               aoNetwork: NETWORK_DEFAULTS.AO,
+              hyperbeamUrl,
             }),
           )
           .catch((e) => console.error(e));
diff --git a/src/state/actions/dispatchANTUpdate.ts b/src/state/actions/dispatchANTUpdate.ts
index 7c260ef0c..29b216fcf 100644
--- a/src/state/actions/dispatchANTUpdate.ts
+++ b/src/state/actions/dispatchANTUpdate.ts
@@ -13,6 +13,7 @@ export async function dispatchANTUpdate({
   processId,
   dispatch,
   aoNetwork,
+  hyperbeamUrl,
 }: {
   queryClient: QueryClient;
   domain?: string;
@@ -20,6 +21,7 @@ export async function dispatchANTUpdate({
   walletAddress: AoAddress;
   dispatch: Dispatch<ArNSAction>;
   aoNetwork: typeof NETWORK_DEFAULTS.AO;
+  hyperbeamUrl?: string;
 }) {
   try {
     dispatch({
@@ -55,6 +57,7 @@ export async function dispatchANTUpdate({
         buildDomainInfoQuery({
           antId: processId,
           aoNetwork,
+          hyperbeamUrl,
         }),
       )
       .catch((e) => console.error(e));
diff --git a/src/state/actions/dispatchArIOInteraction.ts b/src/state/actions/dispatchArIOInteraction.ts
index 4450feea9..9e5e4acae 100644
--- a/src/state/actions/dispatchArIOInteraction.ts
+++ b/src/state/actions/dispatchArIOInteraction.ts
@@ -21,7 +21,7 @@ import {
   ContractInteraction,
 } from '@src/types';
 import { createAntStateForOwner, lowerCaseDomain, sleep } from '@src/utils';
-import { NETWORK_DEFAULTS, WRITE_OPTIONS } from '@src/utils/constants';
+import { WRITE_OPTIONS } from '@src/utils/constants';
 import eventEmitter from '@src/utils/events';
 import { queryClient } from '@src/utils/network';
 import { Dispatch } from 'react';
@@ -36,7 +36,6 @@ export default async function dispatchArIOInteraction({
   signer,
   ao,
   antAo,
-  aoNetwork,
   hyperbeamUrl,
   scheduler = DEFAULT_SCHEDULER_ID,
   fundFrom,
@@ -51,7 +50,7 @@ export default async function dispatchArIOInteraction({
   signer?: ContractSigner;
   ao?: AoClient;
   antAo?: AoClient;
-  aoNetwork: typeof NETWORK_DEFAULTS.AO;
+
   hyperbeamUrl?: string;
   scheduler?: string;
   fundFrom?: FundFrom | 'fiat';
diff --git a/src/state/actions/dispatchArNSUpdate.ts b/src/state/actions/dispatchArNSUpdate.ts
index ad65d1a8f..3b4193985 100644
--- a/src/state/actions/dispatchArNSUpdate.ts
+++ b/src/state/actions/dispatchArNSUpdate.ts
@@ -27,11 +27,13 @@ export async function dispatchArNSUpdate({
   walletAddress,
   arioProcessId,
   aoNetworkSettings,
+  hyperbeamUrl,
 }: {
   dispatch: Dispatch<ArNSAction>;
   walletAddress: AoAddress;
   arioProcessId: string;
   aoNetworkSettings: typeof NETWORK_DEFAULTS.AO;
+  hyperbeamUrl?: string;
 }) {
   try {
     const ao = connect(aoNetworkSettings.ARIO);
@@ -137,6 +139,7 @@ export async function dispatchArNSUpdate({
           buildDomainInfoQuery({
             antId: id,
             aoNetwork: aoNetworkSettings,
+            hyperbeamUrl,
           }),
         );
         // if the user is not associated with the ant, do not load it
diff --git a/src/state/contexts/ArNSState.tsx b/src/state/contexts/ArNSState.tsx
index d010617de..4e516bcbb 100644
--- a/src/state/contexts/ArNSState.tsx
+++ b/src/state/contexts/ArNSState.tsx
@@ -65,8 +65,9 @@ export function ArNSStateProvider({
   reducer,
   children,
 }: ArNSStateProviderProps): JSX.Element {
-  const [{ arioContract, arioProcessId, antAoClient, aoNetwork }] =
-    useGlobalState();
+  const [
+    { arioContract, arioProcessId, antAoClient, aoNetwork, hyperbeamUrl },
+  ] = useGlobalState();
   const [state, dispatchArNSState] = useReducer(reducer, initialArNSState);
   const [{ walletAddress }] = useWalletState();
 
@@ -89,8 +90,9 @@ export function ArNSStateProvider({
       walletAddress: walletAddress,
       arioProcessId: arioProcessId,
       aoNetworkSettings: aoNetwork,
+      hyperbeamUrl,
     });
-  }, [walletAddress, aoNetwork, arioProcessId]);
+  }, [walletAddress, aoNetwork, arioProcessId, hyperbeamUrl]);
 
   return (
     <ArNSStateContext.Provider value={[state, dispatchArNSState]}>
diff --git a/src/state/contexts/GlobalState.tsx b/src/state/contexts/GlobalState.tsx
index 12f424aaf..c8a4c84cc 100644
--- a/src/state/contexts/GlobalState.tsx
+++ b/src/state/contexts/GlobalState.tsx
@@ -33,6 +33,7 @@ function loadSettingsFromStorage(): {
   aoNetwork: typeof NETWORK_DEFAULTS.AO;
   turboNetwork: typeof NETWORK_DEFAULTS.TURBO;
   arioProcessId: string;
+  hyperbeamUrl?: string;
 } | null {
   try {
     // Try to get the last used wallet address from localStorage
@@ -62,6 +63,7 @@ function loadSettingsFromStorage(): {
           turboNetwork:
             settings.network?.turboNetwork || NETWORK_DEFAULTS.TURBO,
           arioProcessId: settings.arns?.arioProcessId || ARIO_PROCESS_ID,
+          hyperbeamUrl: settings.network?.hyperbeamUrl,
         };
       }
     }
@@ -81,6 +83,7 @@ const initialAoNetwork = savedSettings?.aoNetwork || NETWORK_DEFAULTS.AO;
 const initialTurboNetwork =
   savedSettings?.turboNetwork || NETWORK_DEFAULTS.TURBO;
 const initialArioProcessId = savedSettings?.arioProcessId || ARIO_PROCESS_ID;
+const initialHyperbeamUrl = savedSettings?.hyperbeamUrl;
 
 export const defaultArIO = ARIO.init({
   paymentUrl: initialTurboNetwork.PAYMENT_URL,
@@ -115,7 +118,7 @@ const initialState: GlobalState = {
   turboNetwork: initialTurboNetwork,
   aoClient: connect(initialAoNetwork.ARIO),
   antAoClient: connect(initialAoNetwork.ANT),
-  hyperbeamUrl: NETWORK_DEFAULTS.AO.ARIO.HYPERBEAM_URL || undefined,
+  hyperbeamUrl: initialHyperbeamUrl,
   blockHeight: undefined,
   lastBlockUpdateTimestamp: undefined,
   arweaveDataProvider: new ArweaveCompositeDataProvider({
diff --git a/src/state/contexts/TransactionState.tsx b/src/state/contexts/TransactionState.tsx
index 39e1f7189..d3863c5d9 100644
--- a/src/state/contexts/TransactionState.tsx
+++ b/src/state/contexts/TransactionState.tsx
@@ -58,7 +58,7 @@ export function TransactionStateProvider({
   );
 
   const queryClient = useQueryClient();
-  const [{ aoNetwork }] = useGlobalState();
+  const [{ aoNetwork, hyperbeamUrl }] = useGlobalState();
   const [walletState] = useWalletState();
   const [, dispatchArNSState] = useArNSState();
 
@@ -93,6 +93,7 @@ export function TransactionStateProvider({
         walletAddress: walletState.walletAddress,
         dispatch: dispatchArNSState,
         aoNetwork,
+        hyperbeamUrl,
       });
     }
   }, [state.interactionResult, queryClient, walletState]);

From 95e4e93052cb8dd2f92e28ff2f2274909f39db6c Mon Sep 17 00:00:00 2001
From: atticusofsparta <atticusofsparta@protonmail.com>
Date: Wed, 23 Jul 2025 07:57:36 -0600
Subject: [PATCH 07/13] fix(settings): update settings page with hyperbeam URL
 and fix other inputs

---
 .../pages/Settings/NetworkSettings.tsx        | 109 +++++++++++++++---
 src/hooks/useTurboArNSClient.tsx              |   6 +-
 src/state/contexts/GlobalState.tsx            |  10 +-
 yarn.lock                                     |  20 +---
 4 files changed, 108 insertions(+), 37 deletions(-)

diff --git a/src/components/pages/Settings/NetworkSettings.tsx b/src/components/pages/Settings/NetworkSettings.tsx
index accf675e0..195a21fe6 100644
--- a/src/components/pages/Settings/NetworkSettings.tsx
+++ b/src/components/pages/Settings/NetworkSettings.tsx
@@ -11,7 +11,6 @@ import {
   dispatchArIOContract,
   dispatchNewGateway,
   useGlobalState,
-  useWalletState,
 } from '@src/state';
 import { isArweaveTransactionID, isValidGateway, isValidURL } from '@src/utils';
 import { NETWORK_DEFAULTS } from '@src/utils/constants';
@@ -25,27 +24,34 @@ import './styles.css';
 
 function NetworkSettings() {
   const [
-    { gateway, aoNetwork, arioProcessId, arioContract, turboNetwork },
+    {
+      gateway,
+      aoNetwork,
+      arioProcessId,
+      arioContract,
+      turboNetwork,
+      hyperbeamUrl,
+    },
     dispatchGlobalState,
   ] = useGlobalState();
-  const [{ wallet }] = useWalletState();
   const [newGateway, setNewGateway] = useState<string>(gateway);
   const [validGateway, setValidGateway] = useState<boolean>(true);
-  const [newCuUrl, setNewCuUrl] = useState<string>(
-    NETWORK_DEFAULTS.AO.ARIO.CU_URL,
-  );
+  const [newCuUrl, setNewCuUrl] = useState<string>(aoNetwork.ARIO.CU_URL);
   const [validCuUrl, setValidCuUrl] = useState<boolean>(true);
-  const [newMuUrl, setNewMuUrl] = useState<string>(
-    NETWORK_DEFAULTS.AO.ARIO.MU_URL,
-  );
+  const [newMuUrl, setNewMuUrl] = useState<string>(aoNetwork.ARIO.MU_URL);
   const [validMuUrl, setValidMuUrl] = useState<boolean>(true);
   const [newSuAddress, setNewSuAddress] = useState<string>(
-    NETWORK_DEFAULTS.AO.ARIO.SCHEDULER,
+    aoNetwork.ARIO.SCHEDULER,
   );
   const [suUrl, setSuUrl] = useState<string>();
   const [validSuAddress, setValidSuAddress] = useState<boolean>(true);
   const [showGatewayModal, setShowGatewayModal] = useState<boolean>(false);
 
+  const [newHyperbeamUrl, setNewHyperbeamUrl] = useState<string>(
+    hyperbeamUrl || '',
+  );
+  const [validHyperbeamUrl, setValidHyperbeamUrl] = useState<boolean>(true);
+
   function reset() {
     // gateway
     setNewGateway(NETWORK_DEFAULTS.ARWEAVE.HOST);
@@ -63,6 +69,13 @@ function NetworkSettings() {
       MU_URL: NETWORK_DEFAULTS.AO.ARIO.MU_URL,
       SCHEDULER: NETWORK_DEFAULTS.AO.ARIO.SCHEDULER,
     });
+    // hyperbeam network
+    setNewHyperbeamUrl(NETWORK_DEFAULTS.AO.ARIO.HYPERBEAM_URL || '');
+    setValidHyperbeamUrl(true);
+    dispatchGlobalState({
+      type: 'setHyperbeamUrl',
+      payload: NETWORK_DEFAULTS.AO.ARIO.HYPERBEAM_URL || undefined,
+    });
   }
 
   useEffect(() => {
@@ -79,6 +92,11 @@ function NetworkSettings() {
     setValidSuAddress(true);
   }, [aoNetwork]);
 
+  useEffect(() => {
+    setNewHyperbeamUrl(hyperbeamUrl || '');
+    setValidHyperbeamUrl(true);
+  }, [hyperbeamUrl]);
+
   useEffect(() => {
     async function updateSUUrl(suAddress: string) {
       try {
@@ -106,7 +124,8 @@ function NetworkSettings() {
         console.error(error);
         throw new Error('Gateway not available: ' + gate);
       });
-      if (wallet) dispatchNewGateway(gate, arioContract, dispatchGlobalState);
+      // Always try to update gateway
+      dispatchNewGateway(gate, arioContract, dispatchGlobalState);
     } catch (error) {
       eventEmitter.emit('error', error);
       eventEmitter.emit('error', {
@@ -126,8 +145,7 @@ function NetworkSettings() {
     try {
       const newConfig = {
         ...aoNetwork,
-        ...config,
-        GATEWAY_URL: gateway,
+        ...{ ARIO: { ...aoNetwork.ARIO, ...config, GATEWAY_URL: gateway } },
       };
       dispatchGlobalState({
         type: 'setAONetwork',
@@ -136,8 +154,8 @@ function NetworkSettings() {
 
       const ao = connect({
         GATEWAY_URL: 'https://' + gateway,
-        CU_URL: newConfig.CU_URL,
-        MU_URL: newConfig.MU_URL,
+        CU_URL: newConfig.ARIO.CU_URL,
+        MU_URL: newConfig.ARIO.MU_URL,
         MODE: 'legacy' as const,
       });
       dispatchGlobalState({
@@ -407,6 +425,67 @@ function NetworkSettings() {
               }
             />
           </div>
+
+          <div className={inputContainerClass}>
+            <span className={labelClass}>
+              Current Hyperbeam URL:{' '}
+              <span className="text-grey pl-2">{hyperbeamUrl || ''}</span>
+              {!hyperbeamUrl && (
+                <span className="text-red-500 font-bold pl-2">DISABLED</span>
+              )}
+            </span>
+            <Input
+              className={inputClass}
+              prefixCls="settings-input"
+              placeholder="Enter custom Hyperbeam URL"
+              value={newHyperbeamUrl}
+              onChange={(e) => {
+                setValidHyperbeamUrl(isValidURL(e.target.value.trim()));
+                setNewHyperbeamUrl(e.target.value);
+              }}
+              onClear={() => setNewHyperbeamUrl('')}
+              onPressEnter={(e) =>
+                dispatchGlobalState({
+                  type: 'setHyperbeamUrl',
+                  payload: e.currentTarget.value.trim(),
+                })
+              }
+              variant="outlined"
+              status={validHyperbeamUrl ? '' : 'error'}
+              addonAfter={
+                <div className="flex flex-row" style={{ gap: '4px' }}>
+                  <button
+                    disabled={!validHyperbeamUrl}
+                    className={setButtonClass}
+                    onClick={() =>
+                      dispatchGlobalState({
+                        type: 'setHyperbeamUrl',
+                        payload: newHyperbeamUrl.trim(),
+                      })
+                    }
+                  >
+                    Set
+                  </button>
+                  <button
+                    className={resetIconClass}
+                    onClick={() => {
+                      setNewHyperbeamUrl(
+                        NETWORK_DEFAULTS.AO.ARIO.HYPERBEAM_URL || '',
+                      );
+                      setValidHyperbeamUrl(true);
+                      dispatchGlobalState({
+                        type: 'setHyperbeamUrl',
+                        payload:
+                          NETWORK_DEFAULTS.AO.ARIO.HYPERBEAM_URL || undefined,
+                      });
+                    }}
+                  >
+                    <RotateCcw width={'16px'} />
+                  </button>
+                </div>
+              }
+            />
+          </div>
           <div className="flex flex-col p-2 w-wfull h-full justify-end items-end">
             <button
               className="whitespace-nowrap flex flex-nowrap justify-center items-center gap-2 py-2 px-3 w-fit text-white border border-primary-thin hover:bg-primary hover:text-black bg-metallic-grey rounded-md transition-all"
diff --git a/src/hooks/useTurboArNSClient.tsx b/src/hooks/useTurboArNSClient.tsx
index 505f5122b..9aea5dc2f 100644
--- a/src/hooks/useTurboArNSClient.tsx
+++ b/src/hooks/useTurboArNSClient.tsx
@@ -15,7 +15,11 @@ export function useTurboArNSClient() {
       walletAddress: walletAddress?.toString(),
       paymentUrl: turboNetwork.PAYMENT_URL,
       stripe,
-      ao: connect(aoNetwork.ARIO),
+      ao: connect({
+        CU_URL: aoNetwork.ARIO.CU_URL,
+        MU_URL: aoNetwork.ARIO.MU_URL,
+        MODE: 'legacy',
+      }),
     });
   }, [walletAddress, wallet, turboNetwork, stripe]);
 }
diff --git a/src/state/contexts/GlobalState.tsx b/src/state/contexts/GlobalState.tsx
index 27e1ce910..0ac0c6452 100644
--- a/src/state/contexts/GlobalState.tsx
+++ b/src/state/contexts/GlobalState.tsx
@@ -127,8 +127,14 @@ const initialState: GlobalState = {
   gateway: initialGateway,
   aoNetwork: initialAoNetwork,
   turboNetwork: initialTurboNetwork,
-  aoClient: connect(initialAoNetwork.ARIO),
-  antAoClient: connect(initialAoNetwork.ANT),
+  aoClient: connect({
+    ...initialAoNetwork.ARIO,
+    GATEWAY_URL: 'https://' + initialGateway,
+  }),
+  antAoClient: connect({
+    ...initialAoNetwork.ANT,
+    GATEWAY_URL: 'https://' + initialGateway,
+  }),
   hyperbeamUrl: initialHyperbeamUrl,
   blockHeight: undefined,
   lastBlockUpdateTimestamp: undefined,
diff --git a/yarn.lock b/yarn.lock
index 8858cadc9..9d6ed9839 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -93,7 +93,7 @@
     resize-observer-polyfill "^1.5.1"
     throttle-debounce "^5.0.0"
 
-"@ar.io/sdk@3.14.0":
+"@ar.io/sdk@3.14.0", "@ar.io/sdk@^3.10.1":
   version "3.14.0"
   resolved "https://registry.yarnpkg.com/@ar.io/sdk/-/sdk-3.14.0.tgz#aadfd03ca157d017265df39b12c8f57633303ee5"
   integrity sha512-1moIb3CZzS7qu16K7CM8nc4vzuG4AHzXLVo711P+s5mSioZ235wshiXDJscQ2kZku4m/XpLSo1eEYv300AgAEA==
@@ -111,24 +111,6 @@
     winston "^3.13.0"
     zod "^3.23.8"
 
-"@ar.io/sdk@^3.14.1-alpha.1":
-  version "3.14.1-alpha.1"
-  resolved "https://registry.npmjs.org/@ar.io/sdk/-/sdk-3.14.1-alpha.1.tgz#bd782eda426a3076a0218ed714425d5cfb40d94a"
-  integrity sha512-Fc6prGVeC4kuWV5UoSGUMCAKvOqEvl1coJ5uqRtvLxHOQBezG0ZGjAcSGz6tKaW3vfzthrzxkaTt9NvJEceW/A==
-  dependencies:
-    "@dha-team/arbundles" "^1.0.1"
-    "@permaweb/aoconnect" "0.0.68"
-    arweave "1.15.5"
-    axios "1.8.4"
-    axios-retry "^4.3.0"
-    commander "^12.1.0"
-    eventemitter3 "^5.0.1"
-    plimit-lit "^3.0.1"
-    prompts "^2.4.2"
-    uuid "^11.1.0"
-    winston "^3.13.0"
-    zod "^3.23.8"
-
 "@ar.io/wayfinder-core@1.0.4", "@ar.io/wayfinder-core@^1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@ar.io/wayfinder-core/-/wayfinder-core-1.0.4.tgz#ffb2a35d07568feb357f751ea055873ca8c8c828"

From a794cbb97cf92d732773efc3650a3221c566ad38 Mon Sep 17 00:00:00 2001
From: Atticus <atticusofsparta@protonmail.com>
Date: Wed, 23 Jul 2025 07:04:08 -0700
Subject: [PATCH 08/13] Update src/hooks/useSyncSettings/useSyncSettings.tsx

Co-authored-by: Dylan Fiedler <dtfiedler@users.noreply.github.com>
---
 src/hooks/useSyncSettings/useSyncSettings.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useSyncSettings/useSyncSettings.tsx b/src/hooks/useSyncSettings/useSyncSettings.tsx
index b59ee8240..6e8222852 100644
--- a/src/hooks/useSyncSettings/useSyncSettings.tsx
+++ b/src/hooks/useSyncSettings/useSyncSettings.tsx
@@ -1,7 +1,7 @@
 import { useGlobalState, useWalletState } from '@src/state';
 import { useEffect, useRef } from 'react';
 
-const SETTINGS_STORAGE_KEY = 'arNS_settings';
+const SETTINGS_STORAGE_KEY = 'arns-app-settings';
 
 interface NetworkSettings {
   gateway: string;

From d713079c827b7fc17bb12b579c4e48bde0ae6c7f Mon Sep 17 00:00:00 2001
From: atticusofsparta <atticusofsparta@protonmail.com>
Date: Wed, 23 Jul 2025 08:11:56 -0600
Subject: [PATCH 09/13] fix(settings): use consistent storage key

---
 src/hooks/useSyncSettings/useSyncSettings.tsx | 2 +-
 src/state/contexts/GlobalState.tsx            | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/hooks/useSyncSettings/useSyncSettings.tsx b/src/hooks/useSyncSettings/useSyncSettings.tsx
index 6e8222852..cac9f572a 100644
--- a/src/hooks/useSyncSettings/useSyncSettings.tsx
+++ b/src/hooks/useSyncSettings/useSyncSettings.tsx
@@ -1,7 +1,7 @@
 import { useGlobalState, useWalletState } from '@src/state';
 import { useEffect, useRef } from 'react';
 
-const SETTINGS_STORAGE_KEY = 'arns-app-settings';
+export const SETTINGS_STORAGE_KEY = 'arns-app-settings';
 
 interface NetworkSettings {
   gateway: string;
diff --git a/src/state/contexts/GlobalState.tsx b/src/state/contexts/GlobalState.tsx
index 0ac0c6452..ad25bef43 100644
--- a/src/state/contexts/GlobalState.tsx
+++ b/src/state/contexts/GlobalState.tsx
@@ -14,6 +14,7 @@ import {
   WayfinderProvider,
 } from '@ar.io/wayfinder-react';
 import { connect } from '@permaweb/aoconnect';
+import { SETTINGS_STORAGE_KEY } from '@src/hooks';
 import eventEmitter from '@src/utils/events';
 import React, {
   Dispatch,
@@ -35,8 +36,6 @@ import {
 } from '../../utils/constants';
 import type { GlobalAction } from '../reducers/GlobalReducer';
 
-const SETTINGS_STORAGE_KEY = 'arNS_settings';
-
 // Function to load settings from localStorage
 function loadSettingsFromStorage(): {
   gateway: string;

From ca26d18b3ca03ddc2da1cdda0565e43950f42f3f Mon Sep 17 00:00:00 2001
From: atticusofsparta <atticusofsparta@protonmail.com>
Date: Wed, 23 Jul 2025 08:13:00 -0600
Subject: [PATCH 10/13] fix(sync settings): remove unnecessary conditional

---
 src/hooks/useSyncSettings/useSyncSettings.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/hooks/useSyncSettings/useSyncSettings.tsx b/src/hooks/useSyncSettings/useSyncSettings.tsx
index cac9f572a..85b7128bf 100644
--- a/src/hooks/useSyncSettings/useSyncSettings.tsx
+++ b/src/hooks/useSyncSettings/useSyncSettings.tsx
@@ -53,10 +53,6 @@ function useSyncSettings() {
 
     // Skip saving on initial load when hyperbeamUrl is undefined
     // This prevents overwriting saved settings with undefined on first load
-    if (isInitialLoad.current && hyperbeamUrl === undefined) {
-      isInitialLoad.current = false;
-      return;
-    }
 
     isInitialLoad.current = false;
 

From 49667657a0a4709885b5c675bcb88286e6d86b2f Mon Sep 17 00:00:00 2001
From: atticusofsparta <atticusofsparta@protonmail.com>
Date: Wed, 23 Jul 2025 10:34:21 -0600
Subject: [PATCH 11/13] fix(placeholders): set example hyperbeam url as
 placeholder ;

---
 ._dist                                           | Bin 4096 -> 0 bytes
 src/components/devtools/NetworkSettings.tsx      |   2 +-
 .../pages/Settings/NetworkSettings.tsx           |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 ._dist

diff --git a/._dist b/._dist
deleted file mode 100644
index aeb70832a7e153adb5f9b2abbe3b2453a02820ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vf+zv$
zV3+~K+-O=D5#plB`MG+D1qC^&dId%KWvO|IdC92^j7$tlk@sJ1c%HKaP3tIkGz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nu!jJsvkAgrAQzI6S*%c$TAW{6l$@%N
ymS2>ukeOGKnpcvUpO=`EQ>l=XnpUEal#`g34eSd;bq#3>)&Fp>$S}zL{|^9N*C{pt

diff --git a/src/components/devtools/NetworkSettings.tsx b/src/components/devtools/NetworkSettings.tsx
index 0419b4b88..da5011e7e 100644
--- a/src/components/devtools/NetworkSettings.tsx
+++ b/src/components/devtools/NetworkSettings.tsx
@@ -603,7 +603,7 @@ function NetworkSettings() {
 
               <Input
                 className="bg-background justify-center items-center"
-                placeholder="Enter custom Hyperbeam URL"
+                placeholder="https://hyperbeam.ario.permaweb.services"
                 value={newHyperbeamUrl}
                 onChange={(e) => {
                   setValidHyperbeamUrl(isValidURL(e.target.value.trim()));
diff --git a/src/components/pages/Settings/NetworkSettings.tsx b/src/components/pages/Settings/NetworkSettings.tsx
index 195a21fe6..36cd6d68c 100644
--- a/src/components/pages/Settings/NetworkSettings.tsx
+++ b/src/components/pages/Settings/NetworkSettings.tsx
@@ -437,7 +437,7 @@ function NetworkSettings() {
             <Input
               className={inputClass}
               prefixCls="settings-input"
-              placeholder="Enter custom Hyperbeam URL"
+              placeholder="https://hyperbeam.ario.permaweb.services"
               value={newHyperbeamUrl}
               onChange={(e) => {
                 setValidHyperbeamUrl(isValidURL(e.target.value.trim()));

From cb514ddec6010126a3e0855c25c00812a0240d88 Mon Sep 17 00:00:00 2001
From: atticusofsparta <atticusofsparta@protonmail.com>
Date: Wed, 23 Jul 2025 10:37:19 -0600
Subject: [PATCH 12/13] fix(storage key): use main storage key only for syncing
 settings

---
 src/hooks/useSyncSettings/useSyncSettings.tsx | 15 +++---
 src/state/contexts/GlobalState.tsx            | 47 +++++++------------
 2 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/src/hooks/useSyncSettings/useSyncSettings.tsx b/src/hooks/useSyncSettings/useSyncSettings.tsx
index 85b7128bf..e8570f21e 100644
--- a/src/hooks/useSyncSettings/useSyncSettings.tsx
+++ b/src/hooks/useSyncSettings/useSyncSettings.tsx
@@ -68,16 +68,13 @@ function useSyncSettings() {
       },
     };
 
-    // Save to wallet-specific key
-    const walletKey = `${SETTINGS_STORAGE_KEY}_${walletAddress}`;
-
-    // Also save to a "last" key for persistence across wallet switches
-    const lastKey = `${SETTINGS_STORAGE_KEY}_last`;
-
     try {
-      localStorage.setItem(walletKey, JSON.stringify(settings));
-      localStorage.setItem(lastKey, JSON.stringify(settings));
-      console.log('Settings saved to localStorage:', walletKey, settings);
+      localStorage.setItem(SETTINGS_STORAGE_KEY, JSON.stringify(settings));
+      console.log(
+        'Settings saved to localStorage:',
+        SETTINGS_STORAGE_KEY,
+        settings,
+      );
     } catch (error) {
       console.error('Failed to save settings to localStorage:', error);
     }
diff --git a/src/state/contexts/GlobalState.tsx b/src/state/contexts/GlobalState.tsx
index ad25bef43..e13eeeb61 100644
--- a/src/state/contexts/GlobalState.tsx
+++ b/src/state/contexts/GlobalState.tsx
@@ -45,36 +45,23 @@ function loadSettingsFromStorage(): {
   hyperbeamUrl?: string;
 } | null {
   try {
-    // Try to get the last used wallet address from localStorage
-    const walletType = localStorage.getItem('walletType');
-
-    // Try multiple storage keys to find saved settings
-    const possibleKeys = [
-      walletType ? `${SETTINGS_STORAGE_KEY}_${walletType}` : null,
-      `${SETTINGS_STORAGE_KEY}_default`,
-      `${SETTINGS_STORAGE_KEY}_last`,
-    ].filter(Boolean);
-
-    for (const storageKey of possibleKeys) {
-      const savedSettings = localStorage.getItem(storageKey!);
-
-      if (savedSettings) {
-        const settings = JSON.parse(savedSettings);
-        console.log(
-          'Loading settings from localStorage:',
-          storageKey,
-          settings,
-        );
-
-        return {
-          gateway: settings.network?.gateway || ARWEAVE_HOST,
-          aoNetwork: settings.network?.aoNetwork || NETWORK_DEFAULTS.AO,
-          turboNetwork:
-            settings.network?.turboNetwork || NETWORK_DEFAULTS.TURBO,
-          arioProcessId: settings.arns?.arioProcessId || ARIO_PROCESS_ID,
-          hyperbeamUrl: settings.network?.hyperbeamUrl,
-        };
-      }
+    const savedSettings = localStorage.getItem(SETTINGS_STORAGE_KEY);
+
+    if (savedSettings) {
+      const settings = JSON.parse(savedSettings);
+      console.log(
+        'Loading settings from localStorage:',
+        SETTINGS_STORAGE_KEY,
+        settings,
+      );
+
+      return {
+        gateway: settings.network?.gateway || ARWEAVE_HOST,
+        aoNetwork: settings.network?.aoNetwork || NETWORK_DEFAULTS.AO,
+        turboNetwork: settings.network?.turboNetwork || NETWORK_DEFAULTS.TURBO,
+        arioProcessId: settings.arns?.arioProcessId || ARIO_PROCESS_ID,
+        hyperbeamUrl: settings.network?.hyperbeamUrl,
+      };
     }
   } catch (error) {
     console.error('Failed to load settings from localStorage:', error);

From 7aecf55be2fa1616daedbf4f9ace06eb61791f58 Mon Sep 17 00:00:00 2001
From: atticusofsparta <atticusofsparta@protonmail.com>
Date: Wed, 23 Jul 2025 10:37:53 -0600
Subject: [PATCH 13/13] fix(comments): remove old comments

---
 src/hooks/useSyncSettings/useSyncSettings.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/hooks/useSyncSettings/useSyncSettings.tsx b/src/hooks/useSyncSettings/useSyncSettings.tsx
index e8570f21e..dd78aa80f 100644
--- a/src/hooks/useSyncSettings/useSyncSettings.tsx
+++ b/src/hooks/useSyncSettings/useSyncSettings.tsx
@@ -51,9 +51,6 @@ function useSyncSettings() {
       return;
     }
 
-    // Skip saving on initial load when hyperbeamUrl is undefined
-    // This prevents overwriting saved settings with undefined on first load
-
     isInitialLoad.current = false;
 
     const settings: Settings = {