diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12fe47fb7f1..09980fe2517 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased (develop)
 
 - added: Remote enable/disable of gift card providers via the info server's giftCardInfo config, supporting whole-provider disabling for Phaze and Bitrefill and per-brand disabling for Phaze.
+- changed: Use the new `makeMaxSpend` wallet API to build max-spend transactions atomically when sending the maximum and when migrating token balances.
 
 ## 4.49.0 (staging)
 
diff --git a/src/__tests__/scenes/__snapshots__/SendScene2.ui.test.tsx.snap b/src/__tests__/scenes/__snapshots__/SendScene2.ui.test.tsx.snap
index b42537c0ea4..0e57f390200 100644
--- a/src/__tests__/scenes/__snapshots__/SendScene2.ui.test.tsx.snap
+++ b/src/__tests__/scenes/__snapshots__/SendScene2.ui.test.tsx.snap
@@ -16078,6 +16078,7 @@ exports[`SendScene2 Render SendScene 1`] = `
                         "opacity": 1,
                       }
                     }
+                    testID="sendAddressEnter"
                   >
                     <Text
                       allowFontScaling={false}
diff --git a/src/components/scenes/MigrateWalletCompletionScene.tsx b/src/components/scenes/MigrateWalletCompletionScene.tsx
index f108476266e..b7bc9ce4b61 100644
--- a/src/components/scenes/MigrateWalletCompletionScene.tsx
+++ b/src/components/scenes/MigrateWalletCompletionScene.tsx
@@ -242,22 +242,17 @@ const MigrateWalletCompletionComponent: React.FC<Props> = props => {
           const hasError = false
           const successfullyTransferredTokenIds: string[] = []
           for (const item of tokenItems) {
-            let tokenSpendInfo: EdgeSpendInfo = {
+            const tokenSpendInfo: EdgeSpendInfo = {
               tokenId: item.tokenId,
               spendTargets: [{ publicAddress: newPublicAddress }],
               networkFeeOption: 'standard'
             }
             try {
-              const maxAmount = await oldWallet.getMaxSpendable(tokenSpendInfo)
-              tokenSpendInfo = {
-                ...tokenSpendInfo,
-                spendTargets: [
-                  { ...tokenSpendInfo.spendTargets[0], nativeAmount: maxAmount }
-                ]
-              }
+              // Build and send the full token balance atomically:
               const tx = await makeSpendSignAndBroadcast(
                 oldWallet,
-                tokenSpendInfo
+                tokenSpendInfo,
+                true
               )
               successfullyTransferredTokenIds.push(item.tokenId)
               const txFee = tx.parentNetworkFee ?? tx.networkFee
@@ -454,9 +449,12 @@ const MigrateWalletCompletionComponent: React.FC<Props> = props => {
 
 const makeSpendSignAndBroadcast = async (
   wallet: EdgeCurrencyWallet,
-  spendInfo: EdgeSpendInfo
+  spendInfo: EdgeSpendInfo,
+  max: boolean = false
 ): Promise<EdgeTransaction> => {
-  const edgeUnsignedTransaction = await wallet.makeSpend(spendInfo)
+  const edgeUnsignedTransaction = max
+    ? await wallet.makeMaxSpend(spendInfo)
+    : await wallet.makeSpend(spendInfo)
   const edgeSignedTransaction = await wallet.signTx(edgeUnsignedTransaction)
   const edgeBroadcastedTransaction = await wallet.broadcastTx(
     edgeSignedTransaction
diff --git a/src/components/scenes/SendScene2.tsx b/src/components/scenes/SendScene2.tsx
index 58aa9578ff5..5354cf6d8a2 100644
--- a/src/components/scenes/SendScene2.tsx
+++ b/src/components/scenes/SendScene2.tsx
@@ -1584,10 +1584,15 @@ const SendComponent: React.FC<Props> = props => {
           setProcessingAmountChanged(false)
           return
         }
+        let maxEdgeTransaction: EdgeTransaction | undefined
         if (maxSpendSetter === 0) {
           spendInfo.spendTargets[0].nativeAmount = '0' // Some currencies error without a nativeAmount
-          const maxSpendable = await coreWallet.getMaxSpendable(spendInfo)
-          spendInfo.spendTargets[0].nativeAmount = maxSpendable
+          // Build the max-spend transaction atomically, then reflect its amount
+          // back onto the spendInfo so the spending-limit / minimum checks and
+          // the flip input display use the real max amount:
+          maxEdgeTransaction = await coreWallet.makeMaxSpend(spendInfo)
+          spendInfo.spendTargets[0].nativeAmount =
+            maxEdgeTransaction.spendTargets?.[0]?.nativeAmount ?? '0'
         }
         if (spendInfo.spendTargets[0].nativeAmount == null) {
           flipInputModalRef.current?.setFees({
@@ -1650,7 +1655,9 @@ const SendComponent: React.FC<Props> = props => {
 
         makeSpendCounter.current++
         const localMakeSpendCounter = makeSpendCounter.current
-        const edgeTx = await coreWallet.makeSpend(spendInfo)
+        // Reuse the max-spend transaction when it was already built above:
+        const edgeTx =
+          maxEdgeTransaction ?? (await coreWallet.makeSpend(spendInfo))
         if (localMakeSpendCounter < makeSpendCounter.current) {
           // This makeSpend result is out of date. Throw it away since a newer one is in flight.
           // This is not REALLY needed since useAsyncEffect seems to serialize calls into the effect
diff --git a/src/components/themed/ExchangedFlipInput2.tsx b/src/components/themed/ExchangedFlipInput2.tsx
index 37466b5bbf3..4c5d27f24aa 100644
--- a/src/components/themed/ExchangedFlipInput2.tsx
+++ b/src/components/themed/ExchangedFlipInput2.tsx
@@ -342,7 +342,11 @@ const ExchangedFlipInput2Component = React.forwardRef<
           />
         </View>
         {showMaxButton ? (
-          <EdgeTouchableOpacity style={styles.maxButton} onPress={onMaxPress}>
+          <EdgeTouchableOpacity
+            style={styles.maxButton}
+            onPress={onMaxPress}
+            testID="flipInputMaxButton"
+          >
             <EdgeText style={styles.maxButtonText}>
               {lstrings.string_max_cap}
             </EdgeText>
diff --git a/src/components/tiles/AddressTile2.tsx b/src/components/tiles/AddressTile2.tsx
index 4ce6c84385a..c4bb9a0d5af 100644
--- a/src/components/tiles/AddressTile2.tsx
+++ b/src/components/tiles/AddressTile2.tsx
@@ -518,6 +518,7 @@ export const AddressTile2 = React.forwardRef(
             <EdgeTouchableOpacity
               style={styles.buttonContainer}
               onPress={handleChangeAddress}
+              testID="sendAddressEnter"
             >
               <FontAwesome
                 name="edit"