Merge upstream main (v1.0.31) into feat/chats

Resolve TransferFragment conflicts: keep the new ARG_BML_TXN_ID next to
the chat flags, and pass upstream's capturedToPhoto through showReceipt().

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01FQUrmJjrypeoPsubpzuezC

app/build.gradle.kts

@@ -21,8 +21,8 @@ android {
         applicationId = "sh.sar.basedbank"
         minSdk = 26
         targetSdk = 36
-        versionCode = 28
-        versionName = "1.0.27"
+        versionCode = 32
+        versionName = "1.0.31"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/java/sh/sar/basedbank/api/bml/BmlMerchantTxnClient.kt

@@ -0,0 +1,82 @@
+package sh.sar.basedbank.api.bml
+
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.json.JSONObject
+
+/**
+ * BML Merchant Services payment links (`https://transaction.merchants.bankofmaldives.com.mv/<id>`),
+ * e.g. the bill links Fenaka sends. The web page only shows a QR; this fetches the QR's text so it
+ * can go through the regular BML QR payment flow.
+ */
+class BmlMerchantTxnClient {
+
+    private val client = newBmlApiClient()
+
+    /**
+     * Returns the transaction's EMV QR payload (`vendorQrCode`).
+     *
+     * A GET on the transaction is 401 without the page's Cognito credentials, but the PATCHes the
+     * page itself sends need no auth and return the full transaction:
+     *  - on load, `activeBrowserId` (`<id>_<epoch millis>`);
+     *  - on picking "BML" as the payment method, `provider: bml_mpos`.
+     *
+     * A fresh link has no provider yet, so `vendorQrCode` is null until the second PATCH selects
+     * one. Links already opened with BML chosen return it from the first.
+     */
+    fun fetchQrPayload(transactionId: String): String {
+        val browserId = JSONObject()
+            .put("activeBrowserId", "${transactionId}_${System.currentTimeMillis()}")
+        patch(transactionId, browserId).vendorQrCode()?.let { return it }
+        // Whether the provider PATCH returns the QR itself or it is generated a moment later has
+        // not been observed, so re-read a few times before giving up. Re-reads use the load PATCH:
+        // each provider PATCH counts as another payment attempt.
+        var txn = patch(transactionId, JSONObject().put("provider", PROVIDER_BML))
+        repeat(3) {
+            txn.vendorQrCode()?.let { return it }
+            Thread.sleep(1000)
+            txn = patch(transactionId, browserId)
+        }
+        return txn.vendorQrCode() ?: throw Exception("Transaction has no QR")
+    }
+
+    private fun patch(transactionId: String, body: JSONObject): JSONObject {
+        val request = Request.Builder()
+            .url("$API_BASE/transactions/$transactionId")
+            .patch(body.toString().toRequestBody("application/json".toMediaType()))
+            .header("Accept", "*/*")
+            .header("Origin", PAGE_ORIGIN)
+            .header("Referer", "$PAGE_ORIGIN/")
+            .build()
+        return client.newCall(request).execute().use { response ->
+            val text = response.body?.string().orEmpty()
+            if (!response.isSuccessful || !text.trimStart().startsWith("{"))
+                throw Exception("Transaction lookup failed (HTTP ${response.code})")
+            JSONObject(text)
+        }
+    }
+
+    /**
+     * No state check: only QR_CODE_GENERATED has been observed, and BML's payrequest lookup
+     * already rejects a paid or expired QR with its own message. `isNull` first — `optString`
+     * turns a JSON null into the string "null".
+     */
+    private fun JSONObject.vendorQrCode(): String? =
+        if (isNull("vendorQrCode")) null else optString("vendorQrCode").ifBlank { null }
+
+    companion object {
+        private const val API_BASE = "https://api.merchants.bankofmaldives.com.mv"
+        private const val PAGE_ORIGIN = "https://transaction.merchants.bankofmaldives.com.mv"
+        private const val PROVIDER_BML = "bml_mpos"
+        private val TXN_URL = Regex("^https?://transaction\\.merchants\\.bankofmaldives\\.com\\.mv/([0-9a-fA-F]{24})(?:[/?#].*)?$")
+        private val TXN_ID = Regex("^[0-9a-fA-F]{24}$")
+
+        /** The transaction ID from a bare 24-hex ID or a pasted payment link, else null. */
+        fun parseTransactionId(input: String): String? {
+            val s = input.trim()
+            val id = if (TXN_ID.matches(s)) s else TXN_URL.find(s)?.groupValues?.get(1)
+            return id?.lowercase()
+        }
+    }
+}

app/src/main/java/sh/sar/basedbank/api/mib/MibLoginFlow.kt

@@ -50,6 +50,11 @@ class MibLoginFlow(private val credentialStore: CredentialStore) {
         }
         .build()
 
+    /** Swap the seed used for silent re-login after the user replaces it on the OTP screen. */
+    fun updateOtpSeed(otpSeed: String) {
+        if (storedOtpSeed != null) storedOtpSeed = otpSeed
+    }
+
     // ─── Public entry point ───────────────────────────────────────────────────
 
     /**

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

@@ -530,6 +530,10 @@ fun applyNavLabelVisibility() {
 
     private fun routeSharedQrText(text: String) {
         val store = CredentialStore(this)
+        sh.sar.basedbank.api.bml.BmlMerchantTxnClient.parseTransactionId(text)?.let {
+            navigateTo(R.id.nav_transfer, TransferFragment.newInstanceFromBmlTxn(it))
+            return
+        }
         val bmlTarget = sh.sar.basedbank.util.PaymvQrParser.bmlQrPayTarget(text)
         if (bmlTarget != null) {
             navigateTo(R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(bmlTarget, store.getDefaultCardAccountNumber()))

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

@@ -1,14 +1,25 @@
 package sh.sar.basedbank.ui.home
 
+import android.app.Activity
 import android.content.ClipData
+import android.content.ClipDescription
 import android.content.ClipboardManager
 import android.content.Context
+import android.content.DialogInterface
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
+import android.os.PersistableBundle
+import android.text.Editable
+import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.widget.PopupMenu
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -19,14 +30,22 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import com.google.android.material.color.MaterialColors
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.zxing.BarcodeFormat
+import com.google.zxing.EncodeHintType
+import com.google.zxing.qrcode.QRCodeWriter
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
 import sh.sar.basedbank.BasedBankApp
 import sh.sar.basedbank.R
 import sh.sar.basedbank.api.bml.BmlAccountClient
 import sh.sar.basedbank.api.mib.MibProfileClient
 import sh.sar.basedbank.api.mib.MibLoginFlow
+import sh.sar.basedbank.databinding.DialogOtpExportSeedBinding
+import sh.sar.basedbank.databinding.DialogOtpUpdateSeedBinding
 import sh.sar.basedbank.databinding.FragmentOtpBinding
 import sh.sar.basedbank.databinding.ItemOtpCardBinding
 import sh.sar.basedbank.util.CredentialStore
+import sh.sar.basedbank.util.OtpauthParser
 import sh.sar.basedbank.util.Totp
 
 class OtpFragment : Fragment() {
@@ -34,7 +53,35 @@ class OtpFragment : Fragment() {
     private var _binding: FragmentOtpBinding? = null
     private val binding get() = _binding!!
 
-    private data class OtpEntry(val bank: String, val name: String?, val seed: String)
+    private data class OtpEntry(
+        val bank: String, val loginId: String, val account: String, val name: String?, val seed: String
+    )
+
+    private val entries = mutableListOf<OtpEntry>()
+    private var adapter: OtpAdapter? = null
+
+    /** Seed field of the open "Update seed" dialog, filled by the QR scanner result. */
+    private var scanTarget: android.widget.EditText? = null
+
+    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
+        val target = scanTarget ?: return@registerForActivityResult
+        val found = OtpauthParser.parse(raw)
+        when {
+            found.isEmpty() -> Toast.makeText(requireContext(), "No OTP data found in QR", Toast.LENGTH_SHORT).show()
+            found.size == 1 -> target.setText(found[0].secret)
+            else -> {
+                val labels = found.map { e ->
+                    if (e.issuer.isNotBlank()) "${e.issuer} (${e.name})" else e.name.ifBlank { e.secret.take(8) + "…" }
+                }.toTypedArray()
+                MaterialAlertDialogBuilder(requireContext())
+                    .setTitle("Choose account")
+                    .setItems(labels) { _, i -> target.setText(found[i].secret) }
+                    .show()
+            }
+        }
+    }
 
     private inner class OtpAdapter(private val entries: List<OtpEntry>) :
         RecyclerView.Adapter<OtpAdapter.VH>() {
@@ -56,6 +103,8 @@ class OtpFragment : Fragment() {
             )
             update(b, entry.seed)
             b.root.setOnClickListener { copyCode(it.context, b.tvOtpCode.text, "OTP copied") }
+            // Long-press opens the seed menu (export / update)
+            b.root.setOnLongClickListener { showSeedMenu(it, holder.bindingAdapterPosition); true }
             b.btnCopyOtp.setOnClickListener { copyCode(it.context, b.tvOtpCode.text, "OTP copied") }
             b.btnCopyNextOtp.setOnClickListener { copyCode(it.context, b.tvNextOtpCode.text, "Next OTP copied") }
         }
@@ -91,6 +140,170 @@ class OtpFragment : Fragment() {
         }
     }
 
+    private fun showSeedMenu(anchor: View, position: Int) {
+        if (position == RecyclerView.NO_POSITION) return
+        val popup = PopupMenu(anchor.context, anchor)
+        popup.menu.add(0, 1, 0, "Export seed")
+        popup.menu.add(0, 2, 1, "Update seed")
+        popup.setOnMenuItemClickListener { item ->
+            val entry = entries.getOrNull(position) ?: return@setOnMenuItemClickListener false
+            when (item.itemId) {
+                1 -> showExportDialog(entry)
+                2 -> showUpdateDialog(position)
+            }
+            true
+        }
+        popup.show()
+    }
+
+    private fun entryTitle(entry: OtpEntry) = "${entry.bank} · ${entry.name ?: entry.account}"
+
+    // ── Export ───────────────────────────────────────────────────────────────
+
+    private fun showExportDialog(entry: OtpEntry) {
+        val ctx = requireContext()
+        val d = DialogOtpExportSeedBinding.inflate(layoutInflater)
+        val uri = OtpauthParser.buildUri(entry.bank, entry.seed)
+        d.tvSeed.text = entry.seed.chunked(4).joinToString(" ")
+        renderQr(uri, (220 * resources.displayMetrics.density).toInt())?.let { d.ivSeedQr.setImageBitmap(it) }
+        d.btnCopySeed.setOnClickListener { copySensitive(ctx, entry.seed, "Seed copied") }
+        MaterialAlertDialogBuilder(ctx)
+            .setTitle(entryTitle(entry))
+            .setView(d.root)
+            .setPositiveButton("Done", null)
+            .show()
+    }
+
+    private fun renderQr(content: String, size: Int): Bitmap? = try {
+        val hints = mapOf(
+            EncodeHintType.MARGIN to 0,
+            EncodeHintType.ERROR_CORRECTION to ErrorCorrectionLevel.M
+        )
+        val matrix = QRCodeWriter().encode(content, BarcodeFormat.QR_CODE, size, size, hints)
+        val pixels = IntArray(size * size) { i -> if (matrix[i % size, i / size]) Color.BLACK else Color.WHITE }
+        Bitmap.createBitmap(pixels, size, size, Bitmap.Config.ARGB_8888)
+    } catch (_: Exception) { null }
+
+    /** Copy a secret, flagged sensitive so Android 13+ hides it in the clipboard preview. */
+    private fun copySensitive(context: Context, text: String, message: String) {
+        val clip = ClipData.newPlainText("OTP seed", text)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            clip.description.extras = PersistableBundle().apply {
+                putBoolean(ClipDescription.EXTRA_IS_SENSITIVE, true)
+            }
+        }
+        val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        clipboard.setPrimaryClip(clip)
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+            Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
+        }
+    }
+
+    // ── Update ───────────────────────────────────────────────────────────────
+
+    private fun showUpdateDialog(position: Int) {
+        val entry = entries.getOrNull(position) ?: return
+        val ctx = requireContext()
+        val d = DialogOtpUpdateSeedBinding.inflate(layoutInflater)
+        d.tvSeedWarning.text = "Saving will replace the current seed for this login, and the old one " +
+            "can't be recovered. If you might still need it, export it first."
+
+        var newSeed: String? = null
+        // Same behaviour as the sign-in screen's preview card
+        val preview = d.cardOtp
+        preview.root.setOnClickListener { copyCode(it.context, preview.tvOtpCode.text, "OTP copied") }
+        fun refreshPreview() {
+            val seed = newSeed
+            try {
+                if (seed == null) throw IllegalArgumentException()
+                preview.tvOtpCode.text = Totp.generate(seed)
+                preview.tvNextOtpCode.text = Totp.generate(seed, periodOffset = 1)
+                preview.otpTimer.max = 30
+                preview.otpTimer.progress = 30 - (System.currentTimeMillis() / 1000L % 30).toInt()
+                preview.root.visibility = View.VISIBLE
+            } catch (_: Exception) {
+                preview.root.visibility = View.INVISIBLE
+            }
+        }
+
+        val dialog = MaterialAlertDialogBuilder(ctx)
+            .setTitle("Update seed · ${entry.bank}")
+            .setView(d.root)
+            .setPositiveButton("Replace", null)
+            .setNegativeButton("Cancel", null)
+            .create()
+
+        fun validate() {
+            val raw = d.etNewSeed.text?.toString().orEmpty()
+            newSeed = OtpauthParser.resolveSecret(raw)
+            d.tilNewSeed.error = when {
+                raw.isBlank() -> null
+                newSeed == null -> "Not a valid TOTP seed"
+                newSeed == entry.seed -> "This is already the current seed"
+                else -> null
+            }
+            if (newSeed == entry.seed) newSeed = null
+            dialog.getButton(DialogInterface.BUTTON_POSITIVE)?.isEnabled = newSeed != null
+            refreshPreview()
+        }
+
+        d.etNewSeed.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) = validate()
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+        })
+        d.btnScanNewSeed.setOnClickListener {
+            scanTarget = d.etNewSeed
+            qrLauncher.launch(Intent(ctx, QrScannerActivity::class.java))
+        }
+
+        val ticker = viewLifecycleOwner.lifecycleScope.launch {
+            while (isActive) { refreshPreview(); delay(1_000) }
+        }
+        dialog.setOnDismissListener {
+            ticker.cancel()
+            if (scanTarget === d.etNewSeed) scanTarget = null
+        }
+        dialog.setOnShowListener {
+            val replace = dialog.getButton(DialogInterface.BUTTON_POSITIVE)
+            replace.isEnabled = false
+            replace.setOnClickListener {
+                val seed = newSeed ?: return@setOnClickListener
+                confirmReplace(entry) {
+                    saveSeed(position, seed)
+                    dialog.dismiss()
+                }
+            }
+        }
+        dialog.show()
+    }
+
+    private fun confirmReplace(entry: OtpEntry, onConfirm: () -> Unit) {
+        MaterialAlertDialogBuilder(requireContext())
+            .setTitle("Delete old seed?")
+            .setMessage("The current seed for ${entryTitle(entry)} will be replaced and can't be " +
+                "recovered afterwards.")
+            .setPositiveButton("Replace") { _, _ -> onConfirm() }
+            .setNegativeButton("Cancel", null)
+            .show()
+    }
+
+    private fun saveSeed(position: Int, seed: String) {
+        val entry = entries.getOrNull(position) ?: return
+        val store = CredentialStore(requireContext())
+        when (entry.bank) {
+            "MIB" -> {
+                store.updateMibOtpSeed(entry.loginId, seed)
+                // The live flow keeps the seed in memory for silent re-login
+                (requireActivity().application as BasedBankApp).mibFlowFor(entry.loginId).updateOtpSeed(seed)
+            }
+            "BML" -> store.updateBmlOtpSeed(entry.loginId, seed)
+        }
+        entries[position] = entry.copy(seed = seed)
+        adapter?.notifyItemChanged(position)
+        Toast.makeText(requireContext(), "Seed updated", Toast.LENGTH_SHORT).show()
+    }
+
     private fun copyCode(context: Context, text: CharSequence, message: String) {
         val code = text.toString().replace(" ", "")
         if (code.isEmpty() || code.contains('-')) return
@@ -115,16 +328,19 @@ class OtpFragment : Fragment() {
         for (loginId in store.getMibLoginIds()) {
             val creds = store.loadMibCredentials(loginId) ?: continue
             val name = store.loadMibFullName(loginId)
-            tagged.add(CredentialStore.loginKey("mib", loginId) to OtpEntry("MIB", name, creds.otpSeed))
+            tagged.add(CredentialStore.loginKey("mib", loginId) to
+                OtpEntry("MIB", loginId, creds.username, name, creds.otpSeed))
         }
         for (loginId in store.getBmlLoginIds()) {
             val creds = store.loadBmlCredentials(loginId) ?: continue
             val name = store.loadBmlUserProfile(loginId)?.fullName
-            tagged.add(CredentialStore.loginKey("bml", loginId) to OtpEntry("BML", name?.takeIf { it.isNotBlank() }, creds.otpSeed))
+            tagged.add(CredentialStore.loginKey("bml", loginId) to
+                OtpEntry("BML", loginId, creds.username, name?.takeIf { it.isNotBlank() }, creds.otpSeed))
         }
-        val entries = tagged.sortedBy { rank(it.first) }.map { it.second }.toMutableList()
+        entries.clear()
+        entries.addAll(tagged.sortedBy { rank(it.first) }.map { it.second })
 
-        val adapter = OtpAdapter(entries)
+        val adapter = OtpAdapter(entries).also { this.adapter = it }
         binding.recyclerView.layoutManager = LinearLayoutManager(requireContext())
         binding.recyclerView.adapter = adapter
         binding.emptyState.visibility = if (entries.isEmpty()) View.VISIBLE else View.GONE
@@ -147,8 +363,7 @@ class OtpFragment : Fragment() {
                             mobile = profile.mobile,
                             enrolled = profile.enrolled
                         ))
-                        val seed = store.loadMibCredentials(loginId)?.otpSeed
-                        val idx = entries.indexOfFirst { it.seed == seed }
+                        val idx = entries.indexOfFirst { it.bank == "MIB" && it.loginId == loginId }
                         if (idx >= 0) { entries[idx] = entries[idx].copy(name = profile.fullName); changed = true }
                     }
                 }
@@ -168,8 +383,7 @@ class OtpFragment : Fragment() {
                             idCard = info.idCard,
                             birthdate = info.birthdate
                         ))
-                        val seed = store.loadBmlCredentials(loginId)?.otpSeed
-                        val idx = entries.indexOfFirst { it.seed == seed }
+                        val idx = entries.indexOfFirst { it.bank == "BML" && it.loginId == loginId }
                         if (idx >= 0) { entries[idx] = entries[idx].copy(name = info.fullName); changed = true }
                     }
                 }
@@ -192,6 +406,8 @@ class OtpFragment : Fragment() {
 
     override fun onDestroyView() {
         super.onDestroyView()
+        adapter = null
+        scanTarget = null
         _binding = null
     }
 }

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

@@ -7,12 +7,15 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Environment
 import android.provider.MediaStore
+import android.text.TextPaint
+import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.FileProvider
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
@@ -65,7 +68,18 @@ class PayMvQrFragment : Fragment() {
     private data class QrTarget(val accountNumber: String, val name: String, val bank: String)
 
     private fun currentTarget(): QrTarget? = contactTarget
-        ?: selectedAccount?.let { QrTarget(it.accountNumber, it.accountBriefName, it.bank) }
+        ?: selectedAccount?.let { QrTarget(it.accountNumber, qrHolderName(it), it.bank) }
+
+    /** Name printed on the card and put in the payload (tag 59). */
+    private fun qrHolderName(account: BankAccount): String = when {
+        // Fahipay's brief name is the generic "Fahipay Wallet"; the holder's name is on the profile
+        account.bank == "FAHIPAY" -> account.profileName.takeIf { it.isNotBlank() && it != "Fahipay" }
+            ?: CredentialStore(requireContext())
+                .loadFahipayUserProfile(sh.sar.basedbank.util.ProfileImageStore.loginIdFromTag(account.loginTag))
+                ?.fullName?.takeIf { it.isNotBlank() }
+            ?: account.accountBriefName
+        else -> account.accountBriefName
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         contactTarget = arguments?.let { args ->
@@ -146,11 +160,13 @@ class PayMvQrFragment : Fragment() {
             "FAHIPAY" -> "FAHIMVMV"
             else      -> "MADVMVMV"
         }
-        val amountFormatted = binding.etAmount.text?.toString()?.trim()
-            ?.replace(",", "")
+        val amountRaw = binding.etAmount.text?.toString()?.trim()?.replace(",", "")
+        val amountFormatted = amountRaw
             ?.toDoubleOrNull()
             ?.takeIf { it > 0 }
             ?.let { "%.2f".format(it) }
+        // BML shows the amount on the card as typed (no forced decimals)
+        val amountDisplay = amountRaw?.takeIf { amountFormatted != null }
 
         val ctx = requireContext()
         val account = selectedAccount
@@ -165,17 +181,28 @@ class PayMvQrFragment : Fragment() {
                 when {
                     m.startsWith("+") -> m
                     m.length == 7     -> "+960$m"
+                    m.length == 10 && m.startsWith("960") -> "+$m" // Fahipay stores 960XXXXXXX
                     else              -> m
                 }
             }
         } else null
 
         val purpose = binding.etReference.text?.toString()?.trim()
-            ?.takeIf { it.isNotBlank() } ?: getString(R.string.paymvqr_reference_default)
+            ?.takeIf { it.isNotBlank() }
+
+        // The reference (62/05) is also printed vertically beside the QR, as each bank does
+        val reference = when (target.bank) {
+            // BML: base-32 account number followed by the amount as typed
+            "BML"     -> ((target.accountNumber.toBigIntegerOrNull()?.toString(32)?.uppercase() ?: "") +
+                          (amountDisplay ?: "")).take(25).ifEmpty { generateReference(9) }
+            "FAHIPAY" -> "P" + generateReference(9) // Fahipay's own references are P + 9 chars
+            else      -> generateReference(9)
+        }
 
         val bmp = withContext(Dispatchers.Default) {
-            val payload = buildQrPayload(target.accountNumber, target.name, acquirer, amountFormatted, mobile, purpose)
-            renderQrCard(ctx, target, payload, amountFormatted)
+            val payload = buildQrPayload(target.accountNumber, target.name, acquirer, amountFormatted, mobile, purpose, reference, target.bank)
+            if (target.bank == "FAHIPAY") renderFahipayQrCard(ctx, target, payload, reference)
+            else renderQrCard(ctx, target, payload, reference)
         }
         if (_binding == null) return
         generatedBitmap = bmp
@@ -194,14 +221,19 @@ class PayMvQrFragment : Fragment() {
         acquirer: String,
         amountStr: String?,
         mobile: String?,
-        purpose: String
+        purpose: String?,
+        ref: String,
+        bank: String
     ): String {
         fun tlv(tag: String, value: String): String {
             val len = value.length
             return tag + (if (len < 10) "0$len" else "$len") + value
         }
         val format       = tlv("00", "01")
-        val poi          = tlv("01", "11")
+        // Fahipay's own QRs are dynamic (12) when they carry an amount and mask the amount
+        // as "***" when they don't; its scanner may reject QRs that differ
+        val fahipay      = bank == "FAHIPAY"
+        val poi          = tlv("01", if (fahipay && !amountStr.isNullOrBlank()) "12" else "11")
         val sub00        = tlv("00", "mv.favara.mpqr")
         val sub01        = tlv("01", acquirer)
         val sub02        = tlv("02", acquirer) // repeated acquirer, as per official PayMV app
@@ -211,21 +243,28 @@ class PayMvQrFragment : Fragment() {
         val merchantAcct = tlv("26", sub00 + sub01 + sub02 + sub03 + sub05 + sub10)
         val mcc          = tlv("52", "0000")
         val currency     = tlv("53", "462")
-        val amountTLV    = if (!amountStr.isNullOrBlank()) tlv("54", amountStr) else ""
+        val amountTLV    = when {
+            !amountStr.isNullOrBlank() -> tlv("54", amountStr)
+            fahipay                    -> tlv("54", "***")
+            else                       -> ""
+        }
         val country      = tlv("58", "MV")
-        val name         = tlv("59", accountName.take(25))
-        val ref          = generateReference()
-        val addlData     = tlv("62", tlv("05", ref) + tlv("08", purpose))
+        val name         = tlv("59", accountName.uppercase().take(25))
+        // Fahipay's QRs always carry a city ("LD" + 4 digits) and default the purpose to PAYMENT
+        val city         = if (fahipay) tlv("60", "LD" + (0..9999).random().toString().padStart(4, '0')) else ""
+        val purposeText  = purpose?.takeIf { it.isNotBlank() } ?: if (fahipay) "PAYMENT" else null
+        val purposeTLV   = if (purposeText != null) tlv("08", purposeText) else ""
+        val addlData     = tlv("62", tlv("05", ref) + purposeTLV)
         val timestamp    = java.time.LocalDateTime.now()
             .format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.00000"))
         val tag80        = tlv("80", tlv("00", "mv.favara.mpqr") + tlv("01", timestamp))
-        val prefix       = format + poi + merchantAcct + mcc + currency + amountTLV + country + name + addlData + tag80 + "6304"
+        val prefix       = format + poi + merchantAcct + mcc + currency + amountTLV + country + name + city + addlData + tag80 + "6304"
         return prefix + crc16(prefix)
     }
 
-    private fun generateReference(): String {
+    private fun generateReference(length: Int): String {
         val chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-        return (1..9).map { chars.random() }.joinToString("")
+        return (1..length).map { chars.random() }.joinToString("")
     }
 
     private fun crc16(data: String): String {
@@ -242,88 +281,127 @@ class PayMvQrFragment : Fragment() {
 
     // ── QR card rendering ────────────────────────────────────────────────────
 
+    /**
+     * Replicates the BML app's ReceiveCard (React Native, v2.1.47) 1:1. All measurements are in
+     * dp, as in BML's StyleSheet, laid out for BML's reference screen width and drawn at
+     * [PX_PER_DP] pixels per dp.
+     */
     private fun renderQrCard(
         ctx: Context,
         target: QrTarget,
         qrPayload: String,
-        amountStr: String?
+        qrId: String
     ): Bitmap {
-        val W = 900
-        val H = 1080
-        val outerCorner = 48f
-        val boxBlue    = Color.parseColor("#2272B7")
-        val footerBlue = Color.parseColor("#1A5799")
-        val boxL = 24f; val boxT = 110f; val boxR = 876f; val boxB = 962f
+        val sw = SCREEN_WIDTH_DP
+        fun px(dp: Float) = dp * PX_PER_DP
+        val mmaBlue = Color.parseColor("#0E5CA4")
 
-        val bm = Bitmap.createBitmap(W, H, Bitmap.Config.ARGB_8888)
+        val cardW = sw - 48f                 // screen's horizontal margins, spacing[5] each side
+        val qrSize = sw * 0.5f
+        val railW = sw / 1.85f
+
+        val namePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+            color = Color.WHITE
+            textSize = px(14f)
+            typeface = Typeface.DEFAULT
+            textAlign = Paint.Align.CENTER
+        }
+        val footerPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+            color = Color.WHITE
+            textSize = px(sw * 0.046f)
+            typeface = ResourcesCompat.getFont(ctx, R.font.sofia_pro_bold) ?: Typeface.DEFAULT_BOLD
+            letterSpacing = 1.2f / (sw * 0.046f) // RN letterSpacing is in dp, Paint's is in em
+            textAlign = Paint.Align.CENTER
+        }
+        // Android RN Text lines include font padding: line height = bottom - top
+        fun lineHeight(p: Paint) = p.fontMetrics.let { it.bottom - it.top } / PX_PER_DP
+
+        // --- Vertical layout (dp, card-local) ---
+        val topCardTop = 2f
+        val brandTop = topCardTop + 32f      // brandRow marginTop spacing[6]
+        val logoBoxW = sw * 0.38f            // bml-logo-paymv box: 0.38·sw wide
+        val logoBoxH = logoBoxW * 0.1116751269035533f
+        val payMvBoxW = sw * 0.2f            // paymv-logo box: 0.2·sw wide
+        val payMvBoxH = payMvBoxW * 0.17333333333333334f
+        val brandH = maxOf(logoBoxH, payMvBoxH)
+        val nameText = target.name.uppercase()
+        val hasName = nameText.isNotBlank()
+        val qrCardTop = brandTop + brandH + if (hasName) 24f else 32f
+        val nameTop = qrCardTop + 8f + 12f   // qrCard paddingTop spacing[2], name marginTop spacing[3]
+        val nameH = if (hasName) lineHeight(namePaint) else 0f
+        val qrTop = if (hasName) nameTop + nameH + 16f else qrCardTop + 37f
+        val qrCardBottom = qrTop + qrSize + 37f // paddingBottom spacing[6] + 5
+        val topCardBottom = qrCardBottom + 24f + 8f // qrCard marginBottom, topCard paddingBottom
+        val footerLineH = lineHeight(footerPaint)
+        val cardH = topCardBottom + 12f + footerLineH + 12f + 2f
+
+        val bm = Bitmap.createBitmap(px(cardW).toInt(), px(cardH).toInt(), Bitmap.Config.ARGB_8888)
         val canvas = Canvas(bm)
         val paint = Paint(Paint.ANTI_ALIAS_FLAG)
 
-        // Clip to outer rounded card shape
-        val outerPath = Path()
-        outerPath.addRoundRect(RectF(0f, 0f, W.toFloat(), H.toFloat()), outerCorner, outerCorner, Path.Direction.CW)
-        canvas.clipPath(outerPath)
-        canvas.drawColor(Color.WHITE)
-
-        // --- Bank logo top-left ---
-        val logoRes = when (target.bank) {
-            "BML"     -> R.drawable.bml_logo_vector
-            "MIB"     -> R.drawable.mib_faisanet_logo
-            else      -> R.drawable.fahipay_logo_long
+        // captureWrapper: mmaBlue, radius 20 — shows as a 2dp border around the white top card
+        val outerPath = Path().apply {
+            addRoundRect(RectF(0f, 0f, px(cardW), px(cardH)), px(20f), px(20f), Path.Direction.CW)
         }
+        canvas.clipPath(outerPath)
+        canvas.drawColor(mmaBlue)
+
+        // topCard: white, 2dp inset, top corners 18
+        paint.color = Color.WHITE
+        val r = px(18f)
+        canvas.drawPath(Path().apply {
+            addRoundRect(
+                RectF(px(2f), px(topCardTop), px(cardW - 2f), px(topCardBottom)),
+                floatArrayOf(r, r, r, r, 0f, 0f, 0f, 0f), Path.Direction.CW
+            )
+        }, paint)
+
+        // --- brandRow: "BANK OF MALDIVES" wordmark left, "PayMV QR" right, 40dp side margins ---
+        val rowL = 2f + 40f
+        val rowR = cardW - 2f - 40f
+        val rowCenterY = brandTop + brandH / 2
+        val logoRes = if (target.bank == "BML") R.drawable.bml_logo_paymv else R.drawable.mib_faisanet_logo
         AppCompatResources.getDrawable(ctx, logoRes)?.let { d ->
             val nW = d.intrinsicWidth.coerceAtLeast(1)
             val nH = d.intrinsicHeight.coerceAtLeast(1)
-            val maxW = 180f; val maxH = 76f
-            val scale = minOf(maxW / nW, maxH / nH)
+            // resizeMode "contain" inside the logo box, left-aligned in the row
+            val scale = minOf(px(logoBoxW) / nW, px(logoBoxH) / nH)
             val lW = (nW * scale).toInt()
             val lH = (nH * scale).toInt()
-            val lTop = ((boxT - lH) / 2).toInt().coerceAtLeast(10)
-            d.setBounds(24, lTop, 24 + lW, lTop + lH)
+            val lLeft = (px(rowL) + (px(logoBoxW) - lW) / 2f).toInt()
+            val lTop = (px(rowCenterY) - lH / 2f).toInt()
+            d.setBounds(lLeft, lTop, lLeft + lW, lTop + lH)
             d.draw(canvas)
         }
-
-        // --- "PayMV QR" top-right ---
-        paint.color = Color.parseColor("#1A1A2E")
-        paint.textSize = 36f
-        paint.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
+        // BML draws the paymv-logo image (fills its box exactly), nudged down 1dp
+        paint.color = mmaBlue
+        paint.typeface = footerPaint.typeface
         paint.textAlign = Paint.Align.RIGHT
-        canvas.drawText("PayMV QR", W - 28f, 66f, paint)
+        paint.textSize = px(payMvBoxH)
+        paint.textSize *= px(payMvBoxW) / paint.measureText("PayMV QR")
+        val payMvBounds = Rect().also { paint.getTextBounds("PayMV QR", 0, 8, it) }
+        canvas.drawText(
+            "PayMV QR", px(rowR),
+            px(rowCenterY + 1f) - payMvBounds.exactCenterY(), paint
+        )
 
-        // --- Blue rounded box ---
-        paint.color = boxBlue
-        paint.textAlign = Paint.Align.LEFT
-        canvas.drawRoundRect(RectF(boxL, boxT, boxR, boxB), 36f, 36f, paint)
+        // --- qrCard: mmaBlue, radius 16, 40dp side margins ---
+        val qrCardL = 2f + 40f
+        val qrCardR = cardW - 2f - 40f
+        paint.color = mmaBlue
+        canvas.drawRoundRect(RectF(px(qrCardL), px(qrCardTop), px(qrCardR), px(qrCardBottom)), px(16f), px(16f), paint)
 
-        // Account name (white, bold, uppercase, auto-scaled to fit)
-        paint.color = Color.WHITE
-        paint.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
-        paint.textAlign = Paint.Align.CENTER
-        val nameText = target.name.uppercase()
-        paint.textSize = 36f
-        val maxNameW = boxR - boxL - 48f
-        if (paint.measureText(nameText) > maxNameW) {
-            paint.textSize = 36f * maxNameW / paint.measureText(nameText)
-        }
-        val nameBaseline = boxT + 68f
-        canvas.drawText(nameText, W / 2f, nameBaseline, paint)
-
-        // Optional amount below name
-        val qrTopY: Float
-        if (!amountStr.isNullOrBlank()) {
-            paint.textSize = 28f
-            paint.typeface = Typeface.create(Typeface.DEFAULT, Typeface.NORMAL)
-            val amtBaseline = nameBaseline + 42f
-            canvas.drawText("MVR $amountStr", W / 2f, amtBaseline, paint)
-            qrTopY = amtBaseline + 20f
-        } else {
-            qrTopY = nameBaseline + 26f
+        if (hasName) {
+            val maxNameW = px(qrCardR - qrCardL)
+            if (namePaint.measureText(nameText) > maxNameW) {
+                namePaint.textSize *= maxNameW / namePaint.measureText(nameText)
+            }
+            canvas.drawText(nameText, px(cardW / 2), px(nameTop) - namePaint.fontMetrics.top, namePaint)
         }
 
-        // QR code — white modules on the same blue as the box background
-        val availH = boxB - qrTopY - 24f
-        val qrPx = minOf(availH, boxR - boxL - 48f).toInt().coerceAtMost(700).coerceAtLeast(200)
-        val qrLeft = ((W - qrPx) / 2).toFloat()
+        // QR — white modules on mmaBlue, ECL M, no quiet zone (react-native-qrcode-svg defaults)
+        val qrPx = px(qrSize).toInt()
+        val qrLeft = px(cardW / 2) - qrPx / 2f
         try {
             val hints = mapOf(
                 EncodeHintType.MARGIN to 0,
@@ -333,23 +411,150 @@ class PayMvQrFragment : Fragment() {
             val pixels = IntArray(qrPx * qrPx)
             for (y in 0 until qrPx) {
                 for (x in 0 until qrPx) {
-                    pixels[y * qrPx + x] = if (matrix[x, y]) Color.WHITE else boxBlue
+                    pixels[y * qrPx + x] = if (matrix[x, y]) Color.WHITE else mmaBlue
                 }
             }
             val qrBm = Bitmap.createBitmap(pixels, qrPx, qrPx, Bitmap.Config.ARGB_8888)
-            canvas.drawBitmap(qrBm, qrLeft, qrTopY, null)
+            canvas.drawBitmap(qrBm, qrLeft, px(qrTop), null)
             qrBm.recycle()
         } catch (_: Exception) { /* skip if encoding fails */ }
 
-        // --- Dark blue footer ---
-        paint.color = footerBlue
-        paint.textAlign = Paint.Align.LEFT
-        canvas.drawRect(RectF(0f, 970f, W.toFloat(), H.toFloat()), paint)
+        // qrIdRail: the reference, rotated -90°, beside the QR's right edge
+        if (qrId.isNotEmpty()) {
+            val idPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+                color = Color.BLACK
+                alpha = (255 * 0.8f).toInt()
+                textSize = px(10f)
+                typeface = Typeface.DEFAULT
+                textAlign = Paint.Align.CENTER
+            }
+            val qrRight = cardW / 2 + qrSize / 2
+            val cx = px(qrRight + railW / 1.37f - railW / 2)
+            val cy = px(qrTop + (qrSize + railW / 1.5f) / 2)
+            val idText = TextUtils.ellipsize(qrId, TextPaint(idPaint), px(railW), TextUtils.TruncateAt.END).toString()
+            canvas.save()
+            canvas.rotate(-90f, cx, cy)
+            val fm = idPaint.fontMetrics
+            canvas.drawText(idText, cx, cy - (fm.bottom + fm.top) / 2, idPaint)
+            canvas.restore()
+        }
+
+        // --- footer: SofiaPro-Bold, letterSpacing 1.2 ---
+        canvas.drawText(
+            "MALDIVES NATIONAL QR", px(cardW / 2),
+            px(topCardBottom + 12f) - footerPaint.fontMetrics.top, footerPaint
+        )
+
+        return bm
+    }
+
+    /**
+     * Replicates the card Fahipay's server renders for PayMV QR (api/app/qr/), measured
+     * in pixels on its 1240×1322 image. Fonts follow the BML card (Sofia Pro Bold, Roboto),
+     * except the vertical reference, which is Montserrat as on Fahipay's.
+     */
+    private fun renderFahipayQrCard(
+        ctx: Context,
+        target: QrTarget,
+        qrPayload: String,
+        reference: String
+    ): Bitmap {
+        val w = 1240f
+        val h = 1322f
+        val blue = Color.parseColor("#005DA3")
+        val sofiaBold = ResourcesCompat.getFont(ctx, R.font.sofia_pro_bold) ?: Typeface.DEFAULT_BOLD
+        val montserrat = ResourcesCompat.getFont(ctx, R.font.montserrat_regular) ?: Typeface.DEFAULT
+
+        val bm = Bitmap.createBitmap(w.toInt(), h.toInt(), Bitmap.Config.ARGB_8888)
+        val canvas = Canvas(bm)
+        val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+
+        // Blue card with a 6px border around the white area; footer is the blue below it
+        canvas.clipPath(Path().apply {
+            addRoundRect(RectF(0f, 0f, w, h), 50f, 50f, Path.Direction.CW)
+        })
+        canvas.drawColor(blue)
         paint.color = Color.WHITE
-        paint.textSize = 32f
-        paint.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
-        paint.textAlign = Paint.Align.CENTER
-        canvas.drawText("MALDIVES NATIONAL QR", W / 2f, 1038f, paint)
+        canvas.drawPath(Path().apply {
+            addRoundRect(
+                RectF(6f, 6f, w - 6f, 1174f),
+                floatArrayOf(44f, 44f, 44f, 44f, 0f, 0f, 0f, 0f), Path.Direction.CW
+            )
+        }, paint)
+
+        // Square app icon, then the "FahiPay" wordmark, in one row
+        AppCompatResources.getDrawable(ctx, R.drawable.fahipay_logo)?.let { d ->
+            d.setBounds(94, 94, 163, 163)
+            d.draw(canvas)
+        }
+        AppCompatResources.getDrawable(ctx, R.drawable.fahipay_logo_long)?.let { d ->
+            val lH = 48
+            val lW = (lH * d.intrinsicWidth.toFloat() / d.intrinsicHeight.coerceAtLeast(1)).toInt()
+            d.setBounds(178, 104, 178 + lW, 104 + lH)
+            d.draw(canvas)
+        }
+
+        // Sized so capitals match the reference's cap heights; positions below are cap tops
+        fun textPaint(tf: Typeface, capH: Float, spacingEm: Float, align: Paint.Align) =
+            Paint(Paint.ANTI_ALIAS_FLAG).apply {
+                typeface = tf
+                letterSpacing = spacingEm
+                textAlign = align
+                textSize = 100f
+                val h = Rect().also { getTextBounds("H", 0, 1, it) }.height().coerceAtLeast(1)
+                textSize = 100f * capH / h
+            }
+        fun Paint.capHeight() = Rect().also { getTextBounds("H", 0, 1, it) }.height()
+
+        // "PayMV QR" top-right
+        val payMvPaint = textPaint(sofiaBold, 30f, 0f, Paint.Align.RIGHT).apply { color = blue }
+        canvas.drawText("PayMV QR", 1147f, 101f + 30f, payMvPaint)
+
+        // Blue QR panel
+        paint.color = blue
+        canvas.drawRoundRect(RectF(166f, 218f, 1074f, 1126f), 55f, 55f, paint)
+
+        // Account name
+        val nameText = target.name.uppercase()
+        if (nameText.isNotBlank()) {
+            val namePaint = textPaint(Typeface.DEFAULT, 30f, 0f, Paint.Align.CENTER).apply { color = Color.WHITE }
+            val maxNameW = 1074f - 166f - 80f
+            if (namePaint.measureText(nameText) > maxNameW) {
+                namePaint.textSize *= maxNameW / namePaint.measureText(nameText)
+            }
+            canvas.drawText(nameText, 619f, 314f + namePaint.capHeight(), namePaint)
+        }
+
+        // QR — white modules on blue, no quiet zone
+        val qrPx = 562
+        try {
+            val hints = mapOf(
+                EncodeHintType.MARGIN to 0,
+                EncodeHintType.ERROR_CORRECTION to ErrorCorrectionLevel.M
+            )
+            val matrix = QRCodeWriter().encode(qrPayload, BarcodeFormat.QR_CODE, qrPx, qrPx, hints)
+            val pixels = IntArray(qrPx * qrPx)
+            for (y in 0 until qrPx) {
+                for (x in 0 until qrPx) {
+                    pixels[y * qrPx + x] = if (matrix[x, y]) Color.WHITE else blue
+                }
+            }
+            val qrBm = Bitmap.createBitmap(pixels, qrPx, qrPx, Bitmap.Config.ARGB_8888)
+            canvas.drawBitmap(qrBm, 338f, 417f, null)
+            qrBm.recycle()
+        } catch (_: Exception) { /* skip if encoding fails */ }
+
+        // Reference, blue, reading bottom-to-top in the white margin right of the panel,
+        // starting level with y=1087 and with its baseline at x=1171
+        val refPaint = textPaint(montserrat, 27f, 0.005f, Paint.Align.LEFT).apply { color = blue }
+        canvas.save()
+        canvas.rotate(-90f, 1171f, 1087f)
+        canvas.drawText(reference, 1171f, 1087f, refPaint)
+        canvas.restore()
+
+        // Footer
+        val footerPaint = textPaint(sofiaBold, 55.5f, 1.2f / 25.76f, Paint.Align.CENTER).apply { color = Color.WHITE }
+        canvas.drawText("MALDIVES NATIONAL QR", w / 2, 1220f + 55.5f, footerPaint)
 
         return bm
     }
@@ -437,6 +642,10 @@ class PayMvQrFragment : Fragment() {
         private const val ARG_ACCOUNT_NAME = "account_name"
         private const val ARG_BANK = "bank"
 
+        /** BML's layout reference: the screen width (dp) its ReceiveCard sizes were captured at. */
+        private const val SCREEN_WIDTH_DP = 560f
+        private const val PX_PER_DP = 2f
+
         /** QR for a contact's account. [bank] is "BML" / "MIB" / "FAHIPAY", as on [BankAccount.bank]. */
         fun forContact(accountNumber: String, name: String, bank: String) = PayMvQrFragment().apply {
             arguments = Bundle().apply {

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

@@ -167,6 +167,12 @@ class SettingsAppearanceFragment : Fragment() {
         val isDark = prefs.getString("theme", "system") == "dark"
         updatePitchBlackState(isDark)
 
+        // Receipts
+        binding.switchFullscreenReceipt.isChecked = prefs.getBoolean("always_fullscreen_receipt", false)
+        binding.switchFullscreenReceipt.setOnCheckedChangeListener { _, checked ->
+            prefs.edit().putBoolean("always_fullscreen_receipt", checked).apply()
+        }
+
         // Accent color
         val savedPreset = prefs.getString("accent_preset", ThemeHelper.PRESET_BLUE)
         binding.accentToggle.check(when (savedPreset) {

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

@@ -39,6 +39,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import sh.sar.basedbank.BasedBankApp
 import sh.sar.basedbank.R
+import sh.sar.basedbank.api.bml.BmlMerchantTxnClient
 import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.api.models.BankContact
 import sh.sar.basedbank.api.mib.MibIpsAccountInfo
@@ -80,6 +81,8 @@ class TransferFragment : Fragment() {
     private var resolvedAccountNumber = ""
     private var resolvedRecipientName = ""
     private var resolvedBankName = ""
+    /** Last real profile/contact photo loaded into the "To" card (not an initials placeholder). */
+    private var loadedToPhoto: Bitmap? = null
     private var resolvedDestCurrency = ""  // "MVR" / "USD" / "" if unknown
     private var resolvedToOwnAccount: BankAccount? = null
 
@@ -175,13 +178,17 @@ class TransferFragment : Fragment() {
         if (result.resultCode != Activity.RESULT_OK) return
         val raw = result.data?.getStringExtra(QrScannerActivity.EXTRA_QR_CONTENT) ?: return
 
+        // BML Merchant Services payment link — resolve it to the QR its page would show
+        BmlMerchantTxnClient.parseTransactionId(raw)?.let {
+            binding.etTo.setText(it)
+            lookupBmlMerchantTransaction(it)
+            return
+        }
+
         // BML card/gateway/POS QR — hand off to dedicated payment screen
         val bmlTarget = PaymvQrParser.bmlQrPayTarget(raw)
         if (bmlTarget != null) {
-            val fromCard = selectedAccount?.takeIf {
-                it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT" || it.profileType == "BML_DEBIT"
-            }
-            (requireActivity() as HomeActivity).navigateTo(R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(bmlTarget, fromCard?.accountNumber))
+            openBmlQr(bmlTarget)
             return
         }
 
@@ -245,6 +252,7 @@ class TransferFragment : Fragment() {
         private const val ARG_REMARKS_PREFILL = "remarks_prefill"
         private const val ARG_BML_QR_URL = "bml_qr_url"
         private const val ARG_AUTO_SCAN = "auto_scan"
+        private const val ARG_BML_TXN_ID = "bml_txn_id"
         private const val ARG_RETURN_ON_SUCCESS = "return_on_success"
         private const val ARG_AUTO_CONFIRM = "auto_confirm"
 
@@ -263,6 +271,11 @@ class TransferFragment : Fragment() {
             }
         }
 
+        /** Opens on a BML Merchant Services transaction ID, which is resolved to its QR on load. */
+        fun newInstanceFromBmlTxn(transactionId: String) = TransferFragment().apply {
+            arguments = Bundle().apply { putString(ARG_BML_TXN_ID, transactionId) }
+        }
+
         fun newInstanceFrom(account: BankAccount) = TransferFragment().apply {
             arguments = Bundle().apply { putString(ARG_FROM_ACCOUNT, account.accountNumber) }
         }
@@ -422,6 +435,11 @@ class TransferFragment : Fragment() {
         }
 
         arguments?.getString(ARG_BML_QR_URL)?.let { bmlHandler().lookupQrMerchant(it) }
+        arguments?.getString(ARG_BML_TXN_ID)?.let {
+            // Shown in the To field so a failed lookup leaves the ID there to retry or correct.
+            binding.etTo.setText(it)
+            lookupBmlMerchantTransaction(it)
+        }
 
         if (arguments?.getBoolean(ARG_AUTO_SCAN, false) == true) {
             launchQrScanner()
@@ -806,7 +824,40 @@ class TransferFragment : Fragment() {
         setupContactDropdown()
     }
 
+    /** Reopens the Transfer screen in BML merchant-QR mode, keeping a selected BML card as the source. */
+    private fun openBmlQr(bmlTarget: String) {
+        val fromCard = selectedAccount?.takeIf {
+            it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT" || it.profileType == "BML_DEBIT"
+        }
+        (requireActivity() as HomeActivity).navigateTo(R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(bmlTarget, fromCard?.accountNumber))
+    }
+
+    /**
+     * A BML Merchant Services transaction ID (or its payment link) typed into the To field: fetch
+     * the QR the payment page would show and pay it like a scanned one.
+     */
+    private fun lookupBmlMerchantTransaction(transactionId: String) {
+        startLookupLoading()
+        viewLifecycleOwner.lifecycleScope.launch {
+            val target = withContext(Dispatchers.IO) {
+                runCatching { BmlMerchantTxnClient().fetchQrPayload(transactionId) }
+                    .getOrNull()?.let { PaymvQrParser.bmlQrPayTarget(it) }
+            }
+            if (_binding == null) return@launch
+            stopLookupLoading()
+            if (target == null) {
+                binding.tilTo.error = getString(R.string.transfer_bml_txn_lookup_failed)
+                return@launch
+            }
+            openBmlQr(target)
+        }
+    }
+
     private fun searchTo() {
+        BmlMerchantTxnClient.parseTransactionId(binding.etTo.text?.toString().orEmpty())?.let {
+            lookupBmlMerchantTransaction(it)
+            return
+        }
         // M-Faisa source uses an entirely different lookup path (phone → basicBeneDetails)
         if (selectedAccount?.bank == "MFAISA") {
             mfaisaHandler().searchRecipient(binding.etTo.text?.toString().orEmpty())
@@ -1211,6 +1262,8 @@ class TransferFragment : Fragment() {
         val destDisplay = binding.tvToAccountName.text?.toString() ?: resolvedAccountNumber
         val bankNameCapture = resolvedBankName
         val capturedToAvatar = (binding.ivToPhoto.drawable as? android.graphics.drawable.BitmapDrawable)?.bitmap
+        // The MIB receipt only takes a real photo; it draws its own initials placeholder otherwise
+        val capturedToPhoto = capturedToAvatar?.takeIf { it === loadedToPhoto }
 
         val destCurrency = resolvedDestCurrency.ifBlank {
             allAccounts.firstOrNull { it.accountNumber == resolvedAccountNumber }
@@ -1248,7 +1301,7 @@ class TransferFragment : Fragment() {
                         val activity = requireActivity() as HomeActivity
                         activity.triggerRefresh()
                         dialog.dismiss()
-                        showReceipt(receipt, capturedToAvatar)
+                        showReceipt(receipt, capturedToPhoto)
                     } else if (!ok) {
                         dialog.dismiss()
                         if (msg == "CONNECTIVITY") {
@@ -1624,6 +1677,7 @@ class TransferFragment : Fragment() {
                 if (_binding != null) {
                     binding.ivToPhoto.scaleType = android.widget.ImageView.ScaleType.CENTER_CROP
                     binding.ivToPhoto.setImageBitmap(bitmap)
+                    loadedToPhoto = bitmap
                 }
             }
         }

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

@@ -14,6 +14,8 @@ data class TransferReceiptData(
     // MIB receipt fields
     val mibReferenceNo: String = "",
     val mibTransactionDate: String = "",
+    val mibFromProfileName: String = "",
+    val mibTransactionType: String = "", // "Own Transfer", "MIB Transfer", "Quick Transfer"
     // BML receipt fields
     val bmlFromName: String = "",
     val bmlReference: String = "",

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

@@ -24,6 +24,7 @@ import android.widget.Toast
 import androidx.core.content.FileProvider
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.button.MaterialButton
@@ -33,6 +34,8 @@ import kotlinx.coroutines.withContext
 import sh.sar.basedbank.BasedBankApp
 import sh.sar.basedbank.R
 import sh.sar.basedbank.api.mib.MibContactsClient
+import sh.sar.basedbank.databinding.DialogReceiptFullscreenBmlBinding
+import sh.sar.basedbank.databinding.DialogReceiptFullscreenMibBinding
 import sh.sar.basedbank.databinding.FragmentReceiptBmlBinding
 import sh.sar.basedbank.databinding.FragmentReceiptMfaisaBinding
 import sh.sar.basedbank.databinding.FragmentReceiptMibBinding
@@ -61,6 +64,8 @@ class TransferReceiptFragment : Fragment() {
         private const val ARG_REMARKS             = "remarks"
         private const val ARG_MIB_REF             = "mib_ref"
         private const val ARG_MIB_DATE            = "mib_date"
+        private const val ARG_MIB_FROM_PROFILE    = "mib_from_profile"
+        private const val ARG_MIB_TXN_TYPE        = "mib_txn_type"
         private const val ARG_BML_FROM_NAME       = "bml_from_name"
         private const val ARG_BML_REFERENCE       = "bml_reference"
         private const val ARG_BML_TIMESTAMP       = "bml_timestamp"
@@ -89,6 +94,8 @@ class TransferReceiptFragment : Fragment() {
                 putString(ARG_REMARKS,        data.remarks)
                 putString(ARG_MIB_REF,        data.mibReferenceNo)
                 putString(ARG_MIB_DATE,       data.mibTransactionDate)
+                putString(ARG_MIB_FROM_PROFILE, data.mibFromProfileName)
+                putString(ARG_MIB_TXN_TYPE,   data.mibTransactionType)
                 putString(ARG_BML_FROM_NAME,  data.bmlFromName)
                 putString(ARG_BML_REFERENCE,  data.bmlReference)
                 putString(ARG_BML_TIMESTAMP,  data.bmlTimestamp)
@@ -161,6 +168,15 @@ class TransferReceiptFragment : Fragment() {
         view.findViewById<MaterialButton>(R.id.btnSave).setOnClickListener {
             saveReceipt()
         }
+
+        val alwaysFullScreen = requireContext().getSharedPreferences("prefs", Context.MODE_PRIVATE)
+            .getBoolean("always_fullscreen_receipt", false)
+        if (alwaysFullScreen) {
+            // The normal page is skipped: keep it laid out (share/save capture its card) but hidden,
+            // and leave the receipt entirely when the full-screen view is closed
+            view.alpha = 0f
+            view.post { if (_receiptCard != null) showFullScreenReceipt(closePageOnDismiss = true) }
+        }
     }
 
     // ── Data binding ──────────────────────────────────────────────────────────
@@ -168,43 +184,64 @@ class TransferReceiptFragment : Fragment() {
     private fun bindMib(binding: FragmentReceiptMibBinding) {
         val args = requireArguments()
         val fromLabel       = args.getString(ARG_FROM_LABEL, "")
-        val fromColor       = args.getString(ARG_FROM_COLOR, "#FE860E")
         val fromProfileHash = args.getString(ARG_FROM_PROFILE_HASH)
         val toLabel         = args.getString(ARG_TO_LABEL, "")
         val currency        = args.getString(ARG_CURRENCY, "MVR")
         val amount          = args.getString(ARG_AMOUNT, "")
 
         // From avatar: initials first, then load profile image if hash available
-        binding.ivFromAvatar.setImageBitmap(makeInitialsBitmap(fromLabel, fromColor))
+        binding.ivFromAvatar.setImageBitmap(makeMibInitialsBitmap(fromLabel))
         binding.tvFromLabel.text = fromLabel
         if (fromProfileHash != null) {
-            loadProfileImage(fromProfileHash, isProfile = true) { binding.ivFromAvatar.setImageBitmap(it) }
+            loadProfileImage(fromProfileHash, isProfile = true) { binding.ivFromAvatar.setImageBitmap(circleCrop(it)) }
         }
 
         // To avatar: use already-rendered bitmap from TransferFragment if available
         val toAvatar = pendingToAvatarBitmap
         if (toAvatar != null) {
-            binding.ivToAvatar.setImageBitmap(toAvatar)
+            binding.ivToAvatar.setImageBitmap(circleCrop(toAvatar))
         } else {
-            binding.ivToAvatar.setImageBitmap(makeInitialsBitmap(toLabel, "#607D8B"))
+            binding.ivToAvatar.setImageBitmap(makeMibInitialsBitmap(toLabel))
         }
         binding.tvToLabel.text = toLabel
 
         binding.tvAmount.text = "$currency $amount"
+
+        val toBank  = args.getString(ARG_TO_BANK, "")
+        val rawDate = args.getString(ARG_MIB_DATE, "")
         binding.tvReferenceNo.text     = args.getString(ARG_MIB_REF, "")
-        binding.tvToAccount.text       = args.getString(ARG_TO_ACCOUNT, "")
-        binding.tvToBank.text          = args.getString(ARG_TO_BANK, "")
-        binding.tvTransactionDate.text = args.getString(ARG_MIB_DATE, "")
-        binding.tvValueDate.text       = args.getString(ARG_MIB_DATE, "")
+        binding.tvFromName.text        = args.getString(ARG_MIB_FROM_PROFILE, "").ifBlank { fromLabel }
+        binding.tvToAccount.text       = listOf(toLabel, args.getString(ARG_TO_ACCOUNT, ""))
+            .filter { it.isNotBlank() }.joinToString("\n")
+        binding.tvToBank.text          = toBank
+        // Receipts saved before the type was recorded fall back to a guess from the bank
+        binding.tvTransactionType.text = args.getString(ARG_MIB_TXN_TYPE, "").ifBlank {
+            if (toBank == "MIB") "MIB Transfer" else "Quick Transfer"
+        }
+        binding.tvTransactionDate.text = formatMibDate(rawDate, "dd MMM yyyy HH:mm")
+        binding.tvValueDate.text       = formatMibDate(rawDate, "dd MMM yyyy")
         binding.tvPurpose.text         = args.getString(ARG_REMARKS, "")
+            .takeUnless { it.isNullOrBlank() || it.trim() == "-" } ?: "N/A"
 
         copyOnLongClick(
-            binding.tvFromLabel, binding.tvToLabel, binding.tvAmount,
-            binding.tvReferenceNo, binding.tvToAccount, binding.tvToBank,
-            binding.tvTransactionDate, binding.tvValueDate, binding.tvPurpose
+            binding.tvFromLabel, binding.tvToLabel, binding.tvAmount, binding.tvStatus,
+            binding.tvReferenceNo, binding.tvFromName, binding.tvToAccount, binding.tvToBank,
+            binding.tvTransactionType, binding.tvTransactionDate, binding.tvValueDate, binding.tvPurpose
         )
     }
 
+    /** Reformats the MIB transfer date ("2026-05-16 15:10:25") to [pattern]; raw text if unparseable. */
+    private fun formatMibDate(raw: String, pattern: String): String {
+        if (raw.isBlank()) return ""
+        val out = DateTimeFormatter.ofPattern(pattern, Locale.US)
+        for (inPattern in listOf("yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "dd MMM yyyy HH:mm")) {
+            try {
+                return java.time.LocalDateTime.parse(raw.trim(), DateTimeFormatter.ofPattern(inPattern, Locale.US)).format(out)
+            } catch (_: Exception) { }
+        }
+        return raw
+    }
+
     private fun loadProfileImage(hash: String, isProfile: Boolean, onLoaded: (Bitmap) -> Unit) {
         val app = requireActivity().application as BasedBankApp
         val sess = app.anyMibSession() ?: return
@@ -375,8 +412,13 @@ class TransferReceiptFragment : Fragment() {
      * applied to fit small viewports and doesn't pick up overlapping siblings.
      */
     private fun captureReceiptBitmap(callback: (Bitmap?) -> Unit) {
-        val view = _receiptCard ?: run { callback(null); return }
-        if (view.width == 0 || view.height == 0) { callback(null); return }
+        val shown = _receiptCard ?: run { callback(null); return }
+        if (shown.width == 0 || shown.height == 0) { callback(null); return }
+
+        // BML: the preview follows the app theme, but shared/saved images are always light
+        val view = if (arguments?.getString(ARG_BANK, "MIB") == "BML") {
+            inflateLightBmlCard(shown.width)
+        } else shown
 
         val bitmap = Bitmap.createBitmap(view.width, view.height, Bitmap.Config.ARGB_8888)
         val canvas = Canvas(bitmap)
@@ -385,6 +427,27 @@ class TransferReceiptFragment : Fragment() {
         callback(bitmap)
     }
 
+    /** Inflates and lays out an offscreen BML receipt card with light-mode resources. */
+    private fun inflateLightBmlCard(widthPx: Int): View {
+        val config = android.content.res.Configuration(resources.configuration).apply {
+            uiMode = (uiMode and android.content.res.Configuration.UI_MODE_NIGHT_MASK.inv()) or
+                    android.content.res.Configuration.UI_MODE_NIGHT_NO
+        }
+        val lightCtx = android.view.ContextThemeWrapper(requireContext(), R.style.Theme_BasedBank).apply {
+            applyOverrideConfiguration(config)
+        }
+        val binding = FragmentReceiptBmlBinding.inflate(LayoutInflater.from(lightCtx))
+        bindBml(binding)
+        val card = binding.receiptCard
+        (card.parent as? ViewGroup)?.removeView(card)
+        card.measure(
+            View.MeasureSpec.makeMeasureSpec(widthPx, View.MeasureSpec.EXACTLY),
+            View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED)
+        )
+        card.layout(0, 0, card.measuredWidth, card.measuredHeight)
+        return card
+    }
+
     private fun formatBmlTimestamp(raw: String): String {
         if (raw.isBlank()) return ""
         return try {
@@ -394,26 +457,46 @@ class TransferReceiptFragment : Fragment() {
         }
     }
 
-    private fun makeInitialsBitmap(name: String, colorHex: String): Bitmap {
+    /** Center-crops [src] to a square and masks it to a circle. */
+    private fun circleCrop(src: Bitmap): Bitmap {
+        val size = minOf(src.width, src.height)
+        val out = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)
+        val paint = Paint(Paint.ANTI_ALIAS_FLAG or Paint.FILTER_BITMAP_FLAG).apply {
+            shader = android.graphics.BitmapShader(src, android.graphics.Shader.TileMode.CLAMP, android.graphics.Shader.TileMode.CLAMP).apply {
+                setLocalMatrix(android.graphics.Matrix().apply {
+                    setTranslate(-(src.width - size) / 2f, -(src.height - size) / 2f)
+                })
+            }
+        }
+        Canvas(out).drawCircle(size / 2f, size / 2f, size / 2f, paint)
+        return out
+    }
+
+    /** MIB receipt placeholder: up to two initials in #1168F3 on a #C6E1FD circle. */
+    private fun makeMibInitialsBitmap(name: String): Bitmap {
         val sizePx = (resources.displayMetrics.density * 52).toInt()
-        val bgColor = try { Color.parseColor(colorHex) } catch (_: Exception) { Color.GRAY }
         val bm = Bitmap.createBitmap(sizePx, sizePx, Bitmap.Config.ARGB_8888)
         val canvas = Canvas(bm)
         val paint = Paint(Paint.ANTI_ALIAS_FLAG)
-        paint.color = bgColor
+        paint.color = Color.parseColor("#C6E1FD")
         canvas.drawCircle(sizePx / 2f, sizePx / 2f, sizePx / 2f, paint)
-        paint.color = Color.WHITE
-        paint.textSize = sizePx * 0.42f
+        paint.color = Color.parseColor("#1168F3")
+        paint.textSize = sizePx * 0.36f
         paint.textAlign = Paint.Align.CENTER
-        val letter = name.firstOrNull()?.uppercaseChar()?.toString() ?: "?"
+        paint.typeface = android.graphics.Typeface.DEFAULT_BOLD
+        val initials = name.split(Regex("\\s+"))
+            .mapNotNull { word -> word.firstOrNull { it.isLetterOrDigit() }?.uppercaseChar() }
+            .take(2).joinToString("").ifEmpty { "?" }
         val metrics = paint.fontMetrics
-        canvas.drawText(letter, sizePx / 2f, sizePx / 2f - (metrics.ascent + metrics.descent) / 2f, paint)
+        canvas.drawText(initials, sizePx / 2f, sizePx / 2f - (metrics.ascent + metrics.descent) / 2f, paint)
         return bm
     }
 
-    private fun showFullScreenReceipt() {
+    private fun showFullScreenReceipt(closePageOnDismiss: Boolean = false) {
         val ctx = requireContext()
         val bank = arguments?.getString(ARG_BANK, "MIB") ?: "MIB"
+        if (bank == "BML") { showBmlFullScreenReceipt(closePageOnDismiss); return }
+        if (bank == "MIB") { showMibFullScreenReceipt(closePageOnDismiss); return }
         val dialog = Dialog(ctx, android.R.style.Theme_Black_NoTitleBar_Fullscreen)
 
         val scrollView = android.widget.ScrollView(ctx).apply {
@@ -455,6 +538,7 @@ class TransferReceiptFragment : Fragment() {
                     android.content.res.Configuration.UI_MODE_NIGHT_MASK) ==
                     android.content.res.Configuration.UI_MODE_NIGHT_NO
             insetsCtrl.isAppearanceLightStatusBars = isLight
+            if (closePageOnDismiss) closeReceiptPage()
         }
         dialog.show()
         dialog.window?.let { win ->
@@ -466,6 +550,121 @@ class TransferReceiptFragment : Fragment() {
         }
     }
 
+    /**
+     * BML full-screen receipt: status bar stays visible, top bar with back button,
+     * edge-to-edge card right under it, BML-styled Save/Share buttons directly below the card.
+     * Follows the app theme (light/dark).
+     */
+    private fun showBmlFullScreenReceipt(closePageOnDismiss: Boolean) {
+        val ctx = requireContext()
+        val dialog = Dialog(ctx, R.style.Theme_BasedBank)
+        val page = DialogReceiptFullscreenBmlBinding.inflate(layoutInflater)
+
+        val card = FragmentReceiptBmlBinding.inflate(layoutInflater).also { bindBml(it) }.receiptCard
+        (card.parent as? ViewGroup)?.removeView(card)
+        page.cardHolder.addView(card, 0, android.widget.LinearLayout.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT
+        ))
+
+        page.btnBack.setOnClickListener { dialog.dismiss() }
+        if (closePageOnDismiss) dialog.setOnDismissListener { closeReceiptPage() }
+        page.btnSaveFull.setOnClickListener { saveReceipt() }
+        page.btnShareFull.setOnClickListener { shareReceipt() }
+
+        val topBasePadding = page.topBar.paddingTop
+        val bottomBasePadding = page.bottomBar.paddingBottom
+        ViewCompat.setOnApplyWindowInsetsListener(page.root) { _, insets ->
+            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            page.topBar.updatePadding(top = topBasePadding + bars.top)
+            page.bottomBar.updatePadding(bottom = bottomBasePadding + bars.bottom)
+            page.root.updatePadding(left = bars.left, right = bars.right)
+            insets
+        }
+
+        dialog.setContentView(page.root)
+        dialog.window?.let { win ->
+            win.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+            androidx.core.view.WindowCompat.setDecorFitsSystemWindows(win, false)
+            @Suppress("DEPRECATION")
+            win.statusBarColor = Color.TRANSPARENT
+            @Suppress("DEPRECATION")
+            win.navigationBarColor = Color.TRANSPARENT
+            val isLight = (resources.configuration.uiMode and
+                    android.content.res.Configuration.UI_MODE_NIGHT_MASK) ==
+                    android.content.res.Configuration.UI_MODE_NIGHT_NO
+            androidx.core.view.WindowInsetsControllerCompat(win, win.decorView).apply {
+                isAppearanceLightStatusBars = isLight
+                isAppearanceLightNavigationBars = isLight
+            }
+        }
+        dialog.show()
+    }
+
+    /**
+     * MIB full-screen receipt: edge-to-edge card whose green header runs under the
+     * (visible) status bar, a floating close button top-right just below the status bar,
+     * and MIB-styled Share/Save buttons pinned to the bottom. Follows the app theme.
+     */
+    private fun showMibFullScreenReceipt(closePageOnDismiss: Boolean) {
+        val ctx = requireContext()
+        val dialog = Dialog(ctx, R.style.Theme_BasedBank)
+        val page = DialogReceiptFullscreenMibBinding.inflate(layoutInflater)
+
+        val cardBinding = FragmentReceiptMibBinding.inflate(layoutInflater).also { bindMib(it) }
+        val card = cardBinding.receiptCard
+        (card.parent as? ViewGroup)?.removeView(card)
+        page.cardHolder.addView(card, ViewGroup.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT
+        ))
+
+        page.btnClose.setOnClickListener { dialog.dismiss() }
+        if (closePageOnDismiss) dialog.setOnDismissListener { closeReceiptPage() }
+        page.btnShareFull.setOnClickListener { shareReceipt() }
+        page.btnSaveFull.setOnClickListener { saveReceipt() }
+
+        val header = cardBinding.receiptHeader
+        val headerBaseHeight = header.layoutParams.height
+        val headerBasePadding = header.paddingTop
+        val closeBaseMargin = (page.btnClose.layoutParams as ViewGroup.MarginLayoutParams).topMargin
+        val bottomBasePadding = page.bottomBar.paddingBottom
+        ViewCompat.setOnApplyWindowInsetsListener(page.root) { _, insets ->
+            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            // Grow the green header under the status bar, keeping its content below it
+            header.layoutParams = header.layoutParams.apply { height = headerBaseHeight + bars.top }
+            header.updatePadding(top = headerBasePadding + bars.top)
+            page.btnClose.layoutParams = (page.btnClose.layoutParams as ViewGroup.MarginLayoutParams)
+                .apply { topMargin = closeBaseMargin + bars.top }
+            page.bottomBar.updatePadding(bottom = bottomBasePadding + bars.bottom)
+            page.root.updatePadding(left = bars.left, right = bars.right)
+            insets
+        }
+
+        dialog.setContentView(page.root)
+        dialog.window?.let { win ->
+            win.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+            androidx.core.view.WindowCompat.setDecorFitsSystemWindows(win, false)
+            @Suppress("DEPRECATION")
+            win.statusBarColor = Color.TRANSPARENT
+            @Suppress("DEPRECATION")
+            win.navigationBarColor = Color.TRANSPARENT
+            val isLight = (resources.configuration.uiMode and
+                    android.content.res.Configuration.UI_MODE_NIGHT_MASK) ==
+                    android.content.res.Configuration.UI_MODE_NIGHT_NO
+            androidx.core.view.WindowInsetsControllerCompat(win, win.decorView).apply {
+                // Status bar sits over the green header, so always use light icons
+                isAppearanceLightStatusBars = false
+                isAppearanceLightNavigationBars = isLight
+            }
+        }
+        dialog.show()
+    }
+
+    /** Pops this receipt off the back stack, returning to whatever screen opened it. */
+    private fun closeReceiptPage() {
+        if (!isAdded || parentFragmentManager.isStateSaved) return
+        parentFragmentManager.popBackStack()
+    }
+
     private fun copyOnLongClick(vararg views: android.widget.TextView) {
         for (tv in views) {
             tv.setOnLongClickListener {

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

@@ -129,6 +129,15 @@ class MibTransferHandler(
                 else -> bankName.ifBlank { "LOCAL" }
             }
         }
+        val isOwnAccount = isDestMib && app.mibAccounts.any {
+            it.accountNumber == destAccount && it.loginTag == src.loginTag &&
+                (src.profileId.isBlank() || it.profileId == src.profileId)
+        }
+        val transactionType = when {
+            isOwnAccount -> "Own Transfer"
+            isDestMib -> "MIB Transfer"
+            else -> "Quick Transfer"
+        }
         return try {
             // Switch to the profile that owns the source account
             if (src.profileId.isNotBlank()) {
@@ -160,7 +169,9 @@ class MibTransferHandler(
                     toBank = toBank,
                     remarks = remarks,
                     mibReferenceNo = result.trxId,
-                    mibTransactionDate = result.date
+                    mibTransactionDate = result.date,
+                    mibFromProfileName = src.profileName,
+                    mibTransactionType = transactionType
                 )
                 Triple(true, "BankTransaction ID: ${result.trxId}\n${result.date}", receipt)
             } else {

app/src/main/java/sh/sar/basedbank/ui/login/CredentialsFragment.kt

@@ -129,8 +129,8 @@ class CredentialsFragment : Fragment() {
             qrLauncher.launch(Intent(requireContext(), QrScannerActivity::class.java))
         }
 
-        binding.cardOtp.setOnClickListener {
-            val code = binding.tvOtpCode.text.toString().replace(" ", "")
+        binding.cardOtp.root.setOnClickListener {
+            val code = binding.cardOtp.tvOtpCode.text.toString().replace(" ", "")
             if (code.isNotEmpty()) {
                 val clipboard = requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
                 clipboard.setPrimaryClip(ClipData.newPlainText("OTP", code))
@@ -198,12 +198,12 @@ class CredentialsFragment : Fragment() {
         val otpSeedRaw = binding.etOtpSeed.text.toString().trim()
         val seed = resolveOtpSeed(otpSeedRaw)
         if (seed.isEmpty()) {
-            binding.cardOtp.visibility = View.INVISIBLE
+            binding.cardOtp.root.visibility = View.INVISIBLE
             return
         }
         val password = binding.etPassword.text.toString()
         if (otpSeedRaw == password || seed.matches(Regex("\\d{6}"))) {
-            binding.cardOtp.visibility = View.INVISIBLE
+            binding.cardOtp.root.visibility = View.INVISIBLE
             return
         }
         try {
@@ -211,13 +211,13 @@ class CredentialsFragment : Fragment() {
             val secondsInPeriod = (System.currentTimeMillis() / 1000L % 30).toInt()
             val remaining = 30 - secondsInPeriod
 
-            binding.tvOtpCode.text = otp
-            binding.tvNextOtpCode.text = Totp.generate(seed, periodOffset = 1)
-            binding.otpTimer.max = 30
-            binding.otpTimer.progress = remaining
-            binding.cardOtp.visibility = View.VISIBLE
+            binding.cardOtp.tvOtpCode.text = otp
+            binding.cardOtp.tvNextOtpCode.text = Totp.generate(seed, periodOffset = 1)
+            binding.cardOtp.otpTimer.max = 30
+            binding.cardOtp.otpTimer.progress = remaining
+            binding.cardOtp.root.visibility = View.VISIBLE
         } catch (e: Exception) {
-            binding.cardOtp.visibility = View.INVISIBLE
+            binding.cardOtp.root.visibility = View.INVISIBLE
         }
     }
 

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

@@ -100,6 +100,11 @@ class CredentialStore(context: Context) {
             .apply()
     }
 
+    /** Replaces only the stored TOTP seed; the old seed is overwritten and cannot be recovered. */
+    fun updateMibOtpSeed(loginId: String, otpSeed: String) {
+        prefs.edit().putString("mib_${loginId}_enc_otp_seed", encrypt(otpSeed, getOrCreateKey())).apply()
+    }
+
     fun loadMibCredentials(loginId: String): MibCredentials? {
         val key = getOrCreateKey()
         val encHash = prefs.getString("mib_${loginId}_enc_password_hash", null) ?: return null
@@ -230,6 +235,11 @@ class CredentialStore(context: Context) {
             .apply()
     }
 
+    /** Replaces only the stored TOTP seed; the old seed is overwritten and cannot be recovered. */
+    fun updateBmlOtpSeed(loginId: String, otpSeed: String) {
+        prefs.edit().putString("bml_${loginId}_enc_otp_seed", encrypt(otpSeed, getOrCreateKey())).apply()
+    }
+
     fun loadBmlCredentials(loginId: String): BmlCredentials? {
         val key = getOrCreateKey()
         val encUsername = prefs.getString("bml_${loginId}_enc_username", null) ?: return null

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

@@ -13,6 +13,27 @@ object OtpauthParser {
         else -> emptyList()
     }
 
+    /**
+     * Normalise user input into a bare Base32 secret: accepts an otpauth:// link or a raw
+     * secret with spaces/dashes. Returns null if the result isn't usable as a TOTP seed.
+     */
+    fun resolveSecret(input: String): String? {
+        val raw = input.trim()
+        val secret = if (raw.startsWith("otpauth://")) Uri.parse(raw).getQueryParameter("secret") ?: return null else raw
+        val clean = secret.replace("\\s".toRegex(), "").replace("-", "").trimEnd('=').uppercase()
+        if (clean.isEmpty() || !clean.all { it in 'A'..'Z' || it in '2'..'7' }) return null
+        // Too short to be a real seed, e.g. a pasted 6-digit OTP code
+        if (clean.length < 8) return null
+        return clean
+    }
+
+    /**
+     * Build the shortest otpauth://totp link authenticator apps accept: just a label and the
+     * secret. SHA1, 6 digits and a 30s period are the spec defaults, so they're left out.
+     */
+    fun buildUri(label: String, secret: String): String =
+        "otpauth://totp/" + Uri.encode(label) + "?secret=$secret"
+
     private fun parseStandard(raw: String): OtpEntry? {
         val uri = Uri.parse(raw)
         val secret = uri.getQueryParameter("secret") ?: return null

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

@@ -40,6 +40,8 @@ object ReceiptStore {
                         remarks              = o.optString("remarks"),
                         mibReferenceNo       = o.optString("mibReferenceNo"),
                         mibTransactionDate   = o.optString("mibTransactionDate"),
+                        mibFromProfileName   = o.optString("mibFromProfileName"),
+                        mibTransactionType   = o.optString("mibTransactionType"),
                         bmlFromName          = o.optString("bmlFromName"),
                         bmlReference         = o.optString("bmlReference"),
                         bmlTimestamp         = o.optString("bmlTimestamp"),
@@ -76,6 +78,8 @@ object ReceiptStore {
                 put("remarks",               d.remarks)
                 put("mibReferenceNo",        d.mibReferenceNo)
                 put("mibTransactionDate",    d.mibTransactionDate)
+                put("mibFromProfileName",    d.mibFromProfileName)
+                put("mibTransactionType",    d.mibTransactionType)
                 put("bmlFromName",           d.bmlFromName)
                 put("bmlReference",          d.bmlReference)
                 put("bmlTimestamp",          d.bmlTimestamp)

app/src/main/res/drawable-night/bottom_receipt_wave.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Dark-mode replacement for drawable/bottom_receipt_wave.jpg (988x48):
+     receipt background above the teeth, footer colour below. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="329dp"
+    android:height="16dp"
+    android:viewportWidth="988"
+    android:viewportHeight="48">
+    <path
+        android:fillColor="@color/bml_receipt_bg"
+        android:pathData="M0,0 L988,0 L988,48 L0,48 Z" />
+    <path
+        android:fillColor="@color/bml_receipt_footer"
+        android:pathData="M0,48 L0,27 L24.08,8.28 Q30.88,3 37.67,8.28 L54.96,21.72 Q61.75,27 68.54,21.72 L85.83,8.28 Q92.63,3 99.42,8.28 L116.71,21.72 Q123.5,27 130.29,21.72 L147.58,8.28 Q154.38,3 161.17,8.28 L178.46,21.72 Q185.25,27 192.04,21.72 L209.33,8.28 Q216.13,3 222.92,8.28 L240.21,21.72 Q247,27 253.79,21.72 L271.08,8.28 Q277.88,3 284.67,8.28 L301.96,21.72 Q308.75,27 315.54,21.72 L332.83,8.28 Q339.63,3 346.42,8.28 L363.71,21.72 Q370.5,27 377.29,21.72 L394.58,8.28 Q401.38,3 408.17,8.28 L425.46,21.72 Q432.25,27 439.04,21.72 L456.33,8.28 Q463.13,3 469.92,8.28 L487.21,21.72 Q494,27 500.79,21.72 L518.08,8.28 Q524.88,3 531.67,8.28 L548.96,21.72 Q555.75,27 562.54,21.72 L579.83,8.28 Q586.63,3 593.42,8.28 L610.71,21.72 Q617.5,27 624.29,21.72 L641.58,8.28 Q648.38,3 655.17,8.28 L672.46,21.72 Q679.25,27 686.04,21.72 L703.33,8.28 Q710.13,3 716.92,8.28 L734.21,21.72 Q741,27 747.79,21.72 L765.08,8.28 Q771.88,3 778.67,8.28 L795.96,21.72 Q802.75,27 809.54,21.72 L826.83,8.28 Q833.63,3 840.42,8.28 L857.71,21.72 Q864.5,27 871.29,21.72 L888.58,8.28 Q895.38,3 902.17,8.28 L919.46,21.72 Q926.25,27 933.04,21.72 L950.33,8.28 Q957.13,3 963.92,8.28 L988,27 L988,48 Z" />
+</vector>

app/src/main/res/drawable/bg_mib_receipt_header.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:startColor="#2E7D32"
-        android:centerColor="#43A047"
-        android:endColor="#66BB6A"
-        android:angle="315"
-        android:type="linear" />
-</shape>

app/src/main/res/drawable/ic_chevron_back.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:pathData="M15,4 L7,12 L15,20" />
+</vector>

app/src/main/res/drawable/ic_mib_receipt_close.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- MIB full-screen receipt close button: tinted-black disc, themed ring, white X -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+    <path
+        android:fillColor="#4D000000"
+        android:strokeColor="@color/mib_receipt_close_ring"
+        android:strokeWidth="1.5"
+        android:pathData="M16,1.25 A14.75,14.75 0 1,1 16,30.75 A14.75,14.75 0 1,1 16,1.25 Z" />
+    <path
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:pathData="M11,11 L21,21 M21,11 L11,21" />
+</vector>

app/src/main/res/drawable/mib_logo_full.xml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Full MIB logo (mark + "MALDIVES ISLAMIC BANK" wordmark); wordmark follows the receipt footer text color -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="187.6dp"
+    android:height="22dp"
+    android:viewportWidth="779.5"
+    android:viewportHeight="91.4">
+    <path
+        android:fillColor="#FFFFFF"
+        android:strokeColor="#A8AAAC"
+        android:strokeWidth="3.8833"
+        android:strokeMiterLimit="10"
+        android:pathData="M64.6,89.2H26.7c-13.5,0-24.5-11-24.5-24.5v-38c0-13.5,11-24.5,24.5-24.5h37.9c13.5,0,24.5,11,24.5,24.5v37.9 C89.1,78.2,78.2,89.2,64.6,89.2z" />
+    <path
+        android:fillColor="#1E2859"
+        android:pathData="M49.4,28.7c1.7-1.7,3.5-3.3,5.4-4.8c1.9,1.5,3.7,3.1,5.4,4.8c9,9.2,14.4,21.7,14.4,35.3c0,0.7,0,1.5-0.1,2.2 H57.6l10.9-6.8c-0.5-6-2.4-11.8-5.6-17.2c-2.2-3.7-5-7-8.2-9.7c-3.2,2.7-5.9,6-8.2,9.7c-3.2,5.3-5,11.2-5.6,17.2l4.6,6.8H35 c0-0.7-0.1-1.5-0.1-2.2C34.9,50.3,40.4,37.9,49.4,28.7z" />
+    <path
+        android:fillColor="#006A4D"
+        android:pathData="M41.9,28.7c-1.7-1.7-3.5-3.3-5.4-4.8c-1.9,1.5-3.7,3.1-5.4,4.8c-9,9.2-14.4,21.7-14.4,35.3 c0,0.7,0,1.5,0.1,2.2h16.9l-10.9-6.8c0.5-6,2.4-11.8,5.6-17.2c2.2-3.7,5-7,8.2-9.7c3.2,2.7,5.9,6,8.2,9.7c3.2,5.3,5,11.2,5.6,17.2 l-4.6,6.8h10.6c0-0.7,0.1-1.5,0.1-2.2C56.3,50.3,50.8,37.9,41.9,28.7z" />
+    <path
+        android:fillColor="@color/mib_receipt_footer_text"
+        android:pathData="M146.4,49.5c-0.2-5.3-0.5-11.7-0.5-17.2h-0.2c-1.3,5-3,10.5-4.9,15.7l-6,17.8h-5.8l-5.5-17.5 c-1.6-5.2-3-10.8-4.1-15.9h-0.1c-0.2,5.4-0.4,11.9-0.7,17.5l-0.9,16.5h-7l2.7-41h9.9l5.4,16.5c1.5,4.8,2.7,9.7,3.8,14.2h0.2 c1.1-4.4,2.5-9.5,4.1-14.3l5.7-16.4h9.7l2.4,41h-7.3L146.4,49.5z" />
+    <path
+        android:fillColor="@color/mib_receipt_footer_text"
+        android:pathData="M170,54.6l-3.5,11.6h-7.7l13.1-41h9.6l13.3,41h-8L183,54.6H170z M181.7,49l-3.2-10.1 c-0.8-2.5-1.5-5.3-2.1-7.7h-0.1c-0.6,2.4-1.2,5.2-1.9,7.7L171.2,49H181.7z" />
+    <path
+        android:fillColor="@color/mib_receipt_footer_text"
+        android:pathData="M200.5,25.2h7.5V60h16.9v6.3h-24.3V25.2z" />
+    <path
+        android:fillColor="@color/mib_receipt_footer_text"
+        android:pathData="M230.5,25.8c3.3-0.5,7.5-0.9,11.9-0.9c7.7,0,13,1.6,16.7,4.7c4,3.2,6.4,8.1,6.4,15.1c0,7.3-2.5,12.8-6.4,16.3 c-4.1,3.7-10.6,5.6-18.6,5.6c-4.4,0-7.7-0.2-10.1-0.5V25.8z M237.9,60.5c1,0.2,2.6,0.2,4.1,0.2c9.7,0.1,15.5-5.3,15.5-15.7 c0.1-9.1-5.2-14.2-14.5-14.2c-2.4,0-4.1,0.2-5.1,0.4V60.5z" />
+    <path
+        android:fillColor="@color/mib_receipt_footer_text"
+        android:pathData="M279.5,25.2v41H272v-41H279.5z" />
+    <path
+        android:fillColor="@color/mib_receipt_footer_text"
+        android:pathData="M297.4,66.2l-13.3-41h8.2l5.6,18.6c1.6,5.2,2.9,10,4,15h0.1c1.1-4.9,2.6-9.9,4.2-14.8l6-18.7h8l-14.2,41 H297.4z" />
+    <path
+        android:fillColor="@color/mib_receipt_footer_text"
+        android:pathData="M347.6,48.1h-15.5v12h17.3v6.1h-24.8v-41h23.8v6.1h-16.4V42h15.5V48.1z" />
+    <path
+        android:fillColor="@color/mib_receipt_footer_text"
+        android:pathData="M355.8,58.1c2.4,1.4,6.1,2.6,9.9,2.6c4.8,0,7.5-2.3,7.5-5.6c0-3.1-2.1-4.9-7.3-6.8c-6.8-2.4-11.1-6-11.1-11.9 c0-6.7,5.6-11.8,14.5-11.8c4.4,0,7.7,1,9.9,2.1l-1.8,6c-1.5-0.8-4.3-1.9-8.2-1.9c-4.7,0-6.8,2.6-6.8,4.9c0,3.2,2.4,4.6,7.8,6.8 c7.1,2.7,10.6,6.3,10.6,12.2c0,6.6-5,12.3-15.6,12.3c-4.3,0-8.8-1.2-11.1-2.6L355.8,58.1z" />
+    <path
+        android:fillColor="@color/mib_receipt_footer_text"
+        android:pathData="M407.6,25.2v41h-7.5v-41H407.6z" />
+    <path
+        android:fillColor="@color/mib_receipt_footer_text"
+        android:pathData="M416,58.1c2.4,1.4,6.1,2.6,9.9,2.6c4.8,0,7.5-2.3,7.5-5.6c0-3.1-2.1-4.9-7.3-6.8c-6.8-2.4-11.1-6-11.1-11.9 c0-6.7,5.6-11.8,14.5-11.8c4.4,0,7.7,1,9.9,2.1l-1.8,6c-1.5-0.8-4.3-1.9-8.2-1.9c-4.7,0-6.8,2.6-6.8,4.9c0,3.2,2.4,4.6,7.8,6.8 c7.1,2.7,10.6,6.3,10.6,12.2c0,6.6-5,12.3-15.6,12.3c-4.3,0-8.8-1.2-11.1-2.6L416,58.1z" />
+    <path
+        android:fillColor="@color/mib_receipt_footer_text"
+        android:pathData="M447.8,25.2h7.5V60h16.9v6.3h-24.3V25.2z" />
+    <path
+        android:fillColor="@color/mib_receipt_footer_text"
+        android:pathData="M486.2,54.6l-3.5,11.6H475l13.1-41h9.6l13.3,41h-8l-3.7-11.6H486.2z M498,49l-3.2-10.1 c-0.8-2.5-1.5-5.3-2.1-7.7h-0.1c-0.6,2.4-1.2,5.2-1.9,7.7L487.4,49H498z" />
+    <path
+        android:fillColor="@color/mib_receipt_footer_text"
+        android:pathData="M551.1,49.5c-0.2-5.3-0.5-11.7-0.5-17.2h-0.2c-1.3,5-3,10.5-4.9,15.7l-6,17.8h-5.8l-5.5-17.5 c-1.6-5.2-3-10.8-4.1-15.9h-0.1c-0.2,5.4-0.4,11.9-0.7,17.5l-0.9,16.5h-7l2.7-41h9.9l5.4,16.5c1.5,4.8,2.7,9.7,3.8,14.2h0.2 c1.1-4.4,2.5-9.5,4.1-14.3l5.7-16.4h9.7l2.4,41h-7.3L551.1,49.5z" />
+    <path
+        android:fillColor="@color/mib_receipt_footer_text"
+        android:pathData="M574.3,25.2v41h-7.5v-41H574.3z" />
+    <path
+        android:fillColor="@color/mib_receipt_footer_text"
+        android:pathData="M612.3,65c-1.8,0.9-5.7,1.8-10.6,1.8c-13,0-20.9-8.2-20.9-20.6c0-13.5,9.4-21.7,21.9-21.7c4.9,0,8.5,1,10,1.8 l-1.6,6c-1.9-0.9-4.6-1.6-8-1.6c-8.3,0-14.4,5.2-14.4,15.1c0,9,5.3,14.8,14.3,14.8c3,0,6.2-0.6,8.2-1.5L612.3,65z" />
+    <path
+        android:fillColor="@color/mib_receipt_footer_text"
+        android:pathData="M631.3,25.8c2.4-0.5,6.7-0.9,10.9-0.9c5.5,0,8.9,0.7,11.7,2.6c2.6,1.5,4.3,4.2,4.3,7.7c0,3.8-2.4,7.2-6.8,8.9 v0.1c4.3,1.1,8.3,4.5,8.3,10.2c0,3.7-1.6,6.5-4,8.5c-2.9,2.6-7.7,3.8-15.2,3.8c-4.1,0-7.3-0.3-9.2-0.5V25.8z M638.7,42h3.8 c5.2,0,8.1-2.4,8.1-5.9c0-3.8-2.9-5.6-7.7-5.6c-2.2,0-3.5,0.1-4.3,0.3V42z M638.7,60.8c1,0.1,2.3,0.2,4,0.2c4.8,0,9.1-1.8,9.1-6.9 c0-4.7-4.1-6.7-9.3-6.7h-3.7V60.8z" />
+    <path
+        android:fillColor="@color/mib_receipt_footer_text"
+        android:pathData="M674.3,54.6l-3.5,11.6h-7.7l13.1-41h9.6l13.3,41h-8l-3.7-11.6H674.3z M686.1,49l-3.2-10.1 c-0.8-2.5-1.5-5.3-2.1-7.7h-0.1c-0.6,2.4-1.2,5.2-1.9,7.7L675.5,49H686.1z" />
+    <path
+        android:fillColor="@color/mib_receipt_footer_text"
+        android:pathData="M704.8,66.2v-41h8.5l10.6,17.6c2.7,4.6,5.1,9.3,7,13.7h0.1c-0.5-5.5-0.7-10.8-0.7-17V25.2h6.9v41h-7.7 l-10.7-18c-2.6-4.5-5.4-9.6-7.4-14.2l-0.2,0.1c0.3,5.3,0.4,10.7,0.4,17.5v14.7H704.8z" />
+    <path
+        android:fillColor="@color/mib_receipt_footer_text"
+        android:pathData="M745.9,25.2h7.4v18.9h0.2c1-1.6,2-3,3-4.4l10.7-14.4h9.2l-14.1,17.5l15,23.5h-8.8L757,47.5l-3.7,4.4v14.4 h-7.4V25.2z" />
+</vector>

app/src/main/res/drawable/mib_receipt_header_bg.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- MIB receipt header: solid green under the official app's translucent palm texture -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/mib_receipt_amount" />
+    <item>
+        <bitmap
+            android:src="@drawable/mib_receipt_texture"
+            android:gravity="fill" />
+    </item>
+</layer-list>

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

@@ -48,6 +48,7 @@
                 android:id="@+id/languageToggle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:baselineAligned="false"
                 app:singleSelection="true"
                 app:selectionRequired="true">
 

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

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:paddingHorizontal="24dp"
+        android:paddingTop="8dp">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            android:text="Scan this with your authenticator app, or copy the seed. Please keep it private, since anyone who has it can generate your OTP codes."
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant" />
+
+        <!-- Always black-on-white so scanners read it in dark mode too -->
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:cardBackgroundColor="@android:color/white"
+            app:cardCornerRadius="16dp"
+            app:strokeWidth="0dp">
+
+            <ImageView
+                android:id="@+id/ivSeedQr"
+                android:layout_width="220dp"
+                android:layout_height="220dp"
+                android:layout_margin="12dp"
+                android:contentDescription="OTP seed QR code" />
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <TextView
+            android:id="@+id/tvSeed"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:fontFamily="monospace"
+            android:gravity="center"
+            android:textAppearance="?attr/textAppearanceTitleMedium"
+            android:textColor="?attr/colorOnSurface"
+            android:textIsSelectable="true" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btnCopySeed"
+            style="@style/Widget.Material3.Button.TonalButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="Copy seed"
+            app:icon="@drawable/ic_copy" />
+
+    </LinearLayout>
+
+</ScrollView>

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

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingHorizontal="24dp"
+        android:paddingTop="8dp">
+
+        <!-- Warning: the old seed is overwritten -->
+        <com.google.android.material.card.MaterialCardView
+            style="@style/Widget.Material3.CardView.Filled"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            app:cardBackgroundColor="?attr/colorErrorContainer"
+            app:cardCornerRadius="16dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:padding="12dp">
+
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_marginEnd="12dp"
+                    android:importantForAccessibility="no"
+                    android:src="@drawable/ic_info"
+                    app:tint="?attr/colorOnErrorContainer" />
+
+                <TextView
+                    android:id="@+id/tvSeedWarning"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:textAppearance="?attr/textAppearanceBodySmall"
+                    android:textColor="?attr/colorOnErrorContainer" />
+
+            </LinearLayout>
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical">
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/tilNewSeed"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:hint="New OTP seed"
+                app:helperText="Base32 secret or otpauth:// link">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/etNewSeed"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="monospace"
+                    android:imeOptions="actionDone"
+                    android:inputType="textNoSuggestions|textVisiblePassword"
+                    android:singleLine="true" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnScanNewSeed"
+                style="@style/Widget.Material3.Button.IconButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:contentDescription="@string/scan_otp_qr"
+                android:tooltipText="@string/scan_otp_qr"
+                app:icon="@drawable/ic_qr_scan" />
+
+        </LinearLayout>
+
+        <!-- Live preview of the new seed's code, same card as the sign-in screen -->
+        <include
+            android:id="@+id/cardOtp"
+            layout="@layout/view_otp_preview"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp" />
+
+    </LinearLayout>
+
+</ScrollView>

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

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Full-screen BML receipt, modelled on docs/bmlapi/tmp/recipt_full_*.jpg.
+     The receipt card is inserted at the top of cardHolder, directly followed by
+     the Save/Share buttons; the rest of the screen shows the footer colour. -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/bml_receipt_footer">
+
+    <!-- Top bar — status bar inset is added as top padding in code -->
+    <FrameLayout
+        android:id="@+id/topBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/bml_receipt_bg">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="48dp">
+
+            <ImageButton
+                android:id="@+id/btnBack"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="start|center_vertical"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:src="@drawable/ic_chevron_back"
+                app:tint="@color/bml_receipt_amount"
+                android:contentDescription="Back" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="Transfer successful"
+                android:textSize="17sp"
+                android:textColor="@color/bml_receipt_amount"
+                android:fontFamily="@font/sofia_pro" />
+
+        </FrameLayout>
+
+    </FrameLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/bml_receipt_divider" />
+
+    <ScrollView
+        android:id="@+id/scroll"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:overScrollMode="never"
+        android:scrollbars="none">
+
+        <LinearLayout
+            android:id="@+id/cardHolder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <!-- receipt card goes here (index 0) -->
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/bml_receipt_bottom_divider" />
+
+            <!-- Bottom actions — nav bar inset is added to bottom padding in code -->
+            <LinearLayout
+                android:id="@+id/bottomBar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:background="@color/bml_receipt_footer"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="20dp"
+                android:paddingBottom="16dp">
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnSaveFull"
+                    style="@style/Widget.Material3.Button"
+                    android:layout_width="match_parent"
+                    android:layout_height="44dp"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
+                    android:text="Save receipt"
+                    android:textAllCaps="false"
+                    android:letterSpacing="0"
+                    android:textSize="17sp"
+                    android:textColor="#FFFFFF"
+                    android:fontFamily="@font/sofia_pro"
+                    app:backgroundTint="@color/bml_red"
+                    app:cornerRadius="10dp" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnShareFull"
+                    style="@style/Widget.Material3.Button.TextButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="44dp"
+                    android:layout_marginTop="8dp"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
+                    android:text="Share receipt"
+                    android:textAllCaps="false"
+                    android:letterSpacing="0"
+                    android:textSize="17sp"
+                    android:textColor="@color/bml_receipt_message"
+                    android:fontFamily="@font/sofia_pro"
+                    app:rippleColor="@color/bml_receipt_divider" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</LinearLayout>

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

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Full-screen MIB receipt. The receipt card is inserted into cardHolder and its green
+     header is extended under the status bar in code; the close button floats over the
+     header just below the status bar. Share/Save sit pinned at the bottom of the screen. -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/mib_receipt_bg">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ScrollView
+            android:id="@+id/scroll"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:overScrollMode="never"
+            android:scrollbars="none">
+
+            <FrameLayout
+                android:id="@+id/cardHolder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+        </ScrollView>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/mib_receipt_divider" />
+
+        <!-- Bottom actions — nav bar inset is added to bottom padding in code -->
+        <LinearLayout
+            android:id="@+id/bottomBar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="20dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="16dp">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnShareFull"
+                style="@style/Widget.Material3.Button"
+                android:layout_width="match_parent"
+                android:layout_height="44dp"
+                android:insetTop="0dp"
+                android:insetBottom="0dp"
+                android:text="Share Receipt"
+                android:textAllCaps="false"
+                android:letterSpacing="0"
+                android:textSize="17sp"
+                android:textColor="#FFFFFF"
+                app:backgroundTint="@color/mib_blue"
+                app:cornerRadius="10dp" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnSaveFull"
+                style="@style/Widget.Material3.Button.OutlinedButton"
+                android:layout_width="match_parent"
+                android:layout_height="44dp"
+                android:layout_marginTop="8dp"
+                android:insetTop="0dp"
+                android:insetBottom="0dp"
+                android:text="Save Receipt"
+                android:textAllCaps="false"
+                android:letterSpacing="0"
+                android:textSize="17sp"
+                android:textColor="@color/mib_blue"
+                app:backgroundTint="@color/mib_receipt_bg"
+                app:strokeColor="@color/mib_blue"
+                app:strokeWidth="1dp"
+                app:cornerRadius="10dp" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <!-- Close (back) button — status bar inset is added to top margin in code -->
+    <ImageButton
+        android:id="@+id/btnClose"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_gravity="top|end"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="8dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:src="@drawable/ic_mib_receipt_close"
+        android:contentDescription="Close" />
+
+</FrameLayout>

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

@@ -130,89 +130,13 @@
                 android:maxLength="6" />
         </com.google.android.material.textfield.TextInputLayout>
 
-        <com.google.android.material.card.MaterialCardView
+        <include
             android:id="@+id/cardOtp"
+            layout="@layout/view_otp_preview"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:visibility="invisible"
-            android:clickable="true"
-            android:focusable="true"
-            app:cardBackgroundColor="?attr/colorSecondaryContainer"
-            app:cardCornerRadius="12dp"
-            app:cardElevation="0dp">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingHorizontal="16dp"
-                android:paddingVertical="12dp"
-                android:gravity="center_vertical">
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="Current OTP"
-                        android:textAppearance="?attr/textAppearanceLabelSmall"
-                        android:textColor="?attr/colorOnSecondaryContainer" />
-
-                    <TextView
-                        android:id="@+id/tvOtpCode"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textAppearance="?attr/textAppearanceHeadlineSmall"
-                        android:textColor="?attr/colorOnSecondaryContainer"
-                        android:letterSpacing="0.15"
-                        android:fontFamily="monospace" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="16dp"
-                    android:orientation="vertical"
-                    android:gravity="end"
-                    android:alpha="0.7">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="Next"
-                        android:textAppearance="?attr/textAppearanceLabelSmall"
-                        android:textColor="?attr/colorOnSecondaryContainer" />
-
-                    <TextView
-                        android:id="@+id/tvNextOtpCode"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textAppearance="?attr/textAppearanceTitleMedium"
-                        android:textColor="?attr/colorOnSecondaryContainer"
-                        android:letterSpacing="0.1"
-                        android:fontFamily="monospace" />
-
-                </LinearLayout>
-
-                <com.google.android.material.progressindicator.CircularProgressIndicator
-                    android:id="@+id/otpTimer"
-                    android:layout_width="32dp"
-                    android:layout_height="32dp"
-                    app:indicatorSize="32dp"
-                    app:trackThickness="3dp"
-                    app:indicatorColor="?attr/colorOnSecondaryContainer"
-                    app:trackColor="?attr/colorSecondaryContainer"
-                    android:indeterminate="false" />
-
-            </LinearLayout>
-        </com.google.android.material.card.MaterialCardView>
+            android:layout_marginBottom="8dp" />
 
         <TextView
             android:id="@+id/tvError"

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

@@ -24,7 +24,7 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="24dp"
         android:orientation="vertical"
-        android:background="#FFFFFF">
+        android:background="@color/bml_receipt_bg">
 
         <!-- BML icon (bmlicon.jpg, centered, ~52dp ≈ 146/1080*360dp) -->
         <ImageView
@@ -32,7 +32,7 @@
             android:layout_height="52dp"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="20dp"
-            android:src="@drawable/bml_icon"
+            android:src="@drawable/bml_logo_vector"
             android:scaleType="fitCenter"
             android:adjustViewBounds="true"
             android:contentDescription="@null" />
@@ -47,7 +47,7 @@
             android:layout_marginBottom="20dp"
             android:id="@+id/tvMessage"
             android:textSize="14sp"
-            android:textColor="#2D2D2D"
+            android:textColor="@color/bml_receipt_message"
             android:fontFamily="@font/nunito_sans"
             android:gravity="center" />
 
@@ -75,7 +75,7 @@
                 android:layout_gravity="center"
                 android:layout_marginBottom="13dp"
                 android:textSize="42sp"
-                android:textColor="#242424"
+                android:textColor="@color/bml_receipt_amount"
                 android:fontFamily="@font/sofia_pro"
                 android:gravity="center" />
 
@@ -109,66 +109,66 @@
 
             <!-- Status (value = green #8BC155) -->
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" android:paddingVertical="13dp">
-                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Status" android:textSize="13sp" android:textColor="#000000" android:fontFamily="@font/sofia_pro" />
+                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Status" android:textSize="13sp" android:textColor="@color/bml_receipt_label" android:fontFamily="@font/sofia_pro" />
                 <View android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" />
                 <TextView android:id="@+id/tvStatus" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="SUCCESS" android:textSize="15sp" android:textColor="#8BC155" android:fontFamily="@font/sofia_pro" />
             </LinearLayout>
-            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="#E9E9E9" />
+            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="@color/bml_receipt_divider" />
 
             <!-- Message (value wraps if long) -->
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" android:paddingVertical="13dp">
-                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Message" android:textSize="13sp" android:textColor="#000000" android:fontFamily="@font/sofia_pro" />
+                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Message" android:textSize="13sp" android:textColor="@color/bml_receipt_label" android:fontFamily="@font/sofia_pro" />
                 <View android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" />
                 <TextView android:id="@+id/tvMessageRow" android:layout_width="0dp" android:layout_weight="1.4" android:layout_height="wrap_content" android:textSize="15sp" android:textColor="#808080" android:fontFamily="@font/sofia_pro" android:gravity="end" />
             </LinearLayout>
-            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="#E9E9E9" />
+            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="@color/bml_receipt_divider" />
 
             <!-- Reference -->
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" android:paddingVertical="13dp">
-                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Reference" android:textSize="13sp" android:textColor="#000000" android:fontFamily="@font/sofia_pro" />
+                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Reference" android:textSize="13sp" android:textColor="@color/bml_receipt_label" android:fontFamily="@font/sofia_pro" />
                 <View android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" />
                 <TextView android:id="@+id/tvReference" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="15sp" android:textColor="#808080" android:fontFamily="@font/sofia_pro" />
             </LinearLayout>
-            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="#E9E9E9" />
+            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="@color/bml_receipt_divider" />
 
             <!-- Transaction date -->
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" android:paddingVertical="13dp">
-                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Transaction date" android:textSize="13sp" android:textColor="#000000" android:fontFamily="@font/sofia_pro" />
+                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Transaction date" android:textSize="13sp" android:textColor="@color/bml_receipt_label" android:fontFamily="@font/sofia_pro" />
                 <View android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" />
                 <TextView android:id="@+id/tvTransactionDate" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="15sp" android:textColor="#808080" android:fontFamily="@font/sofia_pro" />
             </LinearLayout>
-            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="#E9E9E9" />
+            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="@color/bml_receipt_divider" />
 
             <!-- From (value uppercase) -->
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" android:paddingVertical="13dp">
-                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="From" android:textSize="13sp" android:textColor="#000000" android:fontFamily="@font/sofia_pro" />
+                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="From" android:textSize="13sp" android:textColor="@color/bml_receipt_label" android:fontFamily="@font/sofia_pro" />
                 <View android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" />
                 <TextView android:id="@+id/tvFrom" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="15sp" android:textColor="#808080" android:fontFamily="@font/sofia_pro" android:textAllCaps="false" />
             </LinearLayout>
-            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="#E9E9E9" />
+            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="@color/bml_receipt_divider" />
 
             <!-- To (stacked name + account) -->
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" android:paddingVertical="13dp">
-                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="To" android:textSize="13sp" android:textColor="#000000" android:fontFamily="@font/sofia_pro" />
+                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="To" android:textSize="13sp" android:textColor="@color/bml_receipt_label" android:fontFamily="@font/sofia_pro" />
                 <View android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" />
                 <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" android:gravity="end">
                     <TextView android:id="@+id/tvToName" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="15sp" android:textColor="#808080" android:fontFamily="@font/sofia_pro" android:gravity="end" />
                     <TextView android:id="@+id/tvToAccount" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2dp" android:textSize="15sp" android:textColor="#808080" android:fontFamily="@font/sofia_pro" android:gravity="end" />
                 </LinearLayout>
             </LinearLayout>
-            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="#E9E9E9" />
+            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="@color/bml_receipt_divider" />
 
             <!-- Amount (value = green #8BC155) -->
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" android:paddingVertical="13dp">
-                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Amount" android:textSize="13sp" android:textColor="#000000" android:fontFamily="@font/sofia_pro" />
+                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Amount" android:textSize="13sp" android:textColor="@color/bml_receipt_label" android:fontFamily="@font/sofia_pro" />
                 <View android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" />
                 <TextView android:id="@+id/tvAmountRow" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="15sp" android:textColor="#8BC155" android:fontFamily="@font/sofia_pro" />
             </LinearLayout>
 
             <!-- Remarks (hidden when empty) -->
-            <View android:id="@+id/remarksDivider" android:layout_width="match_parent" android:layout_height="1dp" android:background="#E9E9E9" android:visibility="gone" />
+            <View android:id="@+id/remarksDivider" android:layout_width="match_parent" android:layout_height="1dp" android:background="@color/bml_receipt_divider" android:visibility="gone" />
             <LinearLayout android:id="@+id/remarksRow" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" android:paddingVertical="13dp" android:visibility="gone">
-                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Remarks" android:textSize="13sp" android:textColor="#000000" android:fontFamily="@font/sofia_pro" />
+                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Remarks" android:textSize="13sp" android:textColor="@color/bml_receipt_label" android:fontFamily="@font/sofia_pro" />
                 <View android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" />
                 <TextView android:id="@+id/tvRemarks" android:layout_width="0dp" android:layout_weight="1.4" android:layout_height="wrap_content" android:textSize="15sp" android:textColor="#808080" android:fontFamily="@font/sofia_pro" android:gravity="end" />
             </LinearLayout>
@@ -199,7 +199,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:gravity="center"
-            android:background="#F5F5F5"
+            android:background="@color/bml_receipt_footer"
             android:paddingVertical="22dp">
 
             <TextView

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

@@ -15,7 +15,7 @@
         android:overScrollMode="never"
         android:scrollbars="none">
 
-    <!-- Renderable receipt card (header grows to fill remaining space) -->
+    <!-- Renderable receipt card -->
     <LinearLayout
         android:id="@+id/receiptCard"
         android:layout_width="match_parent"
@@ -23,76 +23,35 @@
         android:layout_marginHorizontal="40dp"
         android:orientation="vertical">
 
-        <!-- Green header — fills all space not taken by body -->
+        <!-- Green header — from/to avatars and names -->
         <FrameLayout
+            android:id="@+id/receiptHeader"
             android:layout_width="match_parent"
-            android:layout_height="200dp"
-            android:background="@drawable/trx_success_bg">
+            android:layout_height="160dp"
+            android:background="@drawable/mib_receipt_header_bg">
 
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:orientation="vertical"
-                android:gravity="center">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="TRANSACTION RECEIPT"
-                    android:textColor="#FFFFFF"
-                    android:textSize="14sp"
-                    android:letterSpacing="0.08"
-                    android:layout_marginBottom="22dp" />
-
-                <ImageView
-                    android:layout_width="64dp"
-                    android:layout_height="64dp"
-                    android:src="@drawable/ic_receipt_check"
-                    android:contentDescription="@null" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="SUCCESSFUL"
-                    android:textColor="#FFFFFF"
-                    android:textSize="16sp"
-                    android:letterSpacing="0.05"
-                    android:layout_marginTop="18dp" />
-
-            </LinearLayout>
-
-        </FrameLayout>
-
-        <!-- White body — fixed size content -->
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:background="#FFFFFF"
-            android:paddingTop="16dp">
-
-            <!-- Avatars row -->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
                 android:orientation="horizontal"
                 android:gravity="center"
-                android:paddingHorizontal="24dp"
-                android:paddingBottom="14dp">
+                android:paddingHorizontal="24dp">
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
                     android:orientation="vertical"
                     android:gravity="center">
 
-                    <com.google.android.material.imageview.ShapeableImageView
+                    <!-- Plain ImageView: bitmaps are circle-cropped in code (ShapeableImageView's
+                         hardware-layer mask doesn't render on the scaled card or in captures) -->
+                    <ImageView
                         android:id="@+id/ivFromAvatar"
                         android:layout_width="52dp"
                         android:layout_height="52dp"
-                        app:shapeAppearanceOverlay="@style/ShapeAppearance.Circle" />
+                        android:scaleType="fitCenter"
+                        android:contentDescription="@null" />
 
                     <TextView
                         android:id="@+id/tvFromLabel"
@@ -100,7 +59,9 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="6dp"
                         android:textSize="12sp"
-                        android:textColor="#565656"
+                        android:maxWidth="110dp"
+                        android:textStyle="bold"
+                        android:textColor="#FFFFFF"
                         android:gravity="center"
                         android:maxLines="2" />
 
@@ -109,22 +70,25 @@
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginHorizontal="12dp"
+                    android:layout_marginHorizontal="10dp"
                     android:src="@drawable/ic_arrow_right"
+                    android:tint="#FFFFFF"
                     android:contentDescription="@null" />
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
                     android:orientation="vertical"
                     android:gravity="center">
 
-                    <com.google.android.material.imageview.ShapeableImageView
+                    <!-- Plain ImageView: bitmaps are circle-cropped in code (ShapeableImageView's
+                         hardware-layer mask doesn't render on the scaled card or in captures) -->
+                    <ImageView
                         android:id="@+id/ivToAvatar"
                         android:layout_width="52dp"
                         android:layout_height="52dp"
-                        app:shapeAppearanceOverlay="@style/ShapeAppearance.Circle" />
+                        android:scaleType="fitCenter"
+                        android:contentDescription="@null" />
 
                     <TextView
                         android:id="@+id/tvToLabel"
@@ -132,7 +96,9 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="6dp"
                         android:textSize="12sp"
-                        android:textColor="#565656"
+                        android:maxWidth="110dp"
+                        android:textStyle="bold"
+                        android:textColor="#FFFFFF"
                         android:gravity="center"
                         android:maxLines="2" />
 
@@ -140,81 +106,92 @@
 
             </LinearLayout>
 
-            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="#CAC4D0" android:layout_marginHorizontal="20dp" />
+        </FrameLayout>
 
-            <!-- Total Amount -->
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="TOTAL AMOUNT"
-                android:textSize="13sp"
-                android:textColor="#a0a2a1"
-                android:letterSpacing="0.08"
-                android:gravity="center"
-                android:paddingTop="10dp"
-                android:paddingBottom="4dp" />
+        <!-- Body -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:background="@color/mib_receipt_bg">
 
             <TextView
                 android:id="@+id/tvAmount"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="34sp"
-                android:textColor="#f14f0f"
+                android:textSize="24sp"
+                android:textStyle="bold"
+                android:textColor="@color/mib_receipt_amount"
                 android:gravity="center"
-                android:paddingBottom="10dp" />
+                android:paddingTop="14dp" />
 
-            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="#CAC4D0" android:layout_marginHorizontal="20dp" />
+            <TextView
+                android:id="@+id/tvStatus"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Success"
+                android:textSize="14sp"
+                android:textStyle="bold"
+                android:textColor="@color/mib_receipt_amount"
+                android:gravity="center"
+                android:paddingBottom="6dp" />
 
-            <!-- Reference # -->
+            <!-- Transaction # -->
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingHorizontal="20dp" android:paddingVertical="11dp">
-                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Reference #" android:textSize="15sp" android:textColor="#a0a2a1" />
-                <View android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" />
-                <TextView android:id="@+id/tvReferenceNo" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="15sp" android:textColor="#565656" />
+                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:text="Transaction#" android:textSize="15sp" android:textColor="@color/mib_receipt_label" />
+                <TextView android:id="@+id/tvReferenceNo" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:gravity="end" android:textSize="15sp" android:textColor="@color/mib_receipt_value" />
             </LinearLayout>
-            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="#CAC4D0" android:layout_marginHorizontal="20dp" />
+            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="@color/mib_receipt_divider" android:layout_marginHorizontal="20dp" />
 
-            <!-- To Account -->
+            <!-- From (sender profile name) -->
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingHorizontal="20dp" android:paddingVertical="11dp">
-                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="To Account" android:textSize="15sp" android:textColor="#a0a2a1" />
-                <View android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" />
-                <TextView android:id="@+id/tvToAccount" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="15sp" android:textColor="#565656" />
+                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:text="From" android:textSize="15sp" android:textColor="@color/mib_receipt_label" />
+                <TextView android:id="@+id/tvFromName" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:gravity="end" android:textSize="15sp" android:textColor="@color/mib_receipt_value" />
             </LinearLayout>
-            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="#CAC4D0" android:layout_marginHorizontal="20dp" />
+            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="@color/mib_receipt_divider" android:layout_marginHorizontal="20dp" />
 
-            <!-- To Bank -->
+            <!-- To Account (recipient name + account number) -->
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingHorizontal="20dp" android:paddingVertical="11dp">
-                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="To Bank" android:textSize="15sp" android:textColor="#a0a2a1" />
-                <View android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" />
-                <TextView android:id="@+id/tvToBank" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="15sp" android:textColor="#565656" />
+                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:text="To Account" android:textSize="15sp" android:textColor="@color/mib_receipt_label" />
+                <TextView android:id="@+id/tvToAccount" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:gravity="end" android:textSize="15sp" android:textColor="@color/mib_receipt_value" />
             </LinearLayout>
-            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="#CAC4D0" android:layout_marginHorizontal="20dp" />
+            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="@color/mib_receipt_divider" android:layout_marginHorizontal="20dp" />
+
+            <!-- Bank -->
+            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingHorizontal="20dp" android:paddingVertical="11dp">
+                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:text="Bank" android:textSize="15sp" android:textColor="@color/mib_receipt_label" />
+                <TextView android:id="@+id/tvToBank" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:gravity="end" android:textSize="15sp" android:textColor="@color/mib_receipt_value" />
+            </LinearLayout>
+            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="@color/mib_receipt_divider" android:layout_marginHorizontal="20dp" />
+
+            <!-- Transaction Type -->
+            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingHorizontal="20dp" android:paddingVertical="11dp">
+                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:text="Transaction Type" android:textSize="15sp" android:textColor="@color/mib_receipt_label" />
+                <TextView android:id="@+id/tvTransactionType" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:gravity="end" android:textSize="15sp" android:textColor="@color/mib_receipt_value" />
+            </LinearLayout>
+            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="@color/mib_receipt_divider" android:layout_marginHorizontal="20dp" />
 
             <!-- Transaction Date -->
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingHorizontal="20dp" android:paddingVertical="11dp">
-                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Transaction Date" android:textSize="15sp" android:textColor="#a0a2a1" />
-                <View android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" />
-                <TextView android:id="@+id/tvTransactionDate" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="15sp" android:textColor="#565656" />
+                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:text="Transaction Date" android:textSize="15sp" android:textColor="@color/mib_receipt_label" />
+                <TextView android:id="@+id/tvTransactionDate" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:gravity="end" android:textSize="15sp" android:textColor="@color/mib_receipt_value" />
             </LinearLayout>
-            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="#CAC4D0" android:layout_marginHorizontal="20dp" />
+            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="@color/mib_receipt_divider" android:layout_marginHorizontal="20dp" />
 
-            <!-- Value Date -->
+            <!-- Processed Date -->
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingHorizontal="20dp" android:paddingVertical="11dp">
-                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Value Date" android:textSize="15sp" android:textColor="#a0a2a1" />
-                <View android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" />
-                <TextView android:id="@+id/tvValueDate" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="15sp" android:textColor="#565656" />
+                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:text="Processed Date" android:textSize="15sp" android:textColor="@color/mib_receipt_label" />
+                <TextView android:id="@+id/tvValueDate" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:gravity="end" android:textSize="15sp" android:textColor="@color/mib_receipt_value" />
             </LinearLayout>
-            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="#CAC4D0" android:layout_marginHorizontal="20dp" />
+            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="@color/mib_receipt_divider" android:layout_marginHorizontal="20dp" />
 
-            <!-- Purpose -->
+            <!-- Remarks -->
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingHorizontal="20dp" android:paddingVertical="11dp">
-                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Purpose" android:textSize="15sp" android:textColor="#a0a2a1" />
-                <View android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" />
-                <TextView android:id="@+id/tvPurpose" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="15sp" android:textColor="#565656" />
+                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:text="Remarks" android:textSize="15sp" android:textColor="@color/mib_receipt_label" />
+                <TextView android:id="@+id/tvPurpose" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:gravity="end" android:textSize="15sp" android:textColor="@color/mib_receipt_value" />
             </LinearLayout>
 
             <!-- MIB footer -->
-            <View android:layout_width="match_parent" android:layout_height="1dp" android:background="#CAC4D0" android:layout_marginHorizontal="20dp" />
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -224,19 +201,10 @@
 
                 <ImageView
                     android:layout_width="wrap_content"
-                    android:layout_height="28dp"
-                    android:src="@drawable/mib_logo"
+                    android:layout_height="22dp"
+                    android:src="@drawable/mib_logo_full"
                     android:adjustViewBounds="true"
-                    android:contentDescription="@null" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:text="MALDIVES ISLAMIC BANK"
-                    android:textSize="13sp"
-                    android:textColor="#000000"
-                    android:letterSpacing="0.05" />
+                    android:contentDescription="Maldives Islamic Bank" />
 
             </LinearLayout>
 

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

@@ -109,7 +109,7 @@
                 android:layout_width="32dp"
                 android:layout_height="32dp"
                 android:layout_marginEnd="16dp"
-                android:src="@drawable/bml_icon"
+                android:src="@drawable/bml_logo_vector"
                 android:scaleType="fitCenter"
                 android:contentDescription="BML" />
 

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

@@ -282,6 +282,7 @@
             android:id="@+id/languageToggle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:baselineAligned="false"
             app:singleSelection="true"
             app:selectionRequired="true">
 
@@ -303,6 +304,34 @@
 
         </com.google.android.material.button.MaterialButtonToggleGroup>
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_receipts"
+            android:textAppearance="?attr/textAppearanceTitleMedium"
+            android:layout_marginTop="24dp"
+            android:layout_marginBottom="12dp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/settings_always_fullscreen_receipt"
+                android:textAppearance="?attr/textAppearanceBodyLarge" />
+
+            <com.google.android.material.materialswitch.MaterialSwitch
+                android:id="@+id/switchFullscreenReceipt"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
+
     </LinearLayout>
 
 </ScrollView>

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

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Live TOTP preview card, shared by the sign-in screen and the OTP screen's "Update seed" dialog -->
+<com.google.android.material.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:visibility="invisible"
+    android:clickable="true"
+    android:focusable="true"
+    app:cardBackgroundColor="?attr/colorSecondaryContainer"
+    app:cardCornerRadius="12dp"
+    app:cardElevation="0dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingHorizontal="16dp"
+        android:paddingVertical="12dp"
+        android:gravity="center_vertical">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Current OTP"
+                android:textAppearance="?attr/textAppearanceLabelSmall"
+                android:textColor="?attr/colorOnSecondaryContainer" />
+
+            <TextView
+                android:id="@+id/tvOtpCode"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?attr/textAppearanceHeadlineSmall"
+                android:textColor="?attr/colorOnSecondaryContainer"
+                android:letterSpacing="0.15"
+                android:fontFamily="monospace" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:orientation="vertical"
+            android:gravity="end"
+            android:alpha="0.7">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Next"
+                android:textAppearance="?attr/textAppearanceLabelSmall"
+                android:textColor="?attr/colorOnSecondaryContainer" />
+
+            <TextView
+                android:id="@+id/tvNextOtpCode"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?attr/textAppearanceTitleMedium"
+                android:textColor="?attr/colorOnSecondaryContainer"
+                android:letterSpacing="0.1"
+                android:fontFamily="monospace" />
+
+        </LinearLayout>
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            android:id="@+id/otpTimer"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            app:indicatorSize="32dp"
+            app:trackThickness="3dp"
+            app:indicatorColor="?attr/colorOnSecondaryContainer"
+            app:trackColor="?attr/colorSecondaryContainer"
+            android:indeterminate="false" />
+
+    </LinearLayout>
+</com.google.android.material.card.MaterialCardView>

app/src/main/res/values-night/colors.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- BML receipt — dark mode -->
+    <color name="bml_receipt_bg">#191A1C</color>
+    <color name="bml_receipt_message">#DEDEE0</color>
+    <color name="bml_receipt_amount">#DEDEE0</color>
+    <color name="bml_receipt_label">#DEDEE0</color>
+    <color name="bml_receipt_footer">#000000</color>
+    <color name="bml_receipt_divider">#3D3E40</color>
+    <color name="bml_receipt_bottom_divider">#1E1F21</color>
+
+    <!-- MIB receipt — dark mode -->
+    <color name="mib_receipt_bg">#1A1A3C</color>
+    <color name="mib_receipt_label">#FFFFFF</color>
+    <color name="mib_receipt_value">#FFFFFF</color>
+    <color name="mib_receipt_divider">#33335C</color>
+    <color name="mib_receipt_footer_text">#FFFFFF</color>
+    <color name="mib_receipt_close_ring">#000000</color>
+</resources>

app/src/main/res/values/colors.xml

@@ -5,4 +5,24 @@
     <color name="seed_secondary">#9AD141</color>
     <color name="color_unpaid">#E85D04</color>
     <color name="ic_logo_background">#E8B547</color>
+
+    <!-- BML receipt (dark variants in values-night/colors.xml) -->
+    <color name="bml_receipt_bg">#FFFFFF</color>
+    <color name="bml_receipt_message">#2D2D2D</color>
+    <color name="bml_receipt_amount">#242424</color>
+    <color name="bml_receipt_label">#000000</color>
+    <color name="bml_receipt_footer">#F5F5F5</color>
+    <color name="bml_receipt_divider">#E9E9E9</color>
+    <color name="bml_receipt_bottom_divider">#EBEBEB</color>
+    <color name="bml_red">#E21B23</color>
+
+    <!-- MIB receipt (dark variants in values-night/colors.xml) -->
+    <color name="mib_receipt_bg">#FFFFFF</color>
+    <color name="mib_receipt_label">#000000</color>
+    <color name="mib_receipt_value">#000000</color>
+    <color name="mib_receipt_divider">#CAC4D0</color>
+    <color name="mib_receipt_footer_text">#000000</color>
+    <color name="mib_receipt_amount">#1EA833</color>
+    <color name="mib_receipt_close_ring">#FFFFFF</color>
+    <color name="mib_blue">#006FFC</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -129,7 +129,6 @@
     <string name="paymvqr_save_failed">Failed to save image</string>
     <string name="paymvqr_include_phone">Include phone number</string>
     <string name="paymvqr_reference_hint">Reference (optional)</string>
-    <string name="paymvqr_reference_default">PayMV QR Transfer</string>
 
     <!-- Toolbar -->
     <string name="action_lock">Lock app</string>
@@ -160,6 +159,8 @@
     <string name="theme_dark">Dark</string>
     <string name="settings_pitch_black">Pitch Black</string>
     <string name="settings_accent_color">Accent Color</string>
+    <string name="settings_receipts">Receipts</string>
+    <string name="settings_always_fullscreen_receipt">Always show full screen receipt</string>
     <string name="accent_blue">Blue</string>
     <string name="accent_orange">Red</string>
     <string name="accent_green">Green</string>
@@ -297,6 +298,7 @@
     <!-- BML QR Pay -->
 <string name="bml_qr_looking_up">Looking up merchant…</string>
     <string name="bml_qr_lookup_failed">Could not load merchant details</string>
+    <string name="transfer_bml_txn_lookup_failed">Could not load BML payment for this transaction ID</string>
     <string name="bml_qr_payment_success">Payment Successful</string>
     <string name="bml_qr_select_account">Select a BML account to pay from</string>