From 89c60fcc3f0fb41ff6bb07c15b10e6c56a476c1b Mon Sep 17 00:00:00 2001
From: Rigidity <me@rigidnetwork.com>
Date: Sun, 12 Jul 2026 21:11:19 +0200
Subject: [PATCH 1/4] Split iOS build into hotdog and not hotdog

---
 .github/workflows/build.yml | 51 ++++++++++++++++++++++++-------------
 src/components/Nav.tsx      | 17 ++++++++-----
 src/vite-env.d.ts           |  8 ++++++
 3 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cea2b5c59..cb8dfecc2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,9 +75,17 @@ jobs:
             platform_name: Windows (ARM)
             build: 'pnpm tauri build --target aarch64-pc-windows-msvc'
           - platform: 'macos-26'
-            platform_name: iOS
-            build: 'pnpm tauri ios build --export-method app-store-connect'
-            build_dev: 'pnpm tauri ios build --export-method debugging'
+            platform_name: iOS (TestFlight)
+            platform_type: iOS
+            build: 'pnpm tauri ios build --export-method app-store-connect --build-number "${GITHUB_RUN_NUMBER}${GITHUB_RUN_ATTEMPT}1"'
+            disable_offers: 'false'
+            ipa_name: Sage_TestFlight
+          - platform: 'macos-26'
+            platform_name: iOS (App Store)
+            platform_type: iOS
+            build: 'pnpm tauri ios build --export-method app-store-connect --build-number "${GITHUB_RUN_NUMBER}${GITHUB_RUN_ATTEMPT}2"'
+            disable_offers: 'true'
+            ipa_name: Sage_AppStore
           - platform: 'macos-15'
             platform_name: Android
             build: 'pnpm tauri android build'
@@ -90,7 +98,7 @@ jobs:
         run: rustup target add x86_64-apple-darwin
 
       - name: Add aarch64-apple-ios
-        if: matrix.platform_name == 'iOS'
+        if: matrix.platform_type == 'iOS'
         run: rustup target add aarch64-apple-ios
 
       - name: Add aarch64-pc-windows-msvc
@@ -150,19 +158,19 @@ jobs:
         run: pnpm install
 
       - name: Save API key to file
-        if: matrix.platform_name == 'MacOS' || matrix.platform_name == 'iOS'
+        if: matrix.platform_name == 'MacOS' || matrix.platform_type == 'iOS'
         run: |
           mkdir -p ~/private_keys
           echo -n '${{ secrets.APPLE_API_SECRET_KEY }}' > ~/private_keys/AuthKey_${{ secrets.APPLE_API_KEY_ID }}.p8
 
       - name: Setup Xcode
-        if: matrix.platform_name == 'iOS'
+        if: matrix.platform_type == 'iOS'
         uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: '26.5'
 
       - name: Verify Xcode SDK
-        if: matrix.platform_name == 'iOS'
+        if: matrix.platform_type == 'iOS'
         run: |
           xcodebuild -version
           xcrun --sdk iphoneos --show-sdk-version
@@ -173,16 +181,23 @@ jobs:
       # On MacOS we only notarize on tagged releases
       # On iOS we need these secrets as well to do code signing
       - name: Build with secrets
-        if: ${{ (matrix.platform_name == 'MacOS' && startsWith(github.event.ref, 'refs/tags/v')) || matrix.platform_name == 'iOS' }}
-        run: ${{ startsWith(github.event.ref, 'refs/tags/v') && matrix.build || matrix.build_dev || matrix.build }}
+        if: ${{ (matrix.platform_name == 'MacOS' && startsWith(github.event.ref, 'refs/tags/v')) || matrix.platform_type == 'iOS' }}
+        run: ${{ matrix.build }}
         env:
           APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
           APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
           APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
           APPLE_API_KEY: ${{ secrets.APPLE_API_KEY_ID }}
           APPLE_API_KEY_PATH: ~/private_keys/AuthKey_${{ secrets.APPLE_API_KEY_ID }}.p8
+          VITE_DISABLE_OFFERS: ${{ matrix.disable_offers }}
           CI: true
 
+      - name: Preserve iOS IPA
+        if: matrix.platform_type == 'iOS'
+        run: |
+          mkdir -p artifacts/ios
+          cp src-tauri/gen/apple/build/arm64/Sage.ipa "artifacts/ios/${{ matrix.ipa_name }}.ipa"
+
       # On Android we need to use the NDK environment variables.
       - name: Build with NDK
         if: matrix.platform_name == 'Android'
@@ -195,7 +210,7 @@ jobs:
 
       # We don't currently do signing on other platforms
       - name: Build without secrets
-        if: ${{ !((matrix.platform_name == 'MacOS' && startsWith(github.event.ref, 'refs/tags/v')) || matrix.platform_name == 'iOS' || matrix.platform_name == 'Android') }}
+        if: ${{ !((matrix.platform_name == 'MacOS' && startsWith(github.event.ref, 'refs/tags/v')) || matrix.platform_type == 'iOS' || matrix.platform_name == 'Android') }}
         run: ${{ matrix.build }}
         env:
           CI: true
@@ -334,21 +349,21 @@ jobs:
       # iOS
       - name: Upload IPA (iOS)
         uses: actions/upload-artifact@v4
-        if: matrix.platform_name == 'iOS'
+        if: matrix.platform_type == 'iOS'
         with:
-          name: Sage_iOS.ipa
-          path: src-tauri/gen/apple/build/arm64/*.ipa
+          name: ${{ matrix.ipa_name }}.ipa
+          path: artifacts/ios/${{ matrix.ipa_name }}.ipa
 
       - name: Release (iOS)
         uses: softprops/action-gh-release@v2
-        if: matrix.platform_name == 'iOS' && startsWith(github.event.ref, 'refs/tags/v')
+        if: matrix.platform_type == 'iOS' && startsWith(github.event.ref, 'refs/tags/v')
         with:
           files: |
-            src-tauri/gen/apple/build/arm64/*.ipa
+            artifacts/ios/${{ matrix.ipa_name }}.ipa
 
-      - name: Upload to App Store (or TestFlight)
-        if: matrix.platform_name == 'iOS' && startsWith(github.event.ref, 'refs/tags/v')
-        run: xcrun altool --upload-app --type ios --file "src-tauri/gen/apple/build/arm64/Sage.ipa" --apiKey $APPLE_API_KEY_ID --apiIssuer $APPLE_API_ISSUER
+      - name: Upload iOS build to App Store Connect
+        if: matrix.platform_type == 'iOS' && startsWith(github.event.ref, 'refs/tags/v')
+        run: xcrun altool --upload-app --type ios --file "artifacts/ios/${{ matrix.ipa_name }}.ipa" --apiKey $APPLE_API_KEY_ID --apiIssuer $APPLE_API_ISSUER
         env:
           APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
           APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
diff --git a/src/components/Nav.tsx b/src/components/Nav.tsx
index 03d9e8a39..8766caad2 100644
--- a/src/components/Nav.tsx
+++ b/src/components/Nav.tsx
@@ -34,6 +34,7 @@ export function TopNav({ isCollapsed }: NavProps) {
   const className = isCollapsed ? 'h-5 w-5' : 'h-4 w-4';
 
   const isIos = platform() === 'ios';
+  const offersEnabled = import.meta.env.VITE_DISABLE_OFFERS !== 'true';
 
   return (
     <nav
@@ -78,13 +79,15 @@ export function TopNav({ isCollapsed }: NavProps) {
         </NavLink>
       )}
 
-      <NavLink
-        url={'/offers'}
-        isCollapsed={isCollapsed}
-        message={<Trans>Offers</Trans>}
-      >
-        <Handshake className={className} aria-hidden='true' />
-      </NavLink>
+      {offersEnabled && (
+        <NavLink
+          url={'/offers'}
+          isCollapsed={isCollapsed}
+          message={<Trans>Offers</Trans>}
+        >
+          <Handshake className={className} aria-hidden='true' />
+        </NavLink>
+      )}
 
       {!isIos && (
         <NavLink
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
index 58bf50f87..65d8b690f 100644
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -1,5 +1,13 @@
 /// <reference types="vite/client" />
 
+interface ImportMetaEnv {
+  readonly VITE_DISABLE_OFFERS?: string;
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}
+
 // Allow importing JSON files as modules
 declare module '*.json' {
   const value: never;

From 164f2e0a63cbb0019cd50aa2fdeae677cb9ebfd1 Mon Sep 17 00:00:00 2001
From: Rigidity <me@rigidnetwork.com>
Date: Sun, 12 Jul 2026 21:46:46 +0200
Subject: [PATCH 2/4] Add feature flags for options and swaps

---
 .github/workflows/build.yml                   |  30 +-
 src/components/CoinList.tsx                   |   5 +-
 src/components/MultiSelectActions.tsx         |  79 +++--
 src/components/Nav.tsx                        |   9 +-
 src/components/NftCard.tsx                    | 109 +++---
 src/components/NftGroupCard.tsx               | 181 +++++-----
 src/components/OptionCard.tsx                 |  59 ++--
 .../confirmations/TokenConfirmation.tsx       |  23 +-
 src/components/dialogs/MigrationDialog.tsx    |  21 +-
 src/components/dialogs/ResyncDialog.tsx       |  23 +-
 src/lib/features.ts                           |   3 +
 src/pages/Nft.tsx                             | 319 +++++++++---------
 src/pages/Option.tsx                          |   7 +-
 src/pages/QrScanner.tsx                       |   3 +-
 src/pages/Settings.tsx                        |  71 ++--
 src/vite-env.d.ts                             |   2 +
 16 files changed, 516 insertions(+), 428 deletions(-)
 create mode 100644 src/lib/features.ts

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cb8dfecc2..fde5386ea 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -77,14 +77,20 @@ jobs:
           - platform: 'macos-26'
             platform_name: iOS (TestFlight)
             platform_type: iOS
-            build: 'pnpm tauri ios build --export-method app-store-connect --build-number "${GITHUB_RUN_NUMBER}${GITHUB_RUN_ATTEMPT}1"'
+            build: 'pnpm tauri ios build --export-method app-store-connect --build-number "$IOS_BUILD_NUMBER"'
+            build_number_variant: 1
             disable_offers: 'false'
+            disable_options: 'false'
+            disable_swap: 'false'
             ipa_name: Sage_TestFlight
           - platform: 'macos-26'
             platform_name: iOS (App Store)
             platform_type: iOS
-            build: 'pnpm tauri ios build --export-method app-store-connect --build-number "${GITHUB_RUN_NUMBER}${GITHUB_RUN_ATTEMPT}2"'
+            build: 'pnpm tauri ios build --export-method app-store-connect --build-number "$IOS_BUILD_NUMBER"'
+            build_number_variant: 2
             disable_offers: 'true'
+            disable_options: 'true'
+            disable_swap: 'true'
             ipa_name: Sage_AppStore
           - platform: 'macos-15'
             platform_name: Android
@@ -178,6 +184,23 @@ jobs:
       - name: Bindgen CLI
         run: cargo install bindgen-cli --locked
 
+      - name: Calculate iOS build number
+        id: ios_build_number
+        if: matrix.platform_type == 'iOS'
+        run: |
+          if ((GITHUB_RUN_ATTEMPT >= 1000)); then
+            echo "GITHUB_RUN_ATTEMPT must be less than 1000"
+            exit 1
+          fi
+
+          build_number=$((GITHUB_RUN_NUMBER * 10000 + GITHUB_RUN_ATTEMPT * 10 + ${{ matrix.build_number_variant }}))
+          if ((build_number > 4294967295)); then
+            echo "Calculated iOS build number exceeds the u32 limit"
+            exit 1
+          fi
+
+          echo "value=$build_number" >> "$GITHUB_OUTPUT"
+
       # On MacOS we only notarize on tagged releases
       # On iOS we need these secrets as well to do code signing
       - name: Build with secrets
@@ -189,7 +212,10 @@ jobs:
           APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
           APPLE_API_KEY: ${{ secrets.APPLE_API_KEY_ID }}
           APPLE_API_KEY_PATH: ~/private_keys/AuthKey_${{ secrets.APPLE_API_KEY_ID }}.p8
+          IOS_BUILD_NUMBER: ${{ steps.ios_build_number.outputs.value }}
           VITE_DISABLE_OFFERS: ${{ matrix.disable_offers }}
+          VITE_DISABLE_OPTIONS: ${{ matrix.disable_options }}
+          VITE_DISABLE_SWAP: ${{ matrix.disable_swap }}
           CI: true
 
       - name: Preserve iOS IPA
diff --git a/src/components/CoinList.tsx b/src/components/CoinList.tsx
index fe8029205..244013e9d 100644
--- a/src/components/CoinList.tsx
+++ b/src/components/CoinList.tsx
@@ -1,3 +1,4 @@
+import { offersEnabled } from '@/lib/features';
 import { spacescanCoinUrl } from '@/lib/urls';
 import { formatTimestamp, fromMojos } from '@/lib/utils';
 import { t } from '@lingui/core/macro';
@@ -334,7 +335,9 @@ const SpentCell = ({ row }: { row: Row<CoinRecord> }) =>
       : row.original.transaction_id
         ? t`Pending...`
         : row.original.offer_id
-          ? t`Locked in offer`
+          ? offersEnabled
+            ? t`Locked in offer`
+            : t`Locked`
           : '';
 
 // Wrapper components to eliminate remaining inline arrow functions
diff --git a/src/components/MultiSelectActions.tsx b/src/components/MultiSelectActions.tsx
index b7168cc90..21a356c4d 100644
--- a/src/components/MultiSelectActions.tsx
+++ b/src/components/MultiSelectActions.tsx
@@ -2,6 +2,7 @@ import { commands, NftRecord, TransactionResponse } from '@/bindings';
 import { CustomError } from '@/contexts/ErrorContext';
 import { useErrors } from '@/hooks/useErrors';
 import useOfferStateWithDefault from '@/hooks/useOfferStateWithDefault';
+import { offersEnabled } from '@/lib/features';
 import { toMojos } from '@/lib/utils';
 import { useWalletState } from '@/state';
 import { t } from '@lingui/core/macro';
@@ -242,50 +243,54 @@ export function MultiSelectActions({
                 </span>
               </DropdownMenuItem>
 
-              <DropdownMenuSeparator />
+              {offersEnabled && (
+                <>
+                  <DropdownMenuSeparator />
 
-              <DropdownMenuItem
-                className='cursor-pointer'
-                onClick={(e) => {
-                  e.stopPropagation();
+                  <DropdownMenuItem
+                    className='cursor-pointer'
+                    onClick={(e) => {
+                      e.stopPropagation();
 
-                  const newNfts = [...offerState.offered.nfts];
-                  let addedCount = 0;
+                      const newNfts = [...offerState.offered.nfts];
+                      let addedCount = 0;
 
-                  for (const item of selected) {
-                    if (newNfts.includes(item)) {
-                      continue;
-                    }
+                      for (const item of selected) {
+                        if (newNfts.includes(item)) {
+                          continue;
+                        }
 
-                    newNfts.push(item);
-                    addedCount++;
-                  }
+                        newNfts.push(item);
+                        addedCount++;
+                      }
 
-                  setOfferState({
-                    offered: {
-                      ...offerState.offered,
-                      nfts: newNfts,
-                    },
-                  });
+                      setOfferState({
+                        offered: {
+                          ...offerState.offered,
+                          nfts: newNfts,
+                        },
+                      });
 
-                  const nfts = addedCount === 1 ? t`NFT` : t`NFTs`;
-                  const message =
-                    addedCount > 0
-                      ? t`Added ${addedCount} ${nfts} to offer`
-                      : t`Selected NFTs are already in the offer`;
-                  toast.success(message, {
-                    onClick: () => navigate('/offers/make'),
-                  });
+                      const nfts = addedCount === 1 ? t`NFT` : t`NFTs`;
+                      const message =
+                        addedCount > 0
+                          ? t`Added ${addedCount} ${nfts} to offer`
+                          : t`Selected NFTs are already in the offer`;
+                      toast.success(message, {
+                        onClick: () => navigate('/offers/make'),
+                      });
 
-                  onConfirm();
-                }}
-                aria-label={t`Add ${selectedCount} selected NFTs to offer`}
-              >
-                <HandCoins className='mr-2 h-4 w-4' aria-hidden='true' />
-                <span>
-                  <Trans>Add to Offer</Trans>
-                </span>
-              </DropdownMenuItem>
+                      onConfirm();
+                    }}
+                    aria-label={t`Add ${selectedCount} selected NFTs to offer`}
+                  >
+                    <HandCoins className='mr-2 h-4 w-4' aria-hidden='true' />
+                    <span>
+                      <Trans>Add to Offer</Trans>
+                    </span>
+                  </DropdownMenuItem>
+                </>
+              )}
             </DropdownMenuGroup>
           </DropdownMenuContent>
         </DropdownMenu>
diff --git a/src/components/Nav.tsx b/src/components/Nav.tsx
index 8766caad2..7b653ca4c 100644
--- a/src/components/Nav.tsx
+++ b/src/components/Nav.tsx
@@ -4,10 +4,10 @@ import {
   TooltipTrigger,
 } from '@/components/ui/tooltip';
 import { usePeers } from '@/hooks/usePeers';
+import { offersEnabled, optionsEnabled, swapEnabled } from '@/lib/features';
 import { logoutAndUpdateState, useWalletState } from '@/state';
 import { t } from '@lingui/core/macro';
 import { Trans } from '@lingui/react/macro';
-import { platform } from '@tauri-apps/plugin-os';
 import {
   ArrowDownUp,
   ArrowLeftRight,
@@ -33,9 +33,6 @@ interface NavProps {
 export function TopNav({ isCollapsed }: NavProps) {
   const className = isCollapsed ? 'h-5 w-5' : 'h-4 w-4';
 
-  const isIos = platform() === 'ios';
-  const offersEnabled = import.meta.env.VITE_DISABLE_OFFERS !== 'true';
-
   return (
     <nav
       className={`grid font-medium font-body ${isCollapsed ? 'gap-1' : ''}`}
@@ -69,7 +66,7 @@ export function TopNav({ isCollapsed }: NavProps) {
         <SquareUserRound className={className} aria-hidden='true' />
       </NavLink>
 
-      {!isIos && (
+      {optionsEnabled && (
         <NavLink
           url={'/options'}
           isCollapsed={isCollapsed}
@@ -89,7 +86,7 @@ export function TopNav({ isCollapsed }: NavProps) {
         </NavLink>
       )}
 
-      {!isIos && (
+      {swapEnabled && (
         <NavLink
           url={'/swap'}
           isCollapsed={isCollapsed}
diff --git a/src/components/NftCard.tsx b/src/components/NftCard.tsx
index ea53e0821..de75bd857 100644
--- a/src/components/NftCard.tsx
+++ b/src/components/NftCard.tsx
@@ -7,6 +7,7 @@ import {
 } from '@/bindings';
 import { useErrors } from '@/hooks/useErrors';
 import useOfferStateWithDefault from '@/hooks/useOfferStateWithDefault';
+import { offersEnabled } from '@/lib/features';
 import { amount } from '@/lib/formTypes';
 import { nftUri } from '@/lib/nftUri';
 import { toMojos } from '@/lib/utils';
@@ -172,6 +173,8 @@ export function NftCard({ nft, updateNfts, selectionState }: NftCardProps) {
   }, [nft.launcher_id]);
 
   useEffect(() => {
+    if (!offersEnabled) return;
+
     let cancelled = false;
     commands
       .getOffersForAsset({ asset_id: nft.launcher_id })
@@ -365,25 +368,27 @@ export function NftCard({ nft, updateNfts, selectionState }: NftCardProps) {
             />
           )}
 
-          {activeOfferCount !== null && activeOfferCount > 0 && (
-            <TooltipProvider>
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <div className='absolute top-2 left-2 flex items-center gap-1 rounded-full bg-amber-500/90 px-1.5 py-0.5 text-xs font-medium text-white shadow-sm'>
-                    <Tag className='h-3 w-3' aria-hidden='true' />
-                    {activeOfferCount > 1 && <span>{activeOfferCount}</span>}
-                  </div>
-                </TooltipTrigger>
-                <TooltipContent side='bottom'>
-                  <p>
-                    {activeOfferCount === 1
-                      ? t`1 active offer`
-                      : t`${activeOfferCount} active offers`}
-                  </p>
-                </TooltipContent>
-              </Tooltip>
-            </TooltipProvider>
-          )}
+          {offersEnabled &&
+            activeOfferCount !== null &&
+            activeOfferCount > 0 && (
+              <TooltipProvider>
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    <div className='absolute top-2 left-2 flex items-center gap-1 rounded-full bg-amber-500/90 px-1.5 py-0.5 text-xs font-medium text-white shadow-sm'>
+                      <Tag className='h-3 w-3' aria-hidden='true' />
+                      {activeOfferCount > 1 && <span>{activeOfferCount}</span>}
+                    </div>
+                  </TooltipTrigger>
+                  <TooltipContent side='bottom'>
+                    <p>
+                      {activeOfferCount === 1
+                        ? t`1 active offer`
+                        : t`${activeOfferCount} active offers`}
+                    </p>
+                  </TooltipContent>
+                </Tooltip>
+              </TooltipProvider>
+            )}
 
           {nft.special_use_type === 'theme' && (
             <div className='absolute bottom-0 left-0 right-0 bg-primary/70 text-primary-foreground text-xs font-medium py-1 px-2 text-center border-t border-border'>
@@ -506,38 +511,40 @@ export function NftCard({ nft, updateNfts, selectionState }: NftCardProps) {
 
                 <DropdownMenuSeparator />
 
-                <DropdownMenuItem
-                  className='cursor-pointer'
-                  onClick={(e) => {
-                    e.stopPropagation();
-
-                    const newNfts = [...offerState.offered.nfts];
-                    newNfts.push(nft.launcher_id);
-
-                    setOfferState({
-                      offered: {
-                        ...offerState.offered,
-                        nfts: newNfts,
-                      },
-                    });
-
-                    toast.success(t`Click here to go to offer.`, {
-                      onClick: () => navigate('/offers/make'),
-                    });
-                  }}
-                  disabled={
-                    !nft.created_height ||
-                    offerState.offered.nfts.findIndex(
-                      (nftId) => nftId === nft.launcher_id,
-                    ) !== -1
-                  }
-                  aria-label={t`Add ${nftName} to offer`}
-                >
-                  <HandCoins className='mr-2 h-4 w-4' aria-hidden='true' />
-                  <span>
-                    <Trans>Add to Offer</Trans>
-                  </span>
-                </DropdownMenuItem>
+                {offersEnabled && (
+                  <DropdownMenuItem
+                    className='cursor-pointer'
+                    onClick={(e) => {
+                      e.stopPropagation();
+
+                      const newNfts = [...offerState.offered.nfts];
+                      newNfts.push(nft.launcher_id);
+
+                      setOfferState({
+                        offered: {
+                          ...offerState.offered,
+                          nfts: newNfts,
+                        },
+                      });
+
+                      toast.success(t`Click here to go to offer.`, {
+                        onClick: () => navigate('/offers/make'),
+                      });
+                    }}
+                    disabled={
+                      !nft.created_height ||
+                      offerState.offered.nfts.findIndex(
+                        (nftId) => nftId === nft.launcher_id,
+                      ) !== -1
+                    }
+                    aria-label={t`Add ${nftName} to offer`}
+                  >
+                    <HandCoins className='mr-2 h-4 w-4' aria-hidden='true' />
+                    <span>
+                      <Trans>Add to Offer</Trans>
+                    </span>
+                  </DropdownMenuItem>
+                )}
 
                 <DropdownMenuItem
                   className='cursor-pointer'
diff --git a/src/components/NftGroupCard.tsx b/src/components/NftGroupCard.tsx
index c48ae90f0..70a67a47b 100644
--- a/src/components/NftGroupCard.tsx
+++ b/src/components/NftGroupCard.tsx
@@ -7,6 +7,7 @@ import {
 import { NftGroupMode } from '@/hooks/useNftParams';
 import { useNetwork } from '@/hooks/useNetwork';
 import useOfferStateWithDefault from '@/hooks/useOfferStateWithDefault';
+import { offersEnabled } from '@/lib/features';
 import { mintGardenCollectionUrl, mintGardenDidUrl } from '@/lib/urls';
 //import { getMintGardenProfile } from '@/lib/marketplaces';
 import { t } from '@lingui/core/macro';
@@ -394,101 +395,105 @@ export function NftGroupCard({
                   <Trans>Copy ID</Trans>
                 </span>
               </DropdownMenuItem>
-              <DropdownMenuSeparator />
-              <DropdownMenuItem
-                className='cursor-pointer'
-                onClick={async (e) => {
-                  e.stopPropagation();
-                  try {
-                    let nftIds: string[] = [];
+              {offersEnabled && (
+                <>
+                  <DropdownMenuSeparator />
+                  <DropdownMenuItem
+                    className='cursor-pointer'
+                    onClick={async (e) => {
+                      e.stopPropagation();
+                      try {
+                        let nftIds: string[] = [];
 
-                    if (isCollectionRecord(item)) {
-                      // Fetch all NFTs in the collection
-                      const response = await commands.getNfts({
-                        collection_id: item.collection_id,
-                        minter_did_id: null,
-                        owner_did_id: null,
-                        name: null,
-                        offset: 0,
-                        limit: 1000, // Use a large limit to get all NFTs
-                        sort_mode: 'name',
-                        include_hidden: true,
-                      });
-                      nftIds = response.nfts.map(
-                        (nft: NftRecord) => nft.launcher_id,
-                      );
-                    } else if (isDidRecord(item)) {
-                      // Fetch all NFTs for the DID
-                      const response = await commands.getNfts({
-                        collection_id: null,
-                        minter_did_id:
-                          groupMode === NftGroupMode.MinterDid
-                            ? item.launcher_id
-                            : null,
-                        owner_did_id:
-                          groupMode === NftGroupMode.OwnerDid
-                            ? item.launcher_id
-                            : null,
-                        name: null,
-                        offset: 0,
-                        limit: 1000, // Use a large limit to get all NFTs
-                        sort_mode: 'name',
-                        include_hidden: true,
-                      });
-                      nftIds = response.nfts.map(
-                        (nft: NftRecord) => nft.launcher_id,
-                      );
-                    }
+                        if (isCollectionRecord(item)) {
+                          // Fetch all NFTs in the collection
+                          const response = await commands.getNfts({
+                            collection_id: item.collection_id,
+                            minter_did_id: null,
+                            owner_did_id: null,
+                            name: null,
+                            offset: 0,
+                            limit: 1000, // Use a large limit to get all NFTs
+                            sort_mode: 'name',
+                            include_hidden: true,
+                          });
+                          nftIds = response.nfts.map(
+                            (nft: NftRecord) => nft.launcher_id,
+                          );
+                        } else if (isDidRecord(item)) {
+                          // Fetch all NFTs for the DID
+                          const response = await commands.getNfts({
+                            collection_id: null,
+                            minter_did_id:
+                              groupMode === NftGroupMode.MinterDid
+                                ? item.launcher_id
+                                : null,
+                            owner_did_id:
+                              groupMode === NftGroupMode.OwnerDid
+                                ? item.launcher_id
+                                : null,
+                            name: null,
+                            offset: 0,
+                            limit: 1000, // Use a large limit to get all NFTs
+                            sort_mode: 'name',
+                            include_hidden: true,
+                          });
+                          nftIds = response.nfts.map(
+                            (nft: NftRecord) => nft.launcher_id,
+                          );
+                        }
 
-                    const newNfts = [...offerState.offered.nfts];
-                    let addedCount = 0;
+                        const newNfts = [...offerState.offered.nfts];
+                        let addedCount = 0;
 
-                    for (const nftId of nftIds) {
-                      if (newNfts.includes(nftId)) {
-                        continue;
-                      }
+                        for (const nftId of nftIds) {
+                          if (newNfts.includes(nftId)) {
+                            continue;
+                          }
 
-                      newNfts.push(nftId);
-                      addedCount++;
-                    }
+                          newNfts.push(nftId);
+                          addedCount++;
+                        }
 
-                    setOfferState({
-                      offered: {
-                        ...offerState.offered,
-                        nfts: newNfts,
-                      },
-                    });
+                        setOfferState({
+                          offered: {
+                            ...offerState.offered,
+                            nfts: newNfts,
+                          },
+                        });
 
-                    if (setSplitNftOffers) {
-                      setSplitNftOffers(true);
-                    }
+                        if (setSplitNftOffers) {
+                          setSplitNftOffers(true);
+                        }
 
-                    const nfts = addedCount === 1 ? t`NFT` : t`NFTs`;
-                    const message =
-                      addedCount > 0
-                        ? t`Added ${addedCount} ${nfts} to offer`
-                        : t`Selected NFTs are already in the offer`;
-                    toast.success(message, {
-                      onClick: () =>
-                        navigate('/offers/make', {
-                          state: { splitNftOffers: true },
-                        }),
-                    });
-                  } catch (error: unknown) {
-                    toast.error(
-                      error instanceof Error
-                        ? error.message
-                        : t`Failed to add NFTs to offer`,
-                    );
-                  }
-                }}
-                aria-label={t`Add all NFTs in ${cardName} to an offer`}
-              >
-                <HandCoins className='mr-2 h-4 w-4' aria-hidden='true' />
-                <span title={t`Add all NFTs in ${cardName} to an offer`}>
-                  <Trans>Add All to Offer</Trans>
-                </span>
-              </DropdownMenuItem>
+                        const nfts = addedCount === 1 ? t`NFT` : t`NFTs`;
+                        const message =
+                          addedCount > 0
+                            ? t`Added ${addedCount} ${nfts} to offer`
+                            : t`Selected NFTs are already in the offer`;
+                        toast.success(message, {
+                          onClick: () =>
+                            navigate('/offers/make', {
+                              state: { splitNftOffers: true },
+                            }),
+                        });
+                      } catch (error: unknown) {
+                        toast.error(
+                          error instanceof Error
+                            ? error.message
+                            : t`Failed to add NFTs to offer`,
+                        );
+                      }
+                    }}
+                    aria-label={t`Add all NFTs in ${cardName} to an offer`}
+                  >
+                    <HandCoins className='mr-2 h-4 w-4' aria-hidden='true' />
+                    <span title={t`Add all NFTs in ${cardName} to an offer`}>
+                      <Trans>Add All to Offer</Trans>
+                    </span>
+                  </DropdownMenuItem>
+                </>
+              )}
             </DropdownMenuGroup>
           </DropdownMenuContent>
         </DropdownMenu>
diff --git a/src/components/OptionCard.tsx b/src/components/OptionCard.tsx
index 49950f3bc..aeafca6e6 100644
--- a/src/components/OptionCard.tsx
+++ b/src/components/OptionCard.tsx
@@ -14,6 +14,7 @@ import {
 import { Separator } from '@/components/ui/separator';
 import useOfferStateWithDefault from '@/hooks/useOfferStateWithDefault';
 import { OptionActionHandlers } from '@/hooks/useOptionActions';
+import { offersEnabled } from '@/lib/features';
 import { formatTimestamp, fromMojos } from '@/lib/utils';
 import { t } from '@lingui/core/macro';
 import { Trans } from '@lingui/react/macro';
@@ -106,37 +107,39 @@ export function OptionCard({ option, actionHandlers }: OptionCardProps) {
 
                 <DropdownMenuSeparator />
 
-                <DropdownMenuItem
-                  className='cursor-pointer'
-                  onClick={(e) => {
-                    e.stopPropagation();
+                {offersEnabled && (
+                  <DropdownMenuItem
+                    className='cursor-pointer'
+                    onClick={(e) => {
+                      e.stopPropagation();
 
-                    const newOptions = [...offerState.offered.options];
-                    newOptions.push(option.launcher_id);
+                      const newOptions = [...offerState.offered.options];
+                      newOptions.push(option.launcher_id);
 
-                    setOfferState({
-                      offered: {
-                        ...offerState.offered,
-                        options: newOptions,
-                      },
-                    });
+                      setOfferState({
+                        offered: {
+                          ...offerState.offered,
+                          options: newOptions,
+                        },
+                      });
 
-                    toast.success(t`Click here to go to offer.`, {
-                      onClick: () => navigate('/offers/make'),
-                    });
-                  }}
-                  disabled={
-                    option.created_height === null ||
-                    option.expiration_seconds * 1000 < Date.now() ||
-                    offerState.offered.options.includes(option.launcher_id)
-                  }
-                  aria-label={t`Add ${option.name || 'Unknown Option'} to offer`}
-                >
-                  <HandCoins className='mr-2 h-4 w-4' aria-hidden='true' />
-                  <span>
-                    <Trans>Add to Offer</Trans>
-                  </span>
-                </DropdownMenuItem>
+                      toast.success(t`Click here to go to offer.`, {
+                        onClick: () => navigate('/offers/make'),
+                      });
+                    }}
+                    disabled={
+                      option.created_height === null ||
+                      option.expiration_seconds * 1000 < Date.now() ||
+                      offerState.offered.options.includes(option.launcher_id)
+                    }
+                    aria-label={t`Add ${option.name || 'Unknown Option'} to offer`}
+                  >
+                    <HandCoins className='mr-2 h-4 w-4' aria-hidden='true' />
+                    <span>
+                      <Trans>Add to Offer</Trans>
+                    </span>
+                  </DropdownMenuItem>
+                )}
 
                 <DropdownMenuItem
                   className='cursor-pointer'
diff --git a/src/components/confirmations/TokenConfirmation.tsx b/src/components/confirmations/TokenConfirmation.tsx
index dad144191..25535a3f8 100644
--- a/src/components/confirmations/TokenConfirmation.tsx
+++ b/src/components/confirmations/TokenConfirmation.tsx
@@ -1,5 +1,6 @@
 import { CoinRecord } from '@/bindings';
 import { CopyButton } from '@/components/CopyButton';
+import { offersEnabled } from '@/lib/features';
 import { fromMojos } from '@/lib/utils';
 import { t } from '@lingui/core/macro';
 import { Trans } from '@lingui/react/macro';
@@ -45,11 +46,16 @@ export function TokenConfirmation({
       icon: SplitIcon,
       title: <Trans>Split Coins</Trans>,
       variant: 'info' as const,
-      message: (
+      message: offersEnabled ? (
         <Trans>
           You are splitting coins into multiple coins of equal value. This can
           help with parallel transactions and offer creation.
         </Trans>
+      ) : (
+        <Trans>
+          You are splitting coins into multiple coins of equal value. This can
+          help with parallel transactions.
+        </Trans>
       ),
     },
     combine: {
@@ -254,10 +260,17 @@ export function TokenConfirmation({
 
       {type === 'issue' && (
         <div className='text-muted-foreground'>
-          <Trans>
-            Once issued, this token will appear in your wallet. You can then
-            send it to other addresses or create offers to trade it.
-          </Trans>
+          {offersEnabled ? (
+            <Trans>
+              Once issued, this token will appear in your wallet. You can then
+              send it to other addresses or create offers to trade it.
+            </Trans>
+          ) : (
+            <Trans>
+              Once issued, this token will appear in your wallet. You can then
+              send it to other addresses.
+            </Trans>
+          )}
         </div>
       )}
     </div>
diff --git a/src/components/dialogs/MigrationDialog.tsx b/src/components/dialogs/MigrationDialog.tsx
index 898481b67..5920b91ae 100644
--- a/src/components/dialogs/MigrationDialog.tsx
+++ b/src/components/dialogs/MigrationDialog.tsx
@@ -7,6 +7,7 @@ import {
   DialogHeader,
   DialogTitle,
 } from '@/components/ui/dialog';
+import { offersEnabled } from '@/lib/features';
 import { Trans } from '@lingui/react/macro';
 
 interface MigrationDialogProps {
@@ -30,12 +31,20 @@ export function MigrationDialog({
             <Trans>Database Migration Required</Trans>
           </DialogTitle>
           <DialogDescription>
-            <Trans>
-              In order to proceed with the update, the wallet will be fully
-              resynced. This means any imported offer files or custom asset
-              names will be removed, but you can manually add them again after
-              if needed.
-            </Trans>
+            {offersEnabled ? (
+              <Trans>
+                In order to proceed with the update, the wallet will be fully
+                resynced. This means any imported offer files or custom asset
+                names will be removed, but you can manually add them again after
+                if needed.
+              </Trans>
+            ) : (
+              <Trans>
+                In order to proceed with the update, the wallet will be fully
+                resynced. This means custom asset names will be removed, but you
+                can manually add them again after if needed.
+              </Trans>
+            )}
           </DialogDescription>
         </DialogHeader>
         <DialogFooter>
diff --git a/src/components/dialogs/ResyncDialog.tsx b/src/components/dialogs/ResyncDialog.tsx
index 2dc5cb394..670c80660 100644
--- a/src/components/dialogs/ResyncDialog.tsx
+++ b/src/components/dialogs/ResyncDialog.tsx
@@ -1,5 +1,6 @@
 import { Resync } from '@/bindings';
 import { useErrors } from '@/hooks/useErrors';
+import { offersEnabled } from '@/lib/features';
 import { t } from '@lingui/core/macro';
 import { Trans } from '@lingui/react/macro';
 import { useState } from 'react';
@@ -64,16 +65,18 @@ export function ResyncDialog({
               />
             </div>
 
-            <div className='flex items-center gap-2 my-2'>
-              <label htmlFor='deleteOffers'>
-                <Trans>Delete saved offer files</Trans>
-              </label>
-              <Switch
-                id='deleteOffers'
-                checked={deleteOffers}
-                onCheckedChange={(value) => setDeleteOffers(value)}
-              />
-            </div>
+            {offersEnabled && (
+              <div className='flex items-center gap-2 my-2'>
+                <label htmlFor='deleteOffers'>
+                  <Trans>Delete saved offer files</Trans>
+                </label>
+                <Switch
+                  id='deleteOffers'
+                  checked={deleteOffers}
+                  onCheckedChange={(value) => setDeleteOffers(value)}
+                />
+              </div>
+            )}
 
             <div className='flex items-center gap-2 my-2'>
               <label htmlFor='deleteCache'>
diff --git a/src/lib/features.ts b/src/lib/features.ts
new file mode 100644
index 000000000..9d0d7c0d8
--- /dev/null
+++ b/src/lib/features.ts
@@ -0,0 +1,3 @@
+export const offersEnabled = import.meta.env.VITE_DISABLE_OFFERS !== 'true';
+export const optionsEnabled = import.meta.env.VITE_DISABLE_OPTIONS !== 'true';
+export const swapEnabled = import.meta.env.VITE_DISABLE_SWAP !== 'true';
diff --git a/src/pages/Nft.tsx b/src/pages/Nft.tsx
index 82fbd8b56..6187ad4cd 100644
--- a/src/pages/Nft.tsx
+++ b/src/pages/Nft.tsx
@@ -6,13 +6,8 @@ import { Button } from '@/components/ui/button';
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
 import { useErrors } from '@/hooks/useErrors';
 import { useNetwork } from '@/hooks/useNetwork';
-import {
-  dexieOfferUrl,
-  mintGardenDidUrl,
-  mintGardenNftUrl,
-  spacescanNftUrl,
-} from '@/lib/urls';
 import spacescanLogo from '@/images/spacescan-logo-192.png';
+import { offersEnabled } from '@/lib/features';
 import { getMintGardenProfile } from '@/lib/marketplaces';
 import { isAudio, isImage, isJson, isText, nftUri } from '@/lib/nftUri';
 import {
@@ -21,6 +16,12 @@ import {
   fetchOfferedDexieOffersFromNftId,
   fetchRequestedDexieOffersFromNftId,
 } from '@/lib/offerData';
+import {
+  dexieOfferUrl,
+  mintGardenDidUrl,
+  mintGardenNftUrl,
+  spacescanNftUrl,
+} from '@/lib/urls';
 import { formatTimestamp, getOfferStatus } from '@/lib/utils';
 import { t } from '@lingui/core/macro';
 import { Trans } from '@lingui/react/macro';
@@ -50,6 +51,8 @@ export default function Nft() {
 
   // Check for open offers when NFT loads
   useEffect(() => {
+    if (!offersEnabled) return;
+
     if (nft?.launcher_id) {
       // Fetch both requested and offered offers
       Promise.all([
@@ -436,174 +439,176 @@ export default function Nft() {
                 label={t`Royalties ${royaltyPercentage}%`}
                 address={nft?.royalty_address ?? ''}
               />
-              <div className='flex flex-col gap-4'>
-                {/* Requested Offers Section */}
-                <div className='flex flex-col gap-1'>
-                  <h6 className='text-md font-bold'>
-                    <Trans>Offers Requesting This NFT</Trans>
-                  </h6>
-
-                  {requestedOffers.length === 0 ? (
-                    <div className='text-sm text-muted-foreground'>
-                      <Trans>No Dexie offers requesting this NFT</Trans>
-                    </div>
-                  ) : (
-                    <div className='grid gap-2'>
-                      {requestedOffers.map((offer: DexieOffer) => (
-                        <div key={offer.id} className='border rounded-lg p-3'>
-                          <div className='grid grid-cols-2 gap-4'>
-                            <div>
-                              <div className='text-sm font-medium mb-2'>
-                                <Trans>Offered in exchange:</Trans>
+              {offersEnabled && (
+                <div className='flex flex-col gap-4'>
+                  {/* Requested Offers Section */}
+                  <div className='flex flex-col gap-1'>
+                    <h6 className='text-md font-bold'>
+                      <Trans>Offers Requesting This NFT</Trans>
+                    </h6>
+
+                    {requestedOffers.length === 0 ? (
+                      <div className='text-sm text-muted-foreground'>
+                        <Trans>No Dexie offers requesting this NFT</Trans>
+                      </div>
+                    ) : (
+                      <div className='grid gap-2'>
+                        {requestedOffers.map((offer: DexieOffer) => (
+                          <div key={offer.id} className='border rounded-lg p-3'>
+                            <div className='grid grid-cols-2 gap-4'>
+                              <div>
+                                <div className='text-sm font-medium mb-2'>
+                                  <Trans>Offered in exchange:</Trans>
+                                </div>
+                                <div className='space-y-1'>
+                                  {offer.offered?.map((item: DexieAsset) => (
+                                    <div key={item.id} className='text-sm'>
+                                      {item.amount} {item.name} ({item.code})
+                                    </div>
+                                  ))}
+                                </div>
                               </div>
-                              <div className='space-y-1'>
-                                {offer.offered?.map((item: DexieAsset) => (
-                                  <div key={item.id} className='text-sm'>
-                                    {item.amount} {item.name} ({item.code})
-                                  </div>
-                                ))}
+                              <div className='flex flex-col gap-1 justify-start'>
+                                <Button
+                                  variant='outline'
+                                  size='sm'
+                                  onClick={() => {
+                                    navigate(
+                                      `/offers/view/${encodeURIComponent(offer.offer.trim())}`,
+                                    );
+                                  }}
+                                >
+                                  <HandCoins className='h-4 w-4 mr-2' />
+                                  <Trans>View Offer</Trans>
+                                </Button>
+                                <Button
+                                  variant='outline'
+                                  size='sm'
+                                  onClick={() => {
+                                    openUrl(dexieOfferUrl(offer.id, isTestnet));
+                                  }}
+                                >
+                                  <img
+                                    src='https://raw.githubusercontent.com/dexie-space/dexie-kit/refs/heads/main/svg/duck.svg'
+                                    className='h-4 w-4 mr-2'
+                                    alt='Dexie.space logo'
+                                  />
+                                  <Trans>Dexie</Trans>
+                                </Button>
                               </div>
                             </div>
-                            <div className='flex flex-col gap-1 justify-start'>
-                              <Button
-                                variant='outline'
-                                size='sm'
-                                onClick={() => {
-                                  navigate(
-                                    `/offers/view/${encodeURIComponent(offer.offer.trim())}`,
-                                  );
-                                }}
-                              >
-                                <HandCoins className='h-4 w-4 mr-2' />
-                                <Trans>View Offer</Trans>
-                              </Button>
-                              <Button
-                                variant='outline'
-                                size='sm'
-                                onClick={() => {
-                                  openUrl(dexieOfferUrl(offer.id, isTestnet));
-                                }}
-                              >
-                                <img
-                                  src='https://raw.githubusercontent.com/dexie-space/dexie-kit/refs/heads/main/svg/duck.svg'
-                                  className='h-4 w-4 mr-2'
-                                  alt='Dexie.space logo'
-                                />
-                                <Trans>Dexie</Trans>
-                              </Button>
-                            </div>
                           </div>
-                        </div>
-                      ))}
-                    </div>
-                  )}
-                </div>
+                        ))}
+                      </div>
+                    )}
+                  </div>
 
-                {/* Offered For Sale Section */}
-                <div className='flex flex-col gap-1'>
-                  <h6 className='text-md font-bold'>
-                    <Trans>This NFT Offered For Sale</Trans>
-                  </h6>
-
-                  {offeredOffers.length === 0 ? (
-                    <div className='text-sm text-muted-foreground'>
-                      <Trans>
-                        This NFT is not currently offered for sale on Dexie
-                      </Trans>
-                    </div>
-                  ) : (
-                    <div className='grid gap-2'>
-                      {offeredOffers.map((offer: DexieOffer) => (
-                        <div key={offer.id} className='border rounded-lg p-3'>
-                          <div className='grid grid-cols-2 gap-4'>
-                            <div>
-                              <div className='text-sm font-medium mb-2'>
-                                <Trans>Requesting in exchange:</Trans>
+                  {/* Offered For Sale Section */}
+                  <div className='flex flex-col gap-1'>
+                    <h6 className='text-md font-bold'>
+                      <Trans>This NFT Offered For Sale</Trans>
+                    </h6>
+
+                    {offeredOffers.length === 0 ? (
+                      <div className='text-sm text-muted-foreground'>
+                        <Trans>
+                          This NFT is not currently offered for sale on Dexie
+                        </Trans>
+                      </div>
+                    ) : (
+                      <div className='grid gap-2'>
+                        {offeredOffers.map((offer: DexieOffer) => (
+                          <div key={offer.id} className='border rounded-lg p-3'>
+                            <div className='grid grid-cols-2 gap-4'>
+                              <div>
+                                <div className='text-sm font-medium mb-2'>
+                                  <Trans>Requesting in exchange:</Trans>
+                                </div>
+                                <div className='space-y-1'>
+                                  {offer.requested?.map((item: DexieAsset) => (
+                                    <div key={item.id} className='text-sm'>
+                                      {item.amount} {item.name} ({item.code})
+                                    </div>
+                                  ))}
+                                </div>
                               </div>
-                              <div className='space-y-1'>
-                                {offer.requested?.map((item: DexieAsset) => (
-                                  <div key={item.id} className='text-sm'>
-                                    {item.amount} {item.name} ({item.code})
-                                  </div>
-                                ))}
+                              <div className='flex flex-col gap-1 justify-start'>
+                                <Button
+                                  variant='outline'
+                                  size='sm'
+                                  onClick={() => {
+                                    openUrl(dexieOfferUrl(offer.id, isTestnet));
+                                  }}
+                                >
+                                  <img
+                                    src='https://raw.githubusercontent.com/dexie-space/dexie-kit/refs/heads/main/svg/duck.svg'
+                                    className='h-4 w-4 mr-2'
+                                    alt='Dexie.space logo'
+                                  />
+                                  <Trans>Dexie</Trans>
+                                </Button>
                               </div>
                             </div>
-                            <div className='flex flex-col gap-1 justify-start'>
-                              <Button
-                                variant='outline'
-                                size='sm'
-                                onClick={() => {
-                                  openUrl(dexieOfferUrl(offer.id, isTestnet));
-                                }}
-                              >
-                                <img
-                                  src='https://raw.githubusercontent.com/dexie-space/dexie-kit/refs/heads/main/svg/duck.svg'
-                                  className='h-4 w-4 mr-2'
-                                  alt='Dexie.space logo'
-                                />
-                                <Trans>Dexie</Trans>
-                              </Button>
-                            </div>
                           </div>
-                        </div>
-                      ))}
-                    </div>
-                  )}
-                </div>
+                        ))}
+                      </div>
+                    )}
+                  </div>
 
-                {/* Local Offers Section */}
-                {offersForAsset.length > 0 && (
-                  <div className='flex flex-col gap-1'>
-                    <div className='grid gap-2'>
-                      {offersForAsset.map((localOffer) => (
-                        <div
-                          key={localOffer.offer_id}
-                          className='border rounded-lg p-3'
-                        >
-                          <div className='grid grid-cols-2 gap-4'>
-                            <div>
-                              <div className='text-sm font-medium mb-2'>
-                                <Trans>Local Offer</Trans>
-                              </div>
-                              <div className='text-sm text-muted-foreground'>
-                                <Trans>
-                                  Status: {getOfferStatus(localOffer.status)}
-                                </Trans>
-                              </div>
-                              {localOffer.creation_timestamp && (
+                  {/* Local Offers Section */}
+                  {offersForAsset.length > 0 && (
+                    <div className='flex flex-col gap-1'>
+                      <div className='grid gap-2'>
+                        {offersForAsset.map((localOffer) => (
+                          <div
+                            key={localOffer.offer_id}
+                            className='border rounded-lg p-3'
+                          >
+                            <div className='grid grid-cols-2 gap-4'>
+                              <div>
+                                <div className='text-sm font-medium mb-2'>
+                                  <Trans>Local Offer</Trans>
+                                </div>
                                 <div className='text-sm text-muted-foreground'>
                                   <Trans>
-                                    Created:{' '}
-                                    {formatTimestamp(
-                                      localOffer.creation_timestamp,
-                                      'short',
-                                      'short',
-                                    )}
+                                    Status: {getOfferStatus(localOffer.status)}
                                   </Trans>
                                 </div>
-                              )}
-                            </div>
-                            <div className='flex flex-col gap-1 justify-start'>
-                              <Button
-                                variant='outline'
-                                size='sm'
-                                onClick={() => {
-                                  navigate(
-                                    `/offers/view_saved/${localOffer.offer_id}`,
-                                  );
-                                }}
-                              >
-                                <HandCoins className='h-4 w-4 mr-2' />
-                                <Trans>View Offer</Trans>{' '}
-                              </Button>
+                                {localOffer.creation_timestamp && (
+                                  <div className='text-sm text-muted-foreground'>
+                                    <Trans>
+                                      Created:{' '}
+                                      {formatTimestamp(
+                                        localOffer.creation_timestamp,
+                                        'short',
+                                        'short',
+                                      )}
+                                    </Trans>
+                                  </div>
+                                )}
+                              </div>
+                              <div className='flex flex-col gap-1 justify-start'>
+                                <Button
+                                  variant='outline'
+                                  size='sm'
+                                  onClick={() => {
+                                    navigate(
+                                      `/offers/view_saved/${localOffer.offer_id}`,
+                                    );
+                                  }}
+                                >
+                                  <HandCoins className='h-4 w-4 mr-2' />
+                                  <Trans>View Offer</Trans>{' '}
+                                </Button>
+                              </div>
                             </div>
                           </div>
-                        </div>
-                      ))}
+                        ))}
+                      </div>
                     </div>
-                  </div>
-                )}
-              </div>
+                  )}
+                </div>
+              )}
             </CardContent>
           </Card>
 
diff --git a/src/pages/Option.tsx b/src/pages/Option.tsx
index 2ca1faa8e..96dbbb995 100644
--- a/src/pages/Option.tsx
+++ b/src/pages/Option.tsx
@@ -6,10 +6,11 @@ import Header from '@/components/Header';
 import { LabeledItem } from '@/components/LabeledItem';
 import { Button } from '@/components/ui/button';
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
+import { useNetwork } from '@/hooks/useNetwork';
 import spacescanLogo from '@/images/spacescan-logo-192.png';
+import { offersEnabled } from '@/lib/features';
 import { formatTimestamp, getOfferStatus } from '@/lib/utils';
 import { spacescanCoinUrl } from '@/lib/urls';
-import { useNetwork } from '@/hooks/useNetwork';
 import { t } from '@lingui/core/macro';
 import { Trans } from '@lingui/react/macro';
 import { openUrl } from '@tauri-apps/plugin-opener';
@@ -61,6 +62,8 @@ export default function Option() {
 
   // Check for local offers when option loads
   useEffect(() => {
+    if (!offersEnabled) return;
+
     if (option?.launcher_id) {
       commands
         .getOffersForAsset({ asset_id: option.launcher_id })
@@ -202,7 +205,7 @@ export default function Option() {
             </Card>
           </div>
           {/* Local Offers Section */}
-          {offersForAsset.length > 0 && (
+          {offersEnabled && offersForAsset.length > 0 && (
             <Card className='mb-6'>
               <CardHeader className='pb-2'>
                 <CardTitle className='flex items-center gap-2'>
diff --git a/src/pages/QrScanner.tsx b/src/pages/QrScanner.tsx
index b0a9b2476..cfe1c364a 100644
--- a/src/pages/QrScanner.tsx
+++ b/src/pages/QrScanner.tsx
@@ -1,5 +1,6 @@
 import Header from '@/components/Header';
 import Layout from '@/components/Layout';
+import { offersEnabled } from '@/lib/features';
 import { useNavigationStore } from '@/state';
 import { t } from '@lingui/core/macro';
 import { Trans } from '@lingui/react/macro';
@@ -15,7 +16,7 @@ export default function QRScanner() {
 
   const handleScanSuccess = useCallback(
     (content: string) => {
-      if (returnPath.startsWith('/offers')) {
+      if (offersEnabled && returnPath.startsWith('/offers')) {
         navigate(`/offers/view/${encodeURIComponent(content.trim())}`, {
           replace: true,
         });
diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx
index 8ef69fa88..164c6e80b 100644
--- a/src/pages/Settings.tsx
+++ b/src/pages/Settings.tsx
@@ -45,6 +45,7 @@ import { useErrors } from '@/hooks/useErrors';
 import { useScannerOrClipboard } from '@/hooks/useScannerOrClipboard';
 import { useWalletConnect } from '@/hooks/useWalletConnect';
 import { exportText, ExportType } from '@/lib/exportText';
+import { offersEnabled } from '@/lib/features';
 import {
   clearState,
   fetchState,
@@ -383,41 +384,43 @@ function GlobalSettings() {
             </div>
           )}
         </SettingItem>
-        <SettingItem
-          label={t`Default Offer Expiry`}
-          description={t`Set a default expiration time for new offers`}
-          control={
-            <Switch
-              checked={expiry.enabled}
-              onCheckedChange={(checked) => {
-                setExpiry({
-                  ...expiry,
-                  enabled: checked,
-                });
-              }}
-            />
-          }
-        >
-          {expiry.enabled && (
-            <div className='grid grid-cols-3 gap-4 mt-2'>
-              <TimeInput
-                label={t`Days`}
-                value={expiry.days}
-                onChange={(value) => setExpiry({ ...expiry, days: value })}
-              />
-              <TimeInput
-                label={t`Hours`}
-                value={expiry.hours}
-                onChange={(value) => setExpiry({ ...expiry, hours: value })}
-              />
-              <TimeInput
-                label={t`Minutes`}
-                value={expiry.minutes}
-                onChange={(value) => setExpiry({ ...expiry, minutes: value })}
+        {offersEnabled && (
+          <SettingItem
+            label={t`Default Offer Expiry`}
+            description={t`Set a default expiration time for new offers`}
+            control={
+              <Switch
+                checked={expiry.enabled}
+                onCheckedChange={(checked) => {
+                  setExpiry({
+                    ...expiry,
+                    enabled: checked,
+                  });
+                }}
               />
-            </div>
-          )}
-        </SettingItem>
+            }
+          >
+            {expiry.enabled && (
+              <div className='grid grid-cols-3 gap-4 mt-2'>
+                <TimeInput
+                  label={t`Days`}
+                  value={expiry.days}
+                  onChange={(value) => setExpiry({ ...expiry, days: value })}
+                />
+                <TimeInput
+                  label={t`Hours`}
+                  value={expiry.hours}
+                  onChange={(value) => setExpiry({ ...expiry, hours: value })}
+                />
+                <TimeInput
+                  label={t`Minutes`}
+                  value={expiry.minutes}
+                  onChange={(value) => setExpiry({ ...expiry, minutes: value })}
+                />
+              </div>
+            )}
+          </SettingItem>
+        )}
       </SettingsSection>
 
       <SettingsSection title={t`Syncing Defaults`}>
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
index 65d8b690f..25d16bc67 100644
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -2,6 +2,8 @@
 
 interface ImportMetaEnv {
   readonly VITE_DISABLE_OFFERS?: string;
+  readonly VITE_DISABLE_OPTIONS?: string;
+  readonly VITE_DISABLE_SWAP?: string;
 }
 
 interface ImportMeta {

From c5320834f9ecd76c2355b12ef953f9937893b243 Mon Sep 17 00:00:00 2001
From: Rigidity <me@rigidnetwork.com>
Date: Sun, 12 Jul 2026 21:50:42 +0200
Subject: [PATCH 3/4] Address latest

---
 crates/sage-wallet/src/wallet/offer/take_offer.rs | 9 ++-------
 src/components/selectors/AssetSelector.tsx        | 6 ++----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/crates/sage-wallet/src/wallet/offer/take_offer.rs b/crates/sage-wallet/src/wallet/offer/take_offer.rs
index 05808907c..67b3d55e8 100644
--- a/crates/sage-wallet/src/wallet/offer/take_offer.rs
+++ b/crates/sage-wallet/src/wallet/offer/take_offer.rs
@@ -95,13 +95,8 @@ impl Wallet {
             .iter()
             .map(|coin_spend| coin_spend.coin.coin_id())
             .collect_vec();
-        self.select_spends_excluding(
-            &mut ctx,
-            &mut spends,
-            &actions,
-            &offer_input_coin_ids,
-        )
-        .await?;
+        self.select_spends_excluding(&mut ctx, &mut spends, &actions, &offer_input_coin_ids)
+            .await?;
 
         // Reset DIDs and reveal trade prices
         let mut royalty_nft_count = 0;
diff --git a/src/components/selectors/AssetSelector.tsx b/src/components/selectors/AssetSelector.tsx
index a99192fe9..5a4dbec75 100644
--- a/src/components/selectors/AssetSelector.tsx
+++ b/src/components/selectors/AssetSelector.tsx
@@ -12,12 +12,12 @@ import {
   TooltipProvider,
   TooltipTrigger,
 } from '@/components/ui/tooltip';
+import { optionsEnabled } from '@/lib/features';
 import { toDecimal } from '@/lib/utils';
 import { Assets } from '@/state';
 import BigNumber from 'bignumber.js';
 import { t } from '@lingui/core/macro';
 import { Trans } from '@lingui/react/macro';
-import { platform } from '@tauri-apps/plugin-os';
 import {
   AlertTriangle,
   FilePenLine,
@@ -48,8 +48,6 @@ export function AssetSelector({
   setSplitNftOffers,
   fee,
 }: AssetSelectorProps) {
-  const isIos = platform() === 'ios';
-
   const [ownedTokens, setOwnedTokens] = useState<TokenRecord[]>([]);
   const [tokenIds, setTokenIds] = useState<number[]>([]);
   const [nftIds, setNftIds] = useState<number[]>([]);
@@ -214,7 +212,7 @@ export function AssetSelector({
           <Trans>NFT</Trans>
         </Button>
 
-        {!isIos && (
+        {optionsEnabled && (
           <Button variant='outline' className='flex-grow' onClick={addOption}>
             <PlusIcon className='mr-0.5 h-3 w-3' aria-hidden='true' />{' '}
             <Trans>Option</Trans>

From fd6f93646adddc743ed4d4d59e7c8a0c998b8d8e Mon Sep 17 00:00:00 2001
From: Rigidity <me@rigidnetwork.com>
Date: Sun, 12 Jul 2026 21:52:17 +0200
Subject: [PATCH 4/4] Simplify build number

---
 .github/workflows/build.yml | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fde5386ea..0afa268f0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -77,8 +77,7 @@ jobs:
           - platform: 'macos-26'
             platform_name: iOS (TestFlight)
             platform_type: iOS
-            build: 'pnpm tauri ios build --export-method app-store-connect --build-number "$IOS_BUILD_NUMBER"'
-            build_number_variant: 1
+            build: 'pnpm tauri ios build --export-method app-store-connect --build-number 1'
             disable_offers: 'false'
             disable_options: 'false'
             disable_swap: 'false'
@@ -86,8 +85,7 @@ jobs:
           - platform: 'macos-26'
             platform_name: iOS (App Store)
             platform_type: iOS
-            build: 'pnpm tauri ios build --export-method app-store-connect --build-number "$IOS_BUILD_NUMBER"'
-            build_number_variant: 2
+            build: 'pnpm tauri ios build --export-method app-store-connect --build-number 2'
             disable_offers: 'true'
             disable_options: 'true'
             disable_swap: 'true'
@@ -184,23 +182,6 @@ jobs:
       - name: Bindgen CLI
         run: cargo install bindgen-cli --locked
 
-      - name: Calculate iOS build number
-        id: ios_build_number
-        if: matrix.platform_type == 'iOS'
-        run: |
-          if ((GITHUB_RUN_ATTEMPT >= 1000)); then
-            echo "GITHUB_RUN_ATTEMPT must be less than 1000"
-            exit 1
-          fi
-
-          build_number=$((GITHUB_RUN_NUMBER * 10000 + GITHUB_RUN_ATTEMPT * 10 + ${{ matrix.build_number_variant }}))
-          if ((build_number > 4294967295)); then
-            echo "Calculated iOS build number exceeds the u32 limit"
-            exit 1
-          fi
-
-          echo "value=$build_number" >> "$GITHUB_OUTPUT"
-
       # On MacOS we only notarize on tagged releases
       # On iOS we need these secrets as well to do code signing
       - name: Build with secrets
@@ -212,7 +193,6 @@ jobs:
           APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
           APPLE_API_KEY: ${{ secrets.APPLE_API_KEY_ID }}
           APPLE_API_KEY_PATH: ~/private_keys/AuthKey_${{ secrets.APPLE_API_KEY_ID }}.p8
-          IOS_BUILD_NUMBER: ${{ steps.ios_build_number.outputs.value }}
           VITE_DISABLE_OFFERS: ${{ matrix.disable_offers }}
           VITE_DISABLE_OPTIONS: ${{ matrix.disable_options }}
           VITE_DISABLE_SWAP: ${{ matrix.disable_swap }}