keep transfer form in cache (no reset on page change

app/build.gradle.kts

@@ -11,8 +11,8 @@ android {
         applicationId = "sh.sar.basedbank"
         minSdk = 26
         targetSdk = 36
-        versionCode = 11
-        versionName = "1.0.12"
+        versionCode = 13
+        versionName = "1.0.14"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/sh/sar/basedbank/ui/home/BmlQrPayFragment.kt

@@ -33,6 +33,8 @@ import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.databinding.FragmentBmlQrPayBinding
 import sh.sar.basedbank.databinding.ItemAccountDropdownBinding
 import sh.sar.basedbank.util.CredentialStore
+import sh.sar.basedbank.util.RecentPick
+import sh.sar.basedbank.util.RecentsCache
 import sh.sar.basedbank.util.Totp
 
 class BmlQrPayFragment : Fragment() {
@@ -150,6 +152,19 @@ class BmlQrPayFragment : Fragment() {
                 return@launch
             }
             merchantInfo = info
+            if (info.amount == 0.0) {
+                val qrUrl = arguments?.getString(ARG_QR_URL)
+                if (qrUrl != null) {
+                    RecentsCache.save(requireContext(), RecentPick(
+                        accountNumber = "bmlqr:$qrUrl",
+                        displayName   = info.merchantName,
+                        subtitle      = info.merchantAddress.ifBlank { "BML Merchant" },
+                        colorHex      = "#0066A1",
+                        imageHash     = null,
+                        isProfileImage = false
+                    ))
+                }
+            }
             populateMerchant(info)
         }
     }

app/src/main/java/sh/sar/basedbank/ui/home/ContactPickerSheetFragment.kt

@@ -168,6 +168,10 @@ class ContactPickerSheetFragment : BottomSheetDialogFragment() {
         val account = accounts.firstOrNull { it.accountNumber == accountNumber }
         val bundle = bundleOf(KEY_ACCOUNT_NUMBER to accountNumber, KEY_LABEL to label)
         when {
+            accountNumber.startsWith("bmlqr:") -> {
+                bundle.putString(KEY_SUBTITLE, "BML QR Merchant")
+                bundle.putString(KEY_COLOR, "#0066A1")
+            }
             account != null -> {
                 bundle.putString(KEY_SUBTITLE, "${account.accountNumber} · ${account.currencyName} ${account.availableBalance}")
                 bundle.putString(KEY_COLOR, "#FE860E")

app/src/main/java/sh/sar/basedbank/ui/home/ContactsFragment.kt

@@ -178,7 +178,7 @@ class ContactsFragment : Fragment() {
             colorHex      = contact.bankColor,
             imageHash     = contact.imageHash
         )
-        (requireActivity() as HomeActivity).navigateTo(R.id.nav_transfer, fragment)
+        (requireActivity() as HomeActivity).showWithBackStack(fragment)
     }
 
     private fun confirmDelete(contact: ContactDisplay) {

app/src/main/java/sh/sar/basedbank/ui/home/HomeActivity.kt

@@ -76,6 +76,7 @@ class HomeActivity : AppCompatActivity() {
     private val viewModel: HomeViewModel by viewModels()
     private lateinit var toggle: ActionBarDrawerToggle
     private var suppressBottomNavCallback = false
+    private var cachedTransferFragment: TransferFragment? = null
 
     private var backPressedOnce = false
     private val backPressHandler = Handler(Looper.getMainLooper())
@@ -156,7 +157,7 @@ class HomeActivity : AppCompatActivity() {
                 R.id.nav_dashboard        -> DashboardFragment()
                 R.id.nav_accounts         -> AccountsFragment()
                 R.id.nav_contacts         -> ContactsFragment()
-                R.id.nav_transfer         -> TransferFragment()
+                R.id.nav_transfer         -> cachedTransferFragment ?: TransferFragment().also { cachedTransferFragment = it }
                 R.id.nav_pay_mv_qr        -> PayMvQrFragment()
                 R.id.nav_more             -> MoreFragment()
                 R.id.nav_activities       -> ActivitiesFragment()
@@ -390,7 +391,7 @@ fun applyNavLabelVisibility() {
             R.id.nav_dashboard        -> DashboardFragment()
             R.id.nav_accounts         -> AccountsFragment()
             R.id.nav_contacts         -> ContactsFragment()
-            R.id.nav_transfer         -> TransferFragment()
+            R.id.nav_transfer         -> cachedTransferFragment ?: TransferFragment().also { cachedTransferFragment = it }
             R.id.nav_pay_mv_qr        -> PayMvQrFragment()
             R.id.nav_activities       -> ActivitiesFragment()
             R.id.nav_transfer_history -> TransferHistoryFragment()
@@ -446,18 +447,20 @@ fun applyNavLabelVisibility() {
     }
 
     private fun routeSharedQrText(text: String) {
+        val store = CredentialStore(this)
         val bmlUrl = sh.sar.basedbank.util.PaymvQrParser.extractBmlGatewayUrl(text)
         if (text.startsWith("https://ebanking.bankofmaldives.com.mv/qrpay/") || bmlUrl != null) {
-            navigateTo(R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(bmlUrl ?: text))
+            navigateTo(R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(bmlUrl ?: text, store.getDefaultCardAccountNumber()))
             return
         }
         val qr = sh.sar.basedbank.util.PaymvQrParser.parse(text)
         if (qr?.accountNumber != null) {
             navigateTo(R.id.nav_transfer, TransferFragment.newInstanceFromQr(
-                accountNumber = qr.accountNumber,
-                displayName   = qr.merchantName ?: qr.accountNumber,
-                amount        = qr.amount,
-                remarks       = qr.purpose
+                accountNumber     = qr.accountNumber,
+                displayName       = qr.merchantName ?: qr.accountNumber,
+                amount            = qr.amount,
+                remarks           = qr.purpose,
+                fromAccountNumber = store.getDefaultAccountNumber()
             ))
         } else {
             Toast.makeText(this, R.string.transfer_qr_invalid, Toast.LENGTH_SHORT).show()

app/src/main/java/sh/sar/basedbank/ui/home/PayMvQrFragment.kt

@@ -7,13 +7,10 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Environment
 import android.provider.MediaStore
-import android.app.Activity
-import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.FileProvider
 import androidx.core.view.ViewCompat
@@ -39,7 +36,6 @@ import sh.sar.basedbank.databinding.FragmentPayMvQrBinding
 import sh.sar.basedbank.util.CredentialStore
 import sh.sar.basedbank.databinding.ItemAccountDropdownBinding
 import sh.sar.basedbank.util.AccountListParser
-import sh.sar.basedbank.util.PaymvQrParser
 import sh.sar.basedbank.util.bmlapi.BmlCardParser
 import sh.sar.basedbank.util.bmlapi.BmlDashboardParser
 import java.io.File
@@ -56,31 +52,6 @@ class PayMvQrFragment : Fragment() {
     private var generateJob: Job? = null
     private val dropdownProfileImageCache = mutableMapOf<String, Bitmap>()
 
-    private val qrLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-        if (result.resultCode != Activity.RESULT_OK) return@registerForActivityResult
-        val raw = result.data?.getStringExtra(QrScannerActivity.EXTRA_QR_CONTENT) ?: return@registerForActivityResult
-
-        // BML card/gateway QR — hand off to dedicated payment screen
-        val bmlUrl = PaymvQrParser.extractBmlGatewayUrl(raw)
-        if (raw.startsWith("https://ebanking.bankofmaldives.com.mv/qrpay/") || bmlUrl != null) {
-            (requireActivity() as HomeActivity).navigateTo(R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(bmlUrl ?: raw))
-            return@registerForActivityResult
-        }
-
-        val qr = PaymvQrParser.parse(raw)
-        if (qr == null || qr.accountNumber == null) {
-            Toast.makeText(requireContext(), R.string.transfer_qr_invalid, Toast.LENGTH_SHORT).show()
-            return@registerForActivityResult
-        }
-        val activity = requireActivity() as HomeActivity
-        activity.navigateTo(R.id.nav_transfer, TransferFragment.newInstanceFromQr(
-            accountNumber = qr.accountNumber,
-            displayName   = qr.merchantName ?: qr.accountNumber,
-            amount        = qr.amount,
-            remarks       = qr.purpose
-        ))
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View {
@@ -106,7 +77,7 @@ class PayMvQrFragment : Fragment() {
         binding.btnShare.setOnClickListener { shareQr() }
         binding.btnSave.setOnClickListener { saveQr() }
         binding.btnScanQr.setOnClickListener {
-            qrLauncher.launch(Intent(requireContext(), QrScannerActivity::class.java))
+            (requireActivity() as HomeActivity).navigateTo(R.id.nav_transfer, TransferFragment.newInstanceWithAutoScan())
         }
     }
 

app/src/main/java/sh/sar/basedbank/ui/home/TransferFragment.kt

@@ -92,9 +92,18 @@ class TransferFragment : Fragment() {
     // Values: "FAHIPAY_TRANSFER", "RAASTAS", "OOREDOO_BILL"
     private var selectedFahipayService: String? = null
 
+    // Form state preserved across view destroy/create when the fragment instance is cached
+    private var savedAmount = ""
+    private var savedRemarks = ""
+    private var savedToText = ""
+    private var savedToSubtitle = ""
+    private var savedToColorHex = "#607D8B"
+    private var savedToImageHash: String? = null
+
     // BML QR merchant payment mode (set when navigated from a card QR scan)
     private var bmlQrInfo: BmlQrPayInfo? = null
     private var bmlGatewayQr = false  // true for pay.bml.com.mv QRs (requires pre-initiate step)
+    private var bmlQrLookupAttempted = false  // prevents re-lookup after user clears the merchant
     private val dropdownProfileImageCache = mutableMapOf<String, Bitmap>()
 
     // BML business profile OTP flow state
@@ -245,11 +254,27 @@ class TransferFragment : Fragment() {
 
         childFragmentManager.setFragmentResultListener(ContactPickerSheetFragment.REQUEST_KEY, viewLifecycleOwner) { _, bundle ->
             val accountNumber = bundle.getString(ContactPickerSheetFragment.KEY_ACCOUNT_NUMBER) ?: return@setFragmentResultListener
+            if (accountNumber.startsWith("bmlqr:")) {
+                lookupBmlQrMerchant(accountNumber.removePrefix("bmlqr:"))
+                return@setFragmentResultListener
+            }
             val label     = bundle.getString(ContactPickerSheetFragment.KEY_LABEL) ?: ""
             val subtitle  = bundle.getString(ContactPickerSheetFragment.KEY_SUBTITLE) ?: accountNumber
             val colorHex  = bundle.getString(ContactPickerSheetFragment.KEY_COLOR) ?: "#607D8B"
             val imageHash = bundle.getString(ContactPickerSheetFragment.KEY_IMAGE_HASH)
             prefillToDirectly(accountNumber, label, subtitle, colorHex, imageHash)
+            if (selectedAccount == null) {
+                val defaultNum = CredentialStore(requireContext()).getDefaultAccountNumber()
+                if (defaultNum != null) {
+                    val defaultAcc = viewModel.accounts.value?.firstOrNull { it.accountNumber == defaultNum }
+                    if (defaultAcc != null) {
+                        selectedAccount = defaultAcc
+                        updateAmountPrefix(defaultAcc)
+                        showFromCard(defaultAcc)
+                        updateTransferButton()
+                    }
+                }
+            }
         }
 
         binding.btnPickContact.setOnClickListener {
@@ -289,9 +314,37 @@ class TransferFragment : Fragment() {
         if (arguments?.getBoolean(ARG_AUTO_SCAN, false) == true) {
             qrLauncher.launch(Intent(requireContext(), QrScannerActivity::class.java))
         }
+
+        // Restore form state when view is recreated on the cached no-args instance
+        if (arguments == null) {
+            if (resolvedAccountNumber.isNotEmpty()) {
+                val ownAccount = viewModel.accounts.value?.firstOrNull { it.accountNumber == resolvedAccountNumber }
+                if (ownAccount != null) {
+                    showToCard(ownAccount)
+                } else {
+                    binding.tvToAccountName.text = resolvedRecipientName
+                    binding.tvToBankBic.text = savedToSubtitle
+                    binding.tvToAccountDetails.visibility = View.GONE
+                    binding.tvToBalance.visibility = View.GONE
+                    binding.ivToPhoto.scaleType = android.widget.ImageView.ScaleType.CENTER_CROP
+                    binding.ivToPhoto.setImageBitmap(makeInitialsBitmap(resolvedRecipientName, savedToColorHex))
+                }
+                binding.tilTo.visibility = View.GONE
+                binding.btnPickContact.visibility = View.GONE
+                binding.btnScanQr.visibility = View.GONE
+                binding.cardToInfo.visibility = View.VISIBLE
+                if (savedToImageHash != null) loadToPhoto(savedToImageHash!!, isProfile = resolvedToOwnAccount != null)
+            } else if (savedToText.isNotEmpty()) {
+                binding.etTo.setText(savedToText)
+            }
+            if (savedAmount.isNotEmpty()) binding.etAmount.setText(savedAmount)
+            if (savedRemarks.isNotEmpty()) binding.etRemarks.setText(savedRemarks)
+            updateTransferButton()
+        }
     }
 
     private fun lookupBmlQrMerchant(qrUrl: String) {
+        bmlQrLookupAttempted = true
         bmlGatewayQr = qrUrl.startsWith("https://pay.bml.com.mv/app/")
         val base64Url = android.util.Base64.encodeToString(
             qrUrl.toByteArray(Charsets.UTF_8), android.util.Base64.NO_WRAP)
@@ -316,6 +369,16 @@ class TransferFragment : Fragment() {
                 return@launch
             }
             bmlQrInfo = info
+            if (info.amount == 0.0) {
+                RecentsCache.save(requireContext(), RecentPick(
+                    accountNumber = "bmlqr:$qrUrl",
+                    displayName   = info.merchantName,
+                    subtitle      = info.merchantAddress.ifBlank { "BML Merchant" },
+                    colorHex      = "#0066A1",
+                    imageHash     = null,
+                    isProfileImage = false
+                ))
+            }
 
             // Auto-select the user's default BML card if no card was pre-selected
             if (selectedAccount == null) {
@@ -422,6 +485,35 @@ class TransferFragment : Fragment() {
                     updateTransferButton()
                 }
             }
+
+            // Auto-select default account when arriving from contacts page (TO account already pre-filled)
+            if (selectedAccount == null && arguments?.getString(ARG_ACCOUNT) != null) {
+                val defaultNum = CredentialStore(requireContext()).getDefaultAccountNumber()
+                if (defaultNum != null) {
+                    val defaultAcc = accounts.firstOrNull { it.accountNumber == defaultNum }
+                    if (defaultAcc != null) {
+                        selectedAccount = defaultAcc
+                        updateAmountPrefix(defaultAcc)
+                        showFromCard(defaultAcc)
+                        updateTransferButton()
+                    }
+                }
+            }
+
+            // On a cold start (e.g. share intent), anyBmlSession() may be null when
+            // onViewCreated runs. Retry the lookup once sessions are available.
+            val pendingBmlQrUrl = arguments?.getString(ARG_BML_QR_URL)
+            if (pendingBmlQrUrl != null && !bmlQrLookupAttempted) {
+                val app = requireActivity().application as BasedBankApp
+                if (app.anyBmlSession() != null) lookupBmlQrMerchant(pendingBmlQrUrl)
+            }
+
+            // Re-render the from card when the view is recreated on a cached instance
+            if (selectedAccount != null && binding.cardFromInfo.visibility != View.VISIBLE) {
+                updateAmountPrefix(selectedAccount!!)
+                showFromCard(selectedAccount!!)
+                updateTransferButton()
+            }
         }
     }
 
@@ -707,6 +799,13 @@ class TransferFragment : Fragment() {
                 resolvedAccountNumber = info.accountNumber
                 resolvedRecipientName = info.accountName
                 resolvedBankName = info.bankId
+                savedToSubtitle = "${info.accountNumber} · ${info.bankId}"
+                savedToColorHex = colorHex
+                savedToImageHash = when {
+                    matchedAcc?.profileImageHash != null -> matchedAcc.profileImageHash
+                    matchedCont?.customerImgHash != null -> matchedCont.customerImgHash
+                    else -> null
+                }
 
                 if (matchedAcc != null) {
                     showToCard(matchedAcc)
@@ -839,6 +938,9 @@ class TransferFragment : Fragment() {
     ) {
         resolvedAccountNumber = accountNumber
         resolvedRecipientName = displayName
+        savedToSubtitle = subtitle
+        savedToColorHex = colorHex
+        savedToImageHash = imageHash
         val contacts = viewModel.contacts.value ?: emptyList()
         resolvedBankName = contacts.firstOrNull { it.benefAccount == accountNumber }?.benefBankName ?: ""
 
@@ -2029,6 +2131,14 @@ class TransferFragment : Fragment() {
 
     override fun onDestroyView() {
         super.onDestroyView()
+        // Persist form state so it can be restored when the view is recreated
+        savedAmount = binding.etAmount.text?.toString() ?: ""
+        savedRemarks = binding.etRemarks.text?.toString() ?: ""
+        savedToText = if (resolvedAccountNumber.isEmpty()) binding.etTo.text?.toString() ?: "" else ""
+        // Reset in-progress OTP flow — it cannot sensibly resume after the view is gone
+        bmlOtpState = BmlOtpState.NONE
+        pendingBmlTransfer = null
+        bmlOtpChannel = null
         _binding = null
     }
 

app/src/main/java/sh/sar/basedbank/util/PaymvQrParser.kt

@@ -41,7 +41,7 @@ object PaymvQrParser {
 
             PaymvQrData(
                 accountNumber = merchantInfo?.get("03"),
-                amount = root["54"],
+                amount = root["54"]?.takeIf { it != "***" },
                 purpose = additionalData?.get("08"),
                 merchantName = root["59"]
             )

app/src/main/res/layout/item_contact.xml

@@ -26,15 +26,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent">
 
-        <ImageButton
-            android:id="@+id/btnTransferContact"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/ic_send"
-            android:padding="6dp"
-            android:contentDescription="@string/transfer" />
-
         <ImageButton
             android:id="@+id/btnEditContact"
             android:layout_width="36dp"
@@ -54,6 +45,15 @@
             android:tint="?attr/colorError"
             android:contentDescription="@string/contact_delete" />
 
+        <ImageButton
+            android:id="@+id/btnTransferContact"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/ic_send"
+            android:padding="6dp"
+            android:contentDescription="@string/transfer" />
+
     </LinearLayout>
 
     <LinearLayout