diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 109a1773f..a85de240a 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -841,7 +841,7 @@ SPEC CHECKSUMS:
   BEMCheckBox: 5ba6e37ade3d3657b36caecc35c8b75c6c2b1a4e
   boost: 57d2868c099736d80fcd648bf211b4431e51a558
   BVLinearGradient: 34a999fda29036898a09c6a6b728b0b4189e1a44
-  Charts: 354f86803d11d9c35de280587fef50d1af063978
+  Charts: ce0768268078eee0336f122c3c4ca248e4e204c5
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   EXApplication: d8f53a7eee90a870a75656280e8d4b85726ea903
   EXBarCodeScanner: 8e23fae8d267dbef9f04817833a494200f1fce35
@@ -861,9 +861,9 @@ SPEC CHECKSUMS:
   FBLazyVector: f1897022b53abf1469d6ad692ee2c69f57d967f3
   FBReactNativeSpec: 627fd07f1b9d498c9fa572e76d7f1a6b1ee9a444
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 791fe035093b84822da7f0870421a25839ca7870
+  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
   helium-react-native-sdk: 32c0a7e3abc733a7f3d291013b2db31475fc6980
-  hermes-engine: 7a53ccac09146018a08239c5425625fdb79a6162
+  hermes-engine: 0784cadad14b011580615c496f77e0ae112eed75
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   MapboxCommon: fdf7fd31c90b7b607cd9c63e37797f023c01d860
   MapboxCoreMaps: 24270c7c6b8cb71819fc2f3c549db9620ee4d019
@@ -871,7 +871,7 @@ SPEC CHECKSUMS:
   MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6
   MultiplatformBleAdapter: 5a6a897b006764392f9cef785e4360f54fb9477d
   OneSignalXCFramework: 81ceac017a290f23793443323090cfbe888f74ea
-  RCT-Folly: 85766c3226c7ec638f05ad7cb3cf6a268d6c4241
+  RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
   RCTRequired: bd6045fbd511da5efe6db89eecb21e4e36bd7cbf
   RCTTypeSafety: c06d9f906faa69dd1c88223204c3a24767725fd8
   React: b9ea33557ef1372af247f95d110fbdea114ed3b2
diff --git a/src/features/payment/PaymentScreen.tsx b/src/features/payment/PaymentScreen.tsx
index 9e1f6b677..a7b11d394 100644
--- a/src/features/payment/PaymentScreen.tsx
+++ b/src/features/payment/PaymentScreen.tsx
@@ -114,7 +114,8 @@ const PaymentScreen = () => {
   const hntKeyboardRef = useRef<HNTKeyboardRef>(null)
   const { oraclePrice } = useBalance()
   const { visibleTokens } = useVisibleTokens()
-  const [mint, setMint] = useState<PublicKey>(HNT_MINT)
+  const inputMint = usePublicKey(route.params?.mint)
+  const [mint, setMint] = useState<PublicKey>(inputMint || HNT_MINT)
   const {
     currentAccount,
     currentNetworkAddress,
diff --git a/src/solana/WalletSignBottomSheet.tsx b/src/solana/WalletSignBottomSheet.tsx
index 5c823b4b9..2eebe573a 100644
--- a/src/solana/WalletSignBottomSheet.tsx
+++ b/src/solana/WalletSignBottomSheet.tsx
@@ -447,11 +447,7 @@ const WalletSignBottomSheet = forwardRef(
                 marginTop="l"
               >
                 <ButtonPressable
-                  width={
-                    !(insufficientFunds || insufficientRentExempt)
-                      ? '48%'
-                      : '100%'
-                  }
+                  width="48%"
                   borderRadius="round"
                   backgroundColor="white"
                   backgroundColorOpacity={0.1}
diff --git a/src/storage/TokensProvider.tsx b/src/storage/TokensProvider.tsx
index da28a47f5..e6164d693 100644
--- a/src/storage/TokensProvider.tsx
+++ b/src/storage/TokensProvider.tsx
@@ -100,7 +100,8 @@ export const useVisibleTokens = () => {
   const { visibleTokens, setVisibleTokens } = useContext(TokensContext)
 
   return {
-    visibleTokens: visibleTokens[currentAccount?.address || ''] || new Set(),
+    visibleTokens:
+      visibleTokens[currentAccount?.address || ''] || DEFAULT_TOKENS,
     setVisibleTokens,
   }
 }
diff --git a/src/utils/solanaUtils.ts b/src/utils/solanaUtils.ts
index 319a7b169..ac20c86b5 100644
--- a/src/utils/solanaUtils.ts
+++ b/src/utils/solanaUtils.ts
@@ -64,6 +64,7 @@ import { createMemoInstruction } from '@solana/spl-memo'
 import {
   ASSOCIATED_TOKEN_PROGRAM_ID,
   AccountLayout,
+  NATIVE_MINT,
   TOKEN_PROGRAM_ID,
   createAssociatedTokenAccountIdempotentInstruction,
   createAssociatedTokenAccountInstruction,
@@ -345,9 +346,10 @@ export const transferToken = async (
     secretKey: secureAcct.privateKey,
   }
 
-  const transaction = !mintAddress
-    ? await createTransferSolTxn(anchorProvider, signer, payments)
-    : await createTransferTxn(anchorProvider, signer, payments, mintAddress)
+  const transaction =
+    !mintAddress || mintAddress === NATIVE_MINT.toBase58()
+      ? await createTransferSolTxn(anchorProvider, signer, payments)
+      : await createTransferTxn(anchorProvider, signer, payments, mintAddress)
 
   return transaction
 }