keep transfer form in cache (no reset on page change

Reviewed-on: shihaam/thijooree#5

.gitea/workflows/build-apk.yml

@@ -87,3 +87,24 @@ jobs:
             --data-binary "@${ASSET_PATH}"
 
           echo "Uploaded asset: $ASSET_NAME"
+
+      - name: Send APK to Telegram
+        env:
+          TG_BOT_TOKEN: ${{ secrets.TG_BOT_TOKEN }}
+          TG_CHAT_ID: ${{ vars.TG_CHAT_ID }}
+        run: |
+          if [ -z "$TG_BOT_TOKEN" ] || [ -z "$TG_CHAT_ID" ]; then
+            echo "TG_BOT_TOKEN or TG_CHAT_ID not set, skipping Telegram upload."
+            exit 0
+          fi
+
+          APP_NAME="${{ gitea.repository }}"
+          APP_NAME="${APP_NAME##*/}"
+          TAG="${{ gitea.ref_name }}"
+          ASSET_PATH=".build/release/release/${APP_NAME}-${TAG}.apk"
+          CAPTION="${APP_NAME} ${TAG}"
+
+          curl -s -X POST "https://api.telegram.org/bot${TG_BOT_TOKEN}/sendDocument" \
+            -F "chat_id=${TG_CHAT_ID}" \
+            -F "document=@${ASSET_PATH}" \
+            -F "caption=${CAPTION}"

.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-05-22T00:11:32.873305232Z">
+        <DropdownSelection timestamp="2026-05-28T18:41:19.777722821Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=683a9830" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=4254e2f" />
             </handle>
           </Target>
         </DropdownSelection>

README.md

@@ -14,12 +14,17 @@ A native Android client for Maldivian banking services. It is a pure client: req
 - Existing accounts with MIB, BML, or Fahipay
 - Your TOTP seed (base32 secret from your authenticator app setup) for each bank
 
-## Download
-[Download latest APK](https://git.shihaam.dev/shihaam/ISODroid/releases/latest)
+## Download APK
+[Gitea Releases](https://git.shihaam.dev/shihaam/thijooree/releases)
+[Telegram Channel](https://t.me/s/thijooreeapks)
 
 ## Privacy
 
-No data ever leaves your device except the API calls to the banking services themselves. See the [security audit](docs/AI_SECURITY_CHECK.md) for a full list of every server the app connects to.
+No data ever leaves your device except the API calls to the banking services themselves. See the [security audit](docs/thijooree/AI_SECURITY_CHECK.md) for a full list of every server the app connects to.
+
+## Documentation
+
+API reverse-engineering notes and app internals are in [`docs/`](docs/README.md).
 
 ## Disclaimer
 

app/build.gradle.kts

@@ -11,8 +11,8 @@ android {
         applicationId = "sh.sar.basedbank"
         minSdk = 26
         targetSdk = 36
-        versionCode = 8
-        versionName = "1.0.9"
+        versionCode = 13
+        versionName = "1.0.14"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -27,6 +27,10 @@ android {
     }
 
     buildTypes {
+        debug {
+            applicationIdSuffix = ".debug"
+            versionNameSuffix = "-debug"
+        }
         release {
             signingConfig = signingConfigs.getByName("release")
             isMinifyEnabled = false
@@ -87,6 +91,9 @@ dependencies {
     // Biometric authentication
     implementation("androidx.biometric:biometric:1.1.0")
 
+    // Encrypted SharedPreferences (HCE token store)
+    implementation("androidx.security:security-crypto:1.1.0-alpha06")
+
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)

app/src/debug/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#CC0000"
+        android:pathData="M0,0h108v108h-108z" />
+</vector>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Thijooree Debug</string>
+</resources>

app/src/debug/res/xml/shortcuts.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <shortcut
+        android:shortcutId="transfer"
+        android:enabled="true"
+        android:icon="@drawable/ic_shortcut_transfer"
+        android:shortcutShortLabel="@string/transfer"
+        android:shortcutLongLabel="@string/transfer">
+        <intent
+            android:action="sh.sar.basedbank.OPEN_TRANSFER"
+            android:targetPackage="sh.sar.basedbank.debug"
+            android:targetClass="sh.sar.basedbank.MainActivity" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+
+    <shortcut
+        android:shortcutId="scan_qr"
+        android:enabled="true"
+        android:icon="@drawable/ic_shortcut_scan_qr"
+        android:shortcutShortLabel="@string/transfer_scan_qr"
+        android:shortcutLongLabel="@string/transfer_scan_qr">
+        <intent
+            android:action="sh.sar.basedbank.OPEN_SCAN_QR"
+            android:targetPackage="sh.sar.basedbank.debug"
+            android:targetClass="sh.sar.basedbank.MainActivity" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+
+    <shortcut
+        android:shortcutId="tap_to_pay"
+        android:enabled="true"
+        android:icon="@drawable/ic_shortcut_pay_card"
+        android:shortcutShortLabel="@string/card_pay_nfc"
+        android:shortcutLongLabel="@string/card_pay_nfc">
+        <intent
+            android:action="sh.sar.basedbank.TAP_TO_PAY"
+            android:targetPackage="sh.sar.basedbank.debug"
+            android:targetClass="sh.sar.basedbank.MainActivity" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+
+</shortcuts>

app/src/main/AndroidManifest.xml

@@ -7,6 +7,9 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.NFC" />
+
+    <uses-feature android:name="android.hardware.nfc.hce" android:required="false" />
 
     <application
         android:name=".BasedBankApp"
@@ -59,6 +62,39 @@
             android:exported="false"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name=".nfc.BmlTapToPayActivity"
+            android:exported="false"
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.BasedBank" />
+
+        <service
+            android:name=".nfc.BmlHostCardEmulatorService"
+            android:exported="true"
+            android:permission="android.permission.BIND_NFC_SERVICE">
+            <intent-filter>
+                <action android:name="android.nfc.cardemulation.action.HOST_APDU_SERVICE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data
+                android:name="android.nfc.cardemulation.host_apdu_service"
+                android:resource="@xml/bml_aid_list" />
+        </service>
+
+        <!-- Share-sheet alias: "Scan to Pay" receives shared images and decodes their QR code -->
+        <activity-alias
+            android:name=".ScanToPayActivity"
+            android:targetActivity=".MainActivity"
+            android:exported="true"
+            android:label="@string/transfer_scan_qr"
+            android:icon="@drawable/ic_qr_scan">
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
+        </activity-alias>
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"

app/src/main/java/sh/sar/basedbank/BasedBankApp.kt

@@ -115,7 +115,11 @@ class BasedBankApp : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        DynamicColors.applyToActivitiesIfAvailable(this)
+        // Only apply wallpaper-based dynamic colors in system theme mode.
+        // Light/dark modes use content-based accent colors applied per-activity via ThemeHelper.
+        DynamicColors.applyToActivitiesIfAvailable(this) { _, _ ->
+            getSharedPreferences("prefs", MODE_PRIVATE).getString("theme", "system") == "system"
+        }
 
         val theme = getSharedPreferences("prefs", MODE_PRIVATE).getString("theme", "system")
         AppCompatDelegate.setDefaultNightMode(when (theme) {

app/src/main/java/sh/sar/basedbank/LockActivity.kt

@@ -21,6 +21,7 @@ import kotlinx.coroutines.withContext
 import sh.sar.basedbank.databinding.ActivityLockBinding
 import sh.sar.basedbank.ui.home.HomeActivity
 import sh.sar.basedbank.util.CredentialStore
+import sh.sar.basedbank.util.ThemeHelper
 import sh.sar.basedbank.BasedBankApp
 import javax.crypto.SecretKeyFactory
 import javax.crypto.spec.PBEKeySpec
@@ -46,6 +47,7 @@ class LockActivity : AppCompatActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        ThemeHelper.applyAccent(this)
         super.onCreate(savedInstanceState)
         WindowCompat.setDecorFitsSystemWindows(window, false)
         binding = ActivityLockBinding.inflate(layoutInflater)
@@ -55,6 +57,9 @@ class LockActivity : AppCompatActivity() {
             isAppearanceLightStatusBars = isLight
             isAppearanceLightNavigationBars = isLight
         }
+        val ta = obtainStyledAttributes(intArrayOf(android.R.attr.colorBackground))
+        window.statusBarColor = ta.getColor(0, if (isLight) android.graphics.Color.WHITE else android.graphics.Color.BLACK)
+        ta.recycle()
         ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view, insets ->
             val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
             view.setPadding(bars.left, bars.top, bars.right, bars.bottom)
@@ -264,11 +269,22 @@ class LockActivity : AppCompatActivity() {
         if (intent.getBooleanExtra(EXTRA_RESUME, false)) {
             finish()
         } else {
+            val store = CredentialStore(this)
+            val hasCredentials = store.hasMibCredentials() || store.hasBmlCredentials() || store.hasFahipayCredentials()
+            if (!hasCredentials) {
+                startActivity(Intent(this, sh.sar.basedbank.ui.login.LoginActivity::class.java))
+                finish()
+                return
+            }
             val navDest = intent.getIntExtra("nav_destination", -1)
             val autoScan = intent.getBooleanExtra("auto_scan", false)
+            val autoTapMode = intent.getBooleanExtra("auto_tap_mode", false)
+            val shareQrText = intent.getStringExtra("share_qr_text")
             startActivity(Intent(this, HomeActivity::class.java).apply {
                 if (navDest != -1) putExtra("nav_destination", navDest)
                 if (autoScan) putExtra("auto_scan", true)
+                if (autoTapMode) putExtra("auto_tap_mode", true)
+                if (shareQrText != null) putExtra("share_qr_text", shareQrText)
             })
             finish()
         }

app/src/main/java/sh/sar/basedbank/MainActivity.kt

@@ -12,6 +12,28 @@ import sh.sar.basedbank.R
 
 class MainActivity : AppCompatActivity() {
 
+    private fun decodeQrFromSharedImage(uri: android.net.Uri): String? {
+        return try {
+            val bitmap = contentResolver.openInputStream(uri)?.use {
+                android.graphics.BitmapFactory.decodeStream(it)
+            } ?: return null
+            val opts = de.markusfisch.android.zxingcpp.ZxingCpp.ReaderOptions(
+                tryHarder = true, tryRotate = true, tryInvert = true,
+                tryDownscale = true, maxNumberOfSymbols = 1,
+                textMode = de.markusfisch.android.zxingcpp.ZxingCpp.TextMode.PLAIN
+            )
+            val result = (de.markusfisch.android.zxingcpp.ZxingCpp.readBitmap(
+                bitmap, 0, 0, bitmap.width, bitmap.height, 0,
+                opts.apply { binarizer = de.markusfisch.android.zxingcpp.ZxingCpp.Binarizer.LOCAL_AVERAGE }
+            ) ?: de.markusfisch.android.zxingcpp.ZxingCpp.readBitmap(
+                bitmap, 0, 0, bitmap.width, bitmap.height, 0,
+                opts.apply { binarizer = de.markusfisch.android.zxingcpp.ZxingCpp.Binarizer.GLOBAL_HISTOGRAM }
+            ))?.firstOrNull()?.text
+            bitmap.recycle()
+            result
+        } catch (_: Exception) { null }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -21,13 +43,26 @@ class MainActivity : AppCompatActivity() {
         val store = CredentialStore(this)
         val hasCredentials = store.hasMibCredentials() || store.hasBmlCredentials() || store.hasFahipayCredentials()
 
+        // Image shared via "Scan to Pay" — decode QR here while we still hold the URI permission
+        val shareQrText: String? = if (intent?.action == Intent.ACTION_SEND &&
+            intent.type?.startsWith("image/") == true) {
+            val uri: android.net.Uri? =
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU)
+                    intent.getParcelableExtra(Intent.EXTRA_STREAM, android.net.Uri::class.java)
+                else
+                    @Suppress("DEPRECATION") intent.getParcelableExtra(Intent.EXTRA_STREAM)
+            if (uri != null) decodeQrFromSharedImage(uri) else null
+        } else null
+
         val navDestination = when (intent?.action) {
             "sh.sar.basedbank.OPEN_TRANSFER"      -> R.id.nav_transfer
             "sh.sar.basedbank.OPEN_SCAN_QR"       -> R.id.nav_transfer
             "sh.sar.basedbank.OPEN_PAY_WITH_CARD" -> R.id.nav_pay_with_card
+            "sh.sar.basedbank.TAP_TO_PAY"         -> R.id.nav_pay_with_card
             else -> -1
         }
         val autoScan = intent?.action == "sh.sar.basedbank.OPEN_SCAN_QR"
+        val autoTapMode = intent?.action == "sh.sar.basedbank.TAP_TO_PAY"
 
         val target = when {
             !onboardingDone -> OnboardingActivity::class.java
@@ -43,6 +78,8 @@ class MainActivity : AppCompatActivity() {
         startActivity(Intent(this, target).apply {
             if (navDestination != -1) putExtra("nav_destination", navDestination)
             if (autoScan) putExtra("auto_scan", true)
+            if (autoTapMode) putExtra("auto_tap_mode", true)
+            if (shareQrText != null) putExtra("share_qr_text", shareQrText)
         })
         finish()
     }

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

@@ -82,6 +82,15 @@ data class BmlQrPayResult(
     val errorMessage: String = ""
 )
 
+data class BmlWalletToken(
+    val token: String,
+    val expiry: String,
+    val appCode: String,      // AID hex, e.g. "A0000000031010"
+    val serviceCode: String,
+    val data: String,
+    val validUntil: String    // "YYYY-MM-DD HH:mm:ss.SSS"
+)
+
 data class BmlForeignLimit(
     val type: String,
     val used: Double,

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

@@ -0,0 +1,79 @@
+package sh.sar.basedbank.api.bml
+
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.json.JSONArray
+import org.json.JSONObject
+
+class BmlTapToPayClient {
+
+    private val client = newBmlApiClient()
+
+    /**
+     * Fetches up to [quantity] single-use payment tokens for [cardId].
+     * [otp] is a TOTP code generated from the stored BML OTP seed.
+     *
+     * Flow:
+     *   1. POST → code 99 (OTP required) or 0 (direct, unlikely)
+     *   2. POST with channel=token → code 22 (OTP generated on BML side, but we use TOTP)
+     *   3. POST with otp=TOTP → code 0, payload = token list
+     */
+    fun fetchTokens(
+        session: BmlSession,
+        cardId: String,
+        otp: String,
+        quantity: Int = 3
+    ): List<BmlWalletToken> {
+        val url = "$BML_BASE_URL/api/mobile/walletpayments/gettoken"
+
+        // Step 1: initiate
+        val base = JSONObject().apply {
+            put("type", "track2")
+            put("cardid", cardId)
+            put("quantity", quantity)
+        }
+        val step1 = post(session, url, base)
+        if (step1.optInt("code") == 0) return parseTokens(step1.optJSONArray("payload"))
+        if (step1.optInt("code") != 99) throw Exception(step1.optString("message", "Token request failed"))
+
+        // Step 2: request OTP channel (triggers BML to validate we can use TOTP)
+        val body2 = JSONObject(base.toString()).apply { put("channel", "token") }
+        val step2 = post(session, url, body2)
+        if (step2.optInt("code") != 22) throw Exception(step2.optString("message", "OTP channel request failed"))
+
+        // Step 3: submit TOTP
+        val body3 = JSONObject(body2.toString()).apply { put("otp", otp) }
+        val step3 = post(session, url, body3)
+        if (step3.optInt("code") != 0) throw Exception(step3.optString("message", "Token fetch failed"))
+
+        return parseTokens(step3.optJSONArray("payload"))
+    }
+
+    private fun post(session: BmlSession, url: String, body: JSONObject): JSONObject {
+        val req = okhttp3.Request.Builder()
+            .url(url)
+            .post(body.toString().toRequestBody("application/json".toMediaType()))
+            .header("Authorization", "Bearer ${session.accessToken}")
+            .header("User-Agent", BML_USER_AGENT)
+            .header("x-app-version", BML_APP_VERSION)
+            .build()
+        return client.newCall(req).execute().use { resp ->
+            JSONObject(resp.body?.string() ?: throw Exception("Empty response"))
+        }
+    }
+
+    private fun parseTokens(arr: JSONArray?): List<BmlWalletToken> {
+        arr ?: return emptyList()
+        return (0 until arr.length()).map { i ->
+            val o = arr.getJSONObject(i)
+            BmlWalletToken(
+                token       = o.getString("token"),
+                expiry      = o.getString("expiry"),
+                appCode     = o.getString("app_code"),
+                serviceCode = o.getString("service_code"),
+                data        = o.optString("data", ""),
+                validUntil  = o.optString("valid_until", "")
+            )
+        }
+    }
+}

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

@@ -9,6 +9,7 @@ import org.json.JSONObject
 import java.security.MessageDigest
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
+import kotlin.math.abs
 import kotlin.random.Random
 
 class SessionExpiredException : Exception("MIB session expired")
@@ -168,7 +169,7 @@ class MibLoginFlow(private val credentialStore: CredentialStore) {
                                 accountTypeName  = a.optString("accountTypeName"),
                                 availableBalance = a.optString("availableBalance"),
                                 currentBalance   = a.optString("currentBalance"),
-                                blockedAmount    = a.optString("blockedAmount"),
+                                blockedAmount    = absBlockedAmount(a.optString("blockedAmount")),
                                 mvrBalance       = a.optString("mvrBalance"),
                                 statusDesc       = a.optString("statusDesc"),
                                 profileImageHash = profile.customerImage,
@@ -188,6 +189,13 @@ class MibLoginFlow(private val credentialStore: CredentialStore) {
 
     // ─── Helpers ─────────────────────────────────────────────────────────────
 
+    /** MIB returns blockedAmount as a signed decimal where negative = funds held.
+     *  Normalize to a positive magnitude so downstream code can treat it uniformly. */
+    private fun absBlockedAmount(raw: String): String {
+        val v = raw.toDoubleOrNull() ?: return raw
+        return "%.2f".format(abs(v))
+    }
+
     private fun initialKeyExchange(
         appId: String, encKey: String, sfunc: String, key2: String? = null
     ): Pair<MibSession, String> {
@@ -325,7 +333,7 @@ class MibLoginFlow(private val credentialStore: CredentialStore) {
                         accountTypeName = a.optString("accountTypeName"),
                         availableBalance = a.optString("availableBalance"),
                         currentBalance = a.optString("currentBalance"),
-                        blockedAmount = a.optString("blockedAmount"),
+                        blockedAmount = absBlockedAmount(a.optString("blockedAmount")),
                         mvrBalance = a.optString("mvrBalance"),
                         statusDesc = a.optString("statusDesc"),
                         profileImageHash = profile.customerImage,

app/src/main/java/sh/sar/basedbank/nfc/BmlHostCardEmulatorService.kt

@@ -0,0 +1,185 @@
+package sh.sar.basedbank.nfc
+
+import android.content.Intent
+import android.nfc.cardemulation.HostApduService
+import android.os.Bundle
+import android.util.Log
+import sh.sar.basedbank.api.bml.BmlWalletToken
+
+/**
+ * HCE service that emulates a BML contactless payment card.
+ *
+ * Implements the minimal EMV mag-stripe contactless flow:
+ *   SELECT PPSE → SELECT AID → GET PROCESSING OPTIONS → READ RECORD
+ *
+ * Each BmlWalletToken is single-use and is set via [setToken] before tapping.
+ * After READ RECORD is sent the [onTransactionComplete] callback fires.
+ */
+class BmlHostCardEmulatorService : HostApduService() {
+
+    private var gpoSent = false
+
+    override fun processCommandApdu(commandApdu: ByteArray?, extras: Bundle?): ByteArray {
+        if (commandApdu == null) return SW_UNKNOWN_ERROR
+        val apdu = Apdu(commandApdu)
+        if (apdu.isError) return apdu.errorResponse()
+
+        return when (apdu.ins) {
+            INS_SELECT -> handleSelect(apdu)
+            INS_GPO    -> handleGpo()
+            INS_READ   -> handleReadRecord()
+            else       -> SW_INS_NOT_SUPPORTED
+        }
+    }
+
+    override fun onDeactivated(reason: Int) {
+        if (!gpoSent) onTransactionComplete?.invoke(false)
+        gpoSent = false
+    }
+
+    // ── APDU handlers ──────────────────────────────────────────────────────────
+
+    private fun handleSelect(apdu: Apdu): ByteArray {
+        val data = apdu.data ?: return SW_UNKNOWN_ERROR
+
+        if (data.contentEquals(PPSE_BYTES)) {
+            val token = activeToken ?: run { launchPromptActivity(); return SW_UNKNOWN_ERROR }
+            return hexToBytes(buildSelectPpseResponse(token.appCode, applicationLabel(token.appCode), "01"))
+        }
+
+        val token = activeToken ?: return SW_UNKNOWN_ERROR
+        return if (data.contentEquals(hexToBytes(token.appCode))) {
+            hexToBytes(buildSelectAidResponse(token.appCode, applicationLabel(token.appCode)))
+        } else {
+            SW_UNKNOWN_ERROR
+        }
+    }
+
+    private fun launchPromptActivity() {
+        val intent = Intent(applicationContext, BmlTapToPayActivity::class.java).apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        }
+        startActivity(intent)
+    }
+
+    private fun handleGpo(): ByteArray {
+        gpoSent = true
+        // AIP=0080 (mag-stripe mode), AFL=08010100 (SFI=1, record 1-1, offline 0)
+        val miscData = "008008010100"
+        val body = tlv("80", miscData)
+        return hexToBytes(body + SW_OK_HEX)
+    }
+
+    private fun handleReadRecord(): ByteArray {
+        val token = activeToken ?: return SW_UNKNOWN_ERROR
+        val track2 = buildTrack2(token)
+        val body = tlv("70", tlv("57", track2))
+        val response = hexToBytes(body + SW_OK_HEX)
+        onTransactionComplete?.invoke(true)
+        return response
+    }
+
+    // ── TLV / APDU response builders ───────────────────────────────────────────
+
+    private fun buildSelectPpseResponse(aid: String, label: String, priority: String): String {
+        val priorityTlv  = tlv("87", priority)                  // tag 87
+        val aidTlv       = tlv("4F", aid)                       // tag 4F  (ADF Name)
+        val appEntry     = tlv("61", aidTlv + priorityTlv)       // tag 61
+        val ppseTlv      = tlv("84", PPSE_HEX)                  // tag 84  (DF Name)
+        val inner        = tlv("BF0C", appEntry)                 // tag BF0C
+        val propTemplate = tlv("A5", inner)                      // tag A5
+        val fci          = tlv("6F", ppseTlv + propTemplate)     // tag 6F
+        return fci + SW_OK_HEX
+    }
+
+    private fun buildSelectAidResponse(aid: String, label: String): String {
+        val aidTlv      = tlv("84", aid)                                        // tag 84
+        val labelTlv    = tlv("50", asciiToHex(label))                          // tag 50
+        val pdolTlv     = tlv("9F38", "9F6602")                                 // PDOL: TTQ 2 bytes
+        val propTemplate = tlv("A5", labelTlv + pdolTlv)                         // tag A5
+        val fci         = tlv("6F", aidTlv + propTemplate)                      // tag 6F
+        return fci + SW_OK_HEX
+    }
+
+    private fun buildTrack2(token: BmlWalletToken): String {
+        var t2 = "${token.token}D${token.expiry}${token.serviceCode}${token.data}"
+        if (t2.length % 2 != 0) t2 += "F"
+        return t2
+    }
+
+    // ── Helpers ─────────────────────────────────────────────────────────────────
+
+    /** Build BER-TLV: tag (hex string, 1 or 2 bytes) + DER length + data (hex string). */
+    private fun tlv(tagHex: String, dataHex: String): String {
+        val lenBytes = dataHex.length / 2
+        val lenHex = when {
+            lenBytes <= 0x7F -> lenBytes.toHexByte()
+            lenBytes <= 0xFF -> "81" + lenBytes.toHexByte()
+            else             -> "82" + (lenBytes shr 8).toHexByte() + (lenBytes and 0xFF).toHexByte()
+        }
+        return tagHex + lenHex + dataHex
+    }
+
+    private fun Int.toHexByte(): String = toString(16).padStart(2, '0').uppercase()
+
+    private fun asciiToHex(s: String): String =
+        s.toByteArray(Charsets.US_ASCII).joinToString("") { "%02X".format(it) }
+
+    private fun hexToBytes(hex: String): ByteArray {
+        val s = hex.uppercase()
+        return ByteArray(s.length / 2) { i ->
+            s.substring(i * 2, i * 2 + 2).toInt(16).toByte()
+        }
+    }
+
+    // ── APDU parser ─────────────────────────────────────────────────────────────
+
+    private inner class Apdu(raw: ByteArray) {
+        val isError: Boolean
+        val ins: Int
+        val data: ByteArray?
+
+        init {
+            if (raw.size < 5) {
+                isError = true; ins = -1; data = null
+            } else {
+                isError = false
+                ins = raw[1].toInt() and 0xFF
+                val lc = if (raw.size > 4) raw[4].toInt() and 0xFF else 0
+                data = if (lc > 0 && raw.size >= 5 + lc) raw.copyOfRange(5, 5 + lc) else null
+            }
+        }
+
+        fun errorResponse() = SW_UNKNOWN_ERROR
+    }
+
+    companion object {
+        private const val TAG = "BmlHCE"
+
+        private const val INS_SELECT = 0xA4
+        private const val INS_GPO    = 0xA8
+        private const val INS_READ   = 0xB2
+
+        private val PPSE_HEX   = "325041592E5359532E4444463031"   // "2PAY.SYS.DDF01"
+        private val PPSE_BYTES = byteArrayOf(
+            0x32,0x50,0x41,0x59,0x2E,0x53,0x59,0x53,0x2E,0x44,0x44,0x46,0x30,0x31
+        )
+
+        private const val SW_OK_HEX          = "9000"
+        private val SW_UNKNOWN_ERROR         = byteArrayOf(0x6F.toByte(), 0x00.toByte())
+        private val SW_INS_NOT_SUPPORTED     = byteArrayOf(0x6D.toByte(), 0x00.toByte())
+
+        @Volatile var activeToken: BmlWalletToken? = null
+        @Volatile var onTransactionComplete: ((success: Boolean) -> Unit)? = null
+
+        fun setToken(token: BmlWalletToken) { activeToken = token }
+        fun clearToken() { activeToken = null }
+
+        fun applicationLabel(aidHex: String): String = when {
+            aidHex.startsWith("A0000000031010", ignoreCase = true) -> "VISA"
+            aidHex.startsWith("A0000000041010", ignoreCase = true) -> "MASTERCARD"
+            aidHex.startsWith("A000000025",     ignoreCase = true) -> "AMEX"
+            else -> "BML"
+        }
+    }
+}

app/src/main/java/sh/sar/basedbank/nfc/BmlTapToPayActivity.kt

@@ -0,0 +1,20 @@
+package sh.sar.basedbank.nfc
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import sh.sar.basedbank.MainActivity
+
+/**
+ * Fallback entry point — redirects to MainActivity which routes to the in-app tap-to-pay screen.
+ */
+class BmlTapToPayActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        startActivity(Intent(this, MainActivity::class.java).apply {
+            action = "sh.sar.basedbank.TAP_TO_PAY"
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        })
+        finish()
+    }
+}

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

@@ -37,7 +37,12 @@ class AccountHistoryAdapter(
     var onImageNeeded: ((counterpartyName: String) -> Unit)? = null
     var onIconUrlNeeded: ((url: String) -> Unit)? = null
     var onTransferClick: ((BankAccount) -> Unit)? = null
+    var onDefaultToggle: ((Boolean) -> Unit)? = null
     private var hideAmounts: Boolean = false
+    var showDefaultToggle: Boolean = false
+        set(value) { if (field == value) return; field = value; notifyItemChanged(0) }
+    var isDefaultAccount: Boolean = false
+        set(value) { if (field == value) return; field = value; notifyItemChanged(0) }
 
     fun setHideAmounts(hide: Boolean) {
         if (hideAmounts == hide) return
@@ -174,6 +179,20 @@ class AccountHistoryAdapter(
                 b.llHeaderBlocked.visibility = View.GONE
             }
             b.btnHeaderTransfer.setOnClickListener { onTransferClick?.invoke(account) }
+
+            if (showDefaultToggle) {
+                b.dividerDefaultAccount.visibility = View.VISIBLE
+                b.llDefaultAccountRow.visibility = View.VISIBLE
+                b.switchDefaultAccount.setOnCheckedChangeListener(null)
+                b.switchDefaultAccount.isChecked = isDefaultAccount
+                b.switchDefaultAccount.setOnCheckedChangeListener { _, checked ->
+                    isDefaultAccount = checked
+                    onDefaultToggle?.invoke(checked)
+                }
+            } else {
+                b.dividerDefaultAccount.visibility = View.GONE
+                b.llDefaultAccountRow.visibility = View.GONE
+            }
         }
     }
 

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

@@ -29,7 +29,9 @@ import sh.sar.basedbank.api.models.BankTransaction
 import sh.sar.basedbank.api.mib.TransactionCache
 import sh.sar.basedbank.databinding.FragmentAccountHistoryBinding
 import sh.sar.basedbank.util.AccountHistoryParser
+import sh.sar.basedbank.util.AccountListParser
 import sh.sar.basedbank.util.ContactImageCache
+import sh.sar.basedbank.util.CredentialStore
 import sh.sar.basedbank.util.HistoryFetcher
 import sh.sar.basedbank.util.MerchantIconCache
 
@@ -80,6 +82,23 @@ class AccountHistoryFragment : Fragment() {
         }
         adapter.setHideAmounts(viewModel.hideAmounts.value ?: false)
         viewModel.hideAmounts.observe(viewLifecycleOwner) { adapter.setHideAmounts(it) }
+
+        // Show default account toggle only for non-card accounts
+        val isCard = AccountListParser.from(account)?.isCard ?: false
+        if (!isCard) {
+            val store = CredentialStore(requireContext())
+            adapter.showDefaultToggle = true
+            adapter.isDefaultAccount = store.getDefaultAccountNumber() == account.accountNumber
+            adapter.onDefaultToggle = { isChecked ->
+                if (isChecked) {
+                    store.setDefaultAccountNumber(account.accountNumber)
+                } else {
+                    if (store.getDefaultAccountNumber() == account.accountNumber) {
+                        store.setDefaultAccountNumber(null)
+                    }
+                }
+            }
+        }
         binding.recyclerView.layoutManager = LinearLayoutManager(requireContext())
         binding.recyclerView.adapter = adapter
 
@@ -131,7 +150,12 @@ class AccountHistoryFragment : Fragment() {
 
     override fun onResume() {
         super.onResume()
-        if (::account.isInitialized) requireActivity().title = account.accountBriefName
+        if (::account.isInitialized) {
+            requireActivity().title = account.accountBriefName
+            if (adapter.showDefaultToggle) {
+                adapter.isDefaultAccount = CredentialStore(requireContext()).getDefaultAccountNumber() == account.accountNumber
+            }
+        }
     }
 
     private fun filterAndDisplay() {

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

@@ -125,6 +125,14 @@ class AccountsAdapter(
             binding.tvAccountNumber.text = display.number
             binding.tvAccountType.text   = display.typeLabel
             binding.tvBalance.text       = if (hideAmounts) maskAmount(display.balance) else display.balance
+            val blocked = display.blockedBalance
+            if (blocked != null) {
+                val shown = if (hideAmounts) maskAmount(blocked) else blocked
+                binding.tvBlocked.text       = binding.root.context.getString(R.string.account_blocked_label, shown)
+                binding.tvBlocked.visibility = View.VISIBLE
+            } else {
+                binding.tvBlocked.visibility = View.GONE
+            }
             binding.btnTransfer.setOnClickListener { onTransferClick?.invoke(account) }
             binding.root.setOnClickListener { onAccountClick(account) }
             binding.root.setOnLongClickListener {

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

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

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

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

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

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

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

@@ -4,13 +4,13 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.result.contract.ActivityResultContracts
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
@@ -25,6 +25,8 @@ import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.api.mib.MibCard
 import sh.sar.basedbank.api.mib.MibFinanceDeal
 import sh.sar.basedbank.util.bmlapi.BmlCardParser
+import sh.sar.basedbank.util.CredentialStore
+import sh.sar.basedbank.util.PaymvQrParser
 import kotlin.math.abs
 import sh.sar.basedbank.databinding.FragmentDashboardBinding
 import sh.sar.basedbank.databinding.ItemForeignLimitBinding
@@ -34,21 +36,35 @@ class DashboardFragment : Fragment() {
     private var _binding: FragmentDashboardBinding? = null
     private val binding get() = _binding!!
     private val viewModel: HomeViewModel by activityViewModels()
-
-    private var pendingQrAccountNumber: String? = null
+    private var pendingQrCardNumber: String? = 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
-        if (raw.startsWith("https://ebanking.bankofmaldives.com.mv/qrpay/") ||
-            raw.startsWith("https://pay.bml.com.mv/app/")) {
+        val cardNumber = pendingQrCardNumber.also { pendingQrCardNumber = null }
+        val bmlUrl = PaymvQrParser.extractBmlGatewayUrl(raw)
+        if (raw.startsWith("https://ebanking.bankofmaldives.com.mv/qrpay/") || bmlUrl != null) {
             (requireActivity() as HomeActivity).navigateTo(
-                R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(raw, pendingQrAccountNumber)
+                R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(bmlUrl ?: raw, cardNumber)
             )
         } else {
-            Toast.makeText(requireContext(), R.string.transfer_qr_invalid, Toast.LENGTH_SHORT).show()
+            val qr = PaymvQrParser.parse(raw)
+            if (qr?.accountNumber != null) {
+                Toast.makeText(requireContext(), R.string.card_qr_paymv_unsupported, Toast.LENGTH_SHORT).show()
+                val defaultFrom = CredentialStore(requireContext()).getDefaultAccountNumber()
+                (requireActivity() as HomeActivity).navigateTo(
+                    R.id.nav_transfer, TransferFragment.newInstanceFromQr(
+                        accountNumber     = qr.accountNumber,
+                        displayName       = qr.merchantName ?: qr.accountNumber,
+                        amount            = qr.amount,
+                        remarks           = qr.purpose,
+                        fromAccountNumber = defaultFrom
+                    )
+                )
+            } else {
+                Toast.makeText(requireContext(), R.string.transfer_qr_invalid, Toast.LENGTH_SHORT).show()
+            }
         }
-        pendingQrAccountNumber = null
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
@@ -57,14 +73,24 @@ class DashboardFragment : Fragment() {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        viewModel.accounts.observe(viewLifecycleOwner) { updateBalances(it) }
-        viewModel.financing.observe(viewLifecycleOwner) { updatePendingFinances() }
-        viewModel.bmlLoanDetails.observe(viewLifecycleOwner) { updatePendingFinances() }
+        viewModel.accounts.observe(viewLifecycleOwner) {
+            updateBalances(it)
+            updateAttentionRow()
+        }
+        viewModel.financing.observe(viewLifecycleOwner) {
+            updatePendingFinances()
+            updateAttentionRow()
+        }
+        viewModel.bmlLoanDetails.observe(viewLifecycleOwner) {
+            updatePendingFinances()
+            updateAttentionRow()
+        }
         viewModel.bmlLimits.observe(viewLifecycleOwner) { updateForeignLimits(it) }
         viewModel.hideAmounts.observe(viewLifecycleOwner) {
             updateBalances(viewModel.accounts.value ?: emptyList())
             updatePendingFinances()
             updateForeignLimits(viewModel.bmlLimits.value ?: emptyList())
+            updateAttentionRow()
         }
 
         binding.swipeRefresh.setOnRefreshListener {
@@ -76,19 +102,32 @@ class DashboardFragment : Fragment() {
             (activity as? HomeActivity)?.navigateTo(R.id.nav_finances)
         }
 
+        binding.cardOverdue.setOnClickListener {
+            (activity as? HomeActivity)?.navigateTo(R.id.nav_finances)
+        }
+
         val cardAdapter = DashboardCardAdapter()
         binding.rvCards.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
         binding.rvCards.adapter = cardAdapter
         LinearSnapHelper().attachToRecyclerView(binding.rvCards)
 
         val updateCardList = {
-            val mibItems = (viewModel.mibCards.value ?: emptyList()).map { CardItem.Mib(it) }
+            val credStore = CredentialStore(requireContext())
+            val hidden = credStore.getHiddenDashboardCardNumbers()
+            val mibItems = (viewModel.mibCards.value ?: emptyList())
+                .filter { !hidden.contains(it.maskedCardNumber) }
+                .map { CardItem.Mib(it) }
             val bmlItems = (viewModel.accounts.value ?: emptyList())
-                .filter { (it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT" || it.profileType == "BML_DEBIT") && it.statusDesc.equals("Active", ignoreCase = true) }
+                .filter { (it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT" || it.profileType == "BML_DEBIT") && it.statusDesc.equals("Active", ignoreCase = true) && !hidden.contains(it.accountNumber) }
                 .map { CardItem.Bml(it) }
             val all = mibItems + bmlItems
-            cardAdapter.update(all)
-            binding.sectionCards.visibility = if (all.isNotEmpty()) View.VISIBLE else View.GONE
+            val defaultNum = credStore.getDefaultCardAccountNumber()
+            val ordered = if (defaultNum != null) {
+                val def = all.filterIsInstance<CardItem.Bml>().firstOrNull { it.account.accountNumber == defaultNum }
+                if (def != null) listOf(def) + all.filter { it !== def } else all
+            } else all
+            cardAdapter.update(ordered)
+            binding.sectionCards.visibility = if (ordered.isNotEmpty()) View.VISIBLE else View.GONE
         }
         viewModel.mibCards.observe(viewLifecycleOwner) { updateCardList() }
         viewModel.accounts.observe(viewLifecycleOwner) { updateCardList() }
@@ -106,12 +145,38 @@ class DashboardFragment : Fragment() {
 
     override fun onResume() {
         super.onResume()
-        requireActivity().title = getString(R.string.nav_dashboard)
+        val isBottom = requireContext().getSharedPreferences("prefs", Context.MODE_PRIVATE)
+            .getBoolean("bottom_nav", false)
+        if (isBottom) {
+            requireActivity().title = getString(R.string.app_name)
+            val size = (28 * resources.displayMetrics.density).toInt()
+            val gap = (8 * resources.displayMetrics.density).toInt()
+            val icon = requireContext().packageManager.getApplicationIcon(requireContext().packageName)
+            val bmp = android.graphics.Bitmap.createBitmap(size + gap, size, android.graphics.Bitmap.Config.ARGB_8888)
+            val canvas = android.graphics.Canvas(bmp)
+            icon.setBounds(0, 0, size, size)
+            icon.draw(canvas)
+            requireActivity().findViewById<com.google.android.material.appbar.MaterialToolbar>(R.id.toolbar).logo =
+                android.graphics.drawable.BitmapDrawable(resources, bmp)
+        } else {
+            requireActivity().title = getString(R.string.nav_dashboard)
+        }
         refreshQuickActions()
     }
 
+    override fun onPause() {
+        super.onPause()
+        requireActivity().findViewById<com.google.android.material.appbar.MaterialToolbar>(R.id.toolbar).logo = null
+    }
+
     private fun refreshQuickActions() {
         val prefs = requireContext().getSharedPreferences("prefs", Context.MODE_PRIVATE)
+        val isBottom = prefs.getBoolean("bottom_nav", false)
+        if (isBottom) {
+            binding.buttonBar.visibility = View.GONE
+            return
+        }
+        binding.buttonBar.visibility = View.VISIBLE
         val ids = NavCustomization.getQuickActions(prefs)
         listOf(binding.btnQuickAction1, binding.btnQuickAction2).forEachIndexed { i, btn ->
             val def = NavCustomization.ALL_SWAPPABLE.find { it.id == ids[i] }
@@ -244,6 +309,52 @@ class DashboardFragment : Fragment() {
         }
     }
 
+    private fun updateAttentionRow() {
+        val hide = viewModel.hideAmounts.value ?: false
+        val accounts = viewModel.accounts.value ?: emptyList()
+
+        // Blocked: sum across CASA-style accounts (exclude cards and loans) per currency.
+        val blockedByCurrency = accounts
+            .filter { it.profileType != "BML_CREDIT" && it.profileType != "BML_PREPAID" && it.profileType != "BML_DEBIT" && it.profileType != "BML_LOAN" }
+            .mapNotNull { acc ->
+                val v = acc.blockedAmount.replace(",", "").toDoubleOrNull() ?: 0.0
+                if (v > 0.0) acc.currencyName.uppercase() to v else null
+            }
+            .groupBy({ it.first }, { it.second })
+            .mapValues { (_, vs) -> vs.sum() }
+
+        val blockedMvr = blockedByCurrency["MVR"] ?: 0.0
+        val blockedUsd = blockedByCurrency["USD"] ?: 0.0
+        val blockedTotal = blockedByCurrency.values.sum()
+
+        if (blockedMvr > 0.0) {
+            binding.tvBlockedMvr.text = if (hide) "MVR ••••••" else "MVR %,.2f".format(blockedMvr)
+            binding.cardBlockedMvr.visibility = View.VISIBLE
+        } else {
+            binding.cardBlockedMvr.visibility = View.GONE
+        }
+        if (blockedUsd > 0.0) {
+            binding.tvBlockedUsd.text = if (hide) "USD ••••••" else "USD %,.2f".format(blockedUsd)
+            binding.cardBlockedUsd.visibility = View.VISIBLE
+        } else {
+            binding.cardBlockedUsd.visibility = View.GONE
+        }
+        binding.rowBlocked.visibility = if (blockedTotal > 0.0) View.VISIBLE else View.GONE
+
+        // Overdue: MIB finance deals + BML loan details (assumed MVR — matches existing Pending Finances).
+        val mibOverdue = (viewModel.financing.value ?: emptyList()).sumOf { it.overdueAmount }
+        val bmlOverdue = (viewModel.bmlLoanDetails.value ?: emptyMap()).values.sumOf { it.overdueAmount }
+        val overdueTotal = mibOverdue + bmlOverdue
+        if (overdueTotal > 0.0) {
+            binding.tvOverdueTotal.text = if (hide) "MVR ••••••" else "MVR %,.2f".format(overdueTotal)
+            binding.cardOverdue.visibility = View.VISIBLE
+        } else {
+            binding.cardOverdue.visibility = View.GONE
+        }
+
+        binding.rowAttention.visibility = if (overdueTotal > 0.0) View.VISIBLE else View.GONE
+    }
+
     private fun updatePendingFinances() {
         val hide = viewModel.hideAmounts.value ?: false
         val mibTotal = (viewModel.financing.value ?: emptyList()).sumOf { it.outstandingAmount }
@@ -305,7 +416,7 @@ class DashboardFragment : Fragment() {
                     if (isMib) {
                         Toast.makeText(requireContext(), R.string.mib_qr_nfc_not_supported, Toast.LENGTH_SHORT).show()
                     } else {
-                        pendingQrAccountNumber = (item as CardItem.Bml).account.accountNumber
+                        pendingQrCardNumber = (item as CardItem.Bml).account.accountNumber
                         qrLauncher.launch(Intent(requireContext(), QrScannerActivity::class.java))
                     }
                 }
@@ -313,8 +424,15 @@ class DashboardFragment : Fragment() {
                 val nfcSupported = nfcAdapter != null
                 btnPayNfc.isEnabled = nfcSupported
                 btnPayNfc.setOnClickListener {
-                    val msg = if (isMib) R.string.mib_qr_nfc_not_supported else R.string.work_in_progress
-                    Toast.makeText(requireContext(), msg, Toast.LENGTH_SHORT).show()
+                    if (isMib) {
+                        Toast.makeText(requireContext(), R.string.mib_qr_nfc_not_supported, Toast.LENGTH_SHORT).show()
+                    } else {
+                        val accountNumber = (item as CardItem.Bml).account.accountNumber
+                        (requireActivity() as HomeActivity).navigateTo(
+                            R.id.nav_pay_with_card,
+                            CardsFragment.newInstanceWithAutoTapMode(accountNumber)
+                        )
+                    }
                 }
             }
         }

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

@@ -68,6 +68,7 @@ import sh.sar.basedbank.util.CredentialStore
 import sh.sar.basedbank.util.CardsCache
 import sh.sar.basedbank.util.FinancingCache
 import sh.sar.basedbank.util.ForeignLimitsCache
+import sh.sar.basedbank.util.ThemeHelper
 
 class HomeActivity : AppCompatActivity() {
 
@@ -75,6 +76,7 @@ class HomeActivity : AppCompatActivity() {
     private val viewModel: HomeViewModel by viewModels()
     private lateinit var toggle: ActionBarDrawerToggle
     private var suppressBottomNavCallback = false
+    private var cachedTransferFragment: TransferFragment? = null
 
     private var backPressedOnce = false
     private val backPressHandler = Handler(Looper.getMainLooper())
@@ -106,6 +108,7 @@ class HomeActivity : AppCompatActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        ThemeHelper.applyAccent(this)
         super.onCreate(savedInstanceState)
         WindowCompat.setDecorFitsSystemWindows(window, false)
         binding = ActivityHomeBinding.inflate(layoutInflater)
@@ -118,6 +121,9 @@ class HomeActivity : AppCompatActivity() {
             isAppearanceLightStatusBars = isLight
             isAppearanceLightNavigationBars = isLight
         }
+        val ta = obtainStyledAttributes(intArrayOf(android.R.attr.colorBackground))
+        window.statusBarColor = ta.getColor(0, if (isLight) android.graphics.Color.WHITE else android.graphics.Color.BLACK)
+        ta.recycle()
         // Auth guard: HomeActivity must only be reachable after LockActivity or fresh login.
         // Using loadSecurityHash() (EncryptedSharedPreferences) instead of plain prefs so
         // a rooted device cannot bypass this by editing security_method in plain prefs.
@@ -151,7 +157,7 @@ class HomeActivity : AppCompatActivity() {
                 R.id.nav_dashboard        -> DashboardFragment()
                 R.id.nav_accounts         -> AccountsFragment()
                 R.id.nav_contacts         -> ContactsFragment()
-                R.id.nav_transfer         -> TransferFragment()
+                R.id.nav_transfer         -> cachedTransferFragment ?: TransferFragment().also { cachedTransferFragment = it }
                 R.id.nav_pay_mv_qr        -> PayMvQrFragment()
                 R.id.nav_more             -> MoreFragment()
                 R.id.nav_activities       -> ActivitiesFragment()
@@ -232,14 +238,26 @@ class HomeActivity : AppCompatActivity() {
         if (savedInstanceState == null) {
             val navDest = intent.getIntExtra("nav_destination", -1)
             val autoScan = intent.getBooleanExtra("auto_scan", false)
-            if (navDest != -1) {
-                val fragment = if (autoScan && navDest == R.id.nav_transfer)
-                    TransferFragment.newInstanceWithAutoScan()
-                else null
-                navigateTo(navDest, fragment)
-            } else {
-                show(DashboardFragment())
-                binding.navigationView.setCheckedItem(R.id.nav_dashboard)
+            val autoTapMode = intent.getBooleanExtra("auto_tap_mode", false)
+            val shareQrText = intent.getStringExtra("share_qr_text")
+            when {
+                shareQrText != null -> {
+                    show(DashboardFragment())
+                    binding.navigationView.setCheckedItem(R.id.nav_dashboard)
+                    routeSharedQrText(shareQrText)
+                }
+                navDest != -1 -> {
+                    val fragment = when {
+                        autoScan && navDest == R.id.nav_transfer -> TransferFragment.newInstanceWithAutoScan()
+                        autoTapMode && navDest == R.id.nav_pay_with_card -> CardsFragment.newInstanceWithAutoTapMode()
+                        else -> null
+                    }
+                    navigateTo(navDest, fragment)
+                }
+                else -> {
+                    show(DashboardFragment())
+                    binding.navigationView.setCheckedItem(R.id.nav_dashboard)
+                }
             }
         }
 
@@ -250,6 +268,9 @@ class HomeActivity : AppCompatActivity() {
                     binding.drawerLayout.closeDrawers()
                     return
                 }
+                // Let CardsFragment handle back if in manage mode
+                val currentFrag = supportFragmentManager.findFragmentById(R.id.contentFrame)
+                if (currentFrag is CardsFragment && currentFrag.onBackPressed()) return
                 // Pop fragment back stack if there's anything on it (e.g. showWithBackStack)
                 if (supportFragmentManager.backStackEntryCount > 0) {
                     supportFragmentManager.popBackStack()
@@ -258,7 +279,6 @@ class HomeActivity : AppCompatActivity() {
                 // In bottom nav mode, pressing back navigates up the hierarchy
                 val isBottomNav = getSharedPreferences("prefs", MODE_PRIVATE).getBoolean("bottom_nav", false)
                 if (isBottomNav && binding.bottomNavigation.selectedItemId != R.id.nav_dashboard) {
-                    val currentFrag = supportFragmentManager.findFragmentById(R.id.contentFrame)
                     // Sub-page reached via More (e.g. Settings, Activities) — go back to More
                     if (binding.bottomNavigation.selectedItemId == R.id.nav_more && currentFrag !is MoreFragment) {
                         show(MoreFragment())
@@ -371,7 +391,7 @@ fun applyNavLabelVisibility() {
             R.id.nav_dashboard        -> DashboardFragment()
             R.id.nav_accounts         -> AccountsFragment()
             R.id.nav_contacts         -> ContactsFragment()
-            R.id.nav_transfer         -> TransferFragment()
+            R.id.nav_transfer         -> cachedTransferFragment ?: TransferFragment().also { cachedTransferFragment = it }
             R.id.nav_pay_mv_qr        -> PayMvQrFragment()
             R.id.nav_activities       -> ActivitiesFragment()
             R.id.nav_transfer_history -> TransferHistoryFragment()
@@ -426,6 +446,27 @@ fun applyNavLabelVisibility() {
             .commit()
     }
 
+    private fun routeSharedQrText(text: String) {
+        val store = CredentialStore(this)
+        val bmlUrl = sh.sar.basedbank.util.PaymvQrParser.extractBmlGatewayUrl(text)
+        if (text.startsWith("https://ebanking.bankofmaldives.com.mv/qrpay/") || bmlUrl != null) {
+            navigateTo(R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(bmlUrl ?: text, store.getDefaultCardAccountNumber()))
+            return
+        }
+        val qr = sh.sar.basedbank.util.PaymvQrParser.parse(text)
+        if (qr?.accountNumber != null) {
+            navigateTo(R.id.nav_transfer, TransferFragment.newInstanceFromQr(
+                accountNumber     = qr.accountNumber,
+                displayName       = qr.merchantName ?: qr.accountNumber,
+                amount            = qr.amount,
+                remarks           = qr.purpose,
+                fromAccountNumber = store.getDefaultAccountNumber()
+            ))
+        } else {
+            Toast.makeText(this, R.string.transfer_qr_invalid, Toast.LENGTH_SHORT).show()
+        }
+    }
+
     override fun onResume() {
         super.onResume()
         // Returning from LockActivity — refresh sessions since they may have expired.
@@ -512,9 +553,8 @@ fun applyNavLabelVisibility() {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.toolbar_menu, menu)
-        val eyeEnabled = getSharedPreferences("prefs", MODE_PRIVATE).getBoolean("hide_sensitive_info", false)
         val eyeItem = menu.findItem(R.id.action_hide_amounts)
-        eyeItem?.isVisible = eyeEnabled
+        eyeItem?.isVisible = true
         val hidden = viewModel.hideAmounts.value ?: false
         eyeItem?.setIcon(if (hidden) R.drawable.ic_visibility_off else R.drawable.ic_visibility)
         return true

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

@@ -1,9 +1,14 @@
 package sh.sar.basedbank.ui.home
 
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -42,6 +47,16 @@ class OtpFragment : Fragment() {
         override fun onBindViewHolder(holder: VH, position: Int) {
             holder.b.tvOtpLabel.text = entries[position].label
             update(holder.b, entries[position].seed)
+            holder.b.root.setOnClickListener {
+                val code = holder.b.tvOtpCode.text.toString().replace(" ", "")
+                if (code.isNotEmpty()) {
+                    val clipboard = it.context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+                    clipboard.setPrimaryClip(ClipData.newPlainText("OTP", code))
+                    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+                        Toast.makeText(it.context, "OTP copied", Toast.LENGTH_SHORT).show()
+                    }
+                }
+            }
         }
 
         fun tick() {

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

@@ -7,13 +7,10 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Environment
 import android.provider.MediaStore
-import android.app.Activity
-import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.FileProvider
 import androidx.core.view.ViewCompat
@@ -36,9 +33,9 @@ import sh.sar.basedbank.BasedBankApp
 import sh.sar.basedbank.R
 import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.databinding.FragmentPayMvQrBinding
+import sh.sar.basedbank.util.CredentialStore
 import sh.sar.basedbank.databinding.ItemAccountDropdownBinding
 import sh.sar.basedbank.util.AccountListParser
-import sh.sar.basedbank.util.PaymvQrParser
 import sh.sar.basedbank.util.bmlapi.BmlCardParser
 import sh.sar.basedbank.util.bmlapi.BmlDashboardParser
 import java.io.File
@@ -55,31 +52,6 @@ class PayMvQrFragment : Fragment() {
     private var generateJob: Job? = null
     private val dropdownProfileImageCache = mutableMapOf<String, Bitmap>()
 
-    private val qrLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-        if (result.resultCode != Activity.RESULT_OK) return@registerForActivityResult
-        val raw = result.data?.getStringExtra(QrScannerActivity.EXTRA_QR_CONTENT) ?: return@registerForActivityResult
-
-        // BML card/gateway QR — hand off to dedicated payment screen
-        if (raw.startsWith("https://ebanking.bankofmaldives.com.mv/qrpay/") ||
-            raw.startsWith("https://pay.bml.com.mv/app/")) {
-            (requireActivity() as HomeActivity).navigateTo(R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(raw))
-            return@registerForActivityResult
-        }
-
-        val qr = PaymvQrParser.parse(raw)
-        if (qr == null || qr.accountNumber == null) {
-            Toast.makeText(requireContext(), R.string.transfer_qr_invalid, Toast.LENGTH_SHORT).show()
-            return@registerForActivityResult
-        }
-        val activity = requireActivity() as HomeActivity
-        activity.navigateTo(R.id.nav_transfer, TransferFragment.newInstanceFromQr(
-            accountNumber = qr.accountNumber,
-            displayName   = qr.merchantName ?: qr.accountNumber,
-            amount        = qr.amount,
-            remarks       = qr.purpose
-        ))
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View {
@@ -98,19 +70,23 @@ class PayMvQrFragment : Fragment() {
         }
         setupDropdown()
         binding.etAmount.addTextChangedListener { scheduleGenerate() }
+        binding.etReference.addTextChangedListener { scheduleGenerate() }
+        binding.switchIncludePhone.setOnCheckedChangeListener { _, _ -> scheduleGenerate() }
         binding.btnShare.isEnabled = false
         binding.btnSave.isEnabled = false
         binding.btnShare.setOnClickListener { shareQr() }
         binding.btnSave.setOnClickListener { saveQr() }
         binding.btnScanQr.setOnClickListener {
-            qrLauncher.launch(Intent(requireContext(), QrScannerActivity::class.java))
+            (requireActivity() as HomeActivity).navigateTo(R.id.nav_transfer, TransferFragment.newInstanceWithAutoScan())
         }
     }
 
     private fun setupDropdown() {
         viewModel.accounts.observe(viewLifecycleOwner) { accounts ->
             val eligible = accounts.filter {
-                it.profileType != "BML_PREPAID" && it.profileType != "BML_CREDIT" && it.profileType != "BML_DEBIT" && it.profileType != "BML_LOAN"
+                it.profileType != "BML_PREPAID" && it.profileType != "BML_CREDIT" && it.profileType != "BML_DEBIT" && it.profileType != "BML_LOAN" &&
+                it.bank != "MIB" && // TODO: MIB does not support PayMV QR
+                !(it.bank == "BML" && it.currencyName.contains("USD", ignoreCase = true)) // TODO: BML USD not supported by MMA
             }
             val adapter = QrAccountAdapter(requireContext(), eligible)
             binding.actvAccount.setAdapter(adapter)
@@ -119,6 +95,20 @@ class PayMvQrFragment : Fragment() {
                 selectedAccount = picked
                 scheduleGenerate()
             }
+
+            // Auto-select default account if none is selected yet
+            if (selectedAccount == null) {
+                val defaultNum = CredentialStore(requireContext()).getDefaultAccountNumber()
+                if (defaultNum != null) {
+                    val defaultAcc = eligible.firstOrNull { it.accountNumber == defaultNum }
+                    if (defaultAcc != null) {
+                        selectedAccount = defaultAcc
+                        val prefix = if (defaultAcc.bank == "BML" && defaultAcc.profileName.isNotBlank()) "${defaultAcc.profileName} · " else ""
+                        binding.actvAccount.setText("$prefix${defaultAcc.accountBriefName}", false)
+                        scheduleGenerate()
+                    }
+                }
+            }
         }
     }
 
@@ -145,8 +135,28 @@ class PayMvQrFragment : Fragment() {
             ?.let { "%.2f".format(it) }
 
         val ctx = requireContext()
+        val includePhone = binding.switchIncludePhone.isChecked
+        val loginId = sh.sar.basedbank.util.ProfileImageStore.loginIdFromTag(account.loginTag)
+        val store = CredentialStore(ctx)
+        val mobile = if (includePhone) {
+            when (account.bank) {
+                "BML"     -> store.loadBmlUserProfile(loginId)?.mobile
+                "FAHIPAY" -> store.loadFahipayUserProfile(loginId)?.mobile
+                else      -> null
+            }?.let { m ->
+                when {
+                    m.startsWith("+") -> m
+                    m.length == 7     -> "+960$m"
+                    else              -> m
+                }
+            }
+        } else null
+
+        val purpose = binding.etReference.text?.toString()?.trim()
+            ?.takeIf { it.isNotBlank() } ?: getString(R.string.paymvqr_reference_default)
+
         val bmp = withContext(Dispatchers.Default) {
-            val payload = buildQrPayload(account.accountNumber, account.accountBriefName, acquirer, amountFormatted)
+            val payload = buildQrPayload(account.accountNumber, account.accountBriefName, acquirer, amountFormatted, mobile, purpose)
             renderQrCard(ctx, account, payload, amountFormatted)
         }
         if (_binding == null) return
@@ -164,7 +174,9 @@ class PayMvQrFragment : Fragment() {
         accountNumber: String,
         accountName: String,
         acquirer: String,
-        amountStr: String?
+        amountStr: String?,
+        mobile: String?,
+        purpose: String
     ): String {
         fun tlv(tag: String, value: String): String {
             val len = value.length
@@ -174,17 +186,30 @@ class PayMvQrFragment : Fragment() {
         val poi          = tlv("01", "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
         val sub03        = tlv("03", accountNumber)
+        val sub05        = if (!mobile.isNullOrBlank()) tlv("05", mobile) else ""
         val sub10        = tlv("10", "IPAY")
-        val merchantAcct = tlv("26", sub00 + sub01 + sub03 + sub10)
+        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 country      = tlv("58", "MV")
         val name         = tlv("59", accountName.take(25))
-        val prefix       = format + poi + merchantAcct + currency + amountTLV + country + name + "6304"
+        val ref          = generateReference()
+        val addlData     = tlv("62", tlv("05", ref) + tlv("08", purpose))
+        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"
         return prefix + crc16(prefix)
     }
 
+    private fun generateReference(): String {
+        val chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+        return (1..9).map { chars.random() }.joinToString("")
+    }
+
     private fun crc16(data: String): String {
         var crc = 0xFFFF
         for (c in data) {
@@ -427,7 +452,7 @@ class PayMvQrFragment : Fragment() {
             } else {
                 b.tvDropdownAccountType.visibility = View.GONE
             }
-            b.tvDropdownBalance.text = displayData?.balance ?: ""
+            b.tvDropdownBalance.visibility = View.GONE
             b.root.alpha = 1f
 
             val networkIcon = BmlCardParser.cardNetworkIcon(acc)

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

@@ -3,6 +3,7 @@ package sh.sar.basedbank.ui.home
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import androidx.activity.result.contract.ActivityResultContracts
 import android.graphics.Color
 import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
@@ -13,20 +14,41 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
-import androidx.activity.result.contract.ActivityResultContracts
+import android.view.animation.AccelerateInterpolator
+import android.view.animation.DecelerateInterpolator
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.doOnNextLayout
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.PagerSnapHelper
 import androidx.recyclerview.widget.RecyclerView
+import android.animation.ValueAnimator
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.RectF
+import android.view.Gravity
+import androidx.biometric.BiometricManager
+import androidx.biometric.BiometricPrompt
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
+import com.google.android.material.button.MaterialButton
 import com.google.android.material.color.MaterialColors
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import sh.sar.basedbank.BasedBankApp
 import sh.sar.basedbank.R
+import sh.sar.basedbank.api.bml.BmlTapToPayClient
+import sh.sar.basedbank.nfc.BmlHostCardEmulatorService
 import sh.sar.basedbank.api.mib.MibCard
 import sh.sar.basedbank.databinding.FragmentCardsBinding
 import sh.sar.basedbank.util.CardsCache
+import sh.sar.basedbank.util.CredentialStore
+import sh.sar.basedbank.util.Totp
 import sh.sar.basedbank.util.bmlapi.BmlCardParser
+import sh.sar.basedbank.util.PaymvQrParser
 import kotlin.math.abs
 
 class CardsFragment : Fragment() {
@@ -38,21 +60,52 @@ class CardsFragment : Fragment() {
     private var cards: List<CardItem> = emptyList()
     private var currentCardPosition: Int = 0
     private var cardWidth: Int = 0
-    private var pendingQrAccountNumber: String? = null
+    private var pendingQrCardNumber: String? = null
+    private var isManageMode: Boolean = false
 
     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
-        if (raw.startsWith("https://ebanking.bankofmaldives.com.mv/qrpay/") ||
-            raw.startsWith("https://pay.bml.com.mv/app/")) {
+        val cardNumber = pendingQrCardNumber.also { pendingQrCardNumber = null }
+        val bmlUrl = PaymvQrParser.extractBmlGatewayUrl(raw)
+        if (raw.startsWith("https://ebanking.bankofmaldives.com.mv/qrpay/") || bmlUrl != null) {
             (requireActivity() as HomeActivity).navigateTo(
-                R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(raw, pendingQrAccountNumber)
+                R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(bmlUrl ?: raw, cardNumber)
             )
         } else {
-            Toast.makeText(requireContext(), R.string.transfer_qr_invalid, Toast.LENGTH_SHORT).show()
+            val qr = PaymvQrParser.parse(raw)
+            if (qr?.accountNumber != null) {
+                Toast.makeText(requireContext(), R.string.card_qr_paymv_unsupported, Toast.LENGTH_SHORT).show()
+                val defaultFrom = store.getDefaultAccountNumber()
+                (requireActivity() as HomeActivity).navigateTo(
+                    R.id.nav_transfer, TransferFragment.newInstanceFromQr(
+                        accountNumber     = qr.accountNumber,
+                        displayName       = qr.merchantName ?: qr.accountNumber,
+                        amount            = qr.amount,
+                        remarks           = qr.purpose,
+                        fromAccountNumber = defaultFrom
+                    )
+                )
+            } else {
+                Toast.makeText(requireContext(), R.string.transfer_qr_invalid, Toast.LENGTH_SHORT).show()
+            }
         }
-        pendingQrAccountNumber = null
     }
+    private var isTapMode: Boolean = false
+    private var tapAnimView: NfcTapAnimationView? = null
+    private var autoTapModeTriggered = false
+
+    // Carousel snapshot captured on enter, used to reverse the exit animation
+    private var carouselCardLayoutTop = 0f      // card layout top relative to contentLayout
+    private var carouselCardCenterX = 0f        // card center X relative to contentLayout
+    private var carouselTextLayoutTop = 0f      // tvSelectedCardType layout top relative to contentLayout
+
+    // Swipe-to-dismiss tracking
+    private var swipeDragStartRawY = 0f
+    private var swipeIsDragging = false
+
+    private lateinit var stackAdapter: CardStackAdapter
+    private val store by lazy { CredentialStore(requireContext()) }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         _binding = FragmentCardsBinding.inflate(inflater, container, false)
@@ -64,7 +117,7 @@ class CardsFragment : Fragment() {
         val peekPx = screenW / 8
         cardWidth = screenW - 2 * peekPx
 
-        val stackAdapter = CardStackAdapter(cardWidth)
+        stackAdapter = CardStackAdapter(cardWidth)
         binding.rvCards.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
         binding.rvCards.adapter = stackAdapter
         binding.rvCards.setPadding(peekPx, 0, peekPx, 0)
@@ -101,24 +154,8 @@ ViewCompat.setOnApplyWindowInsetsListener(binding.contentLayout) { v, insets ->
             insets
         }
 
-        val updateCardList = {
-            val mibItems = (viewModel.mibCards.value ?: emptyList()).map { CardItem.Mib(it) }
-            val bmlItems = (viewModel.accounts.value ?: emptyList())
-                .filter { it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT" || it.profileType == "BML_DEBIT" }
-                .map { CardItem.Bml(it) }
-            cards = mibItems + bmlItems
-            stackAdapter.update(cards)
-            binding.loadingView.visibility = View.GONE
-            val empty = cards.isEmpty()
-            binding.emptyView.visibility = if (empty) View.VISIBLE else View.GONE
-            binding.contentLayout.visibility = if (empty) View.GONE else View.VISIBLE
-            if (!empty) {
-                buildDots(cards.size, currentCardPosition)
-                updateCardInfo(currentCardPosition)
-            }
-        }
-        viewModel.mibCards.observe(viewLifecycleOwner) { updateCardList() }
-        viewModel.accounts.observe(viewLifecycleOwner) { updateCardList() }
+        viewModel.mibCards.observe(viewLifecycleOwner) { rebuildCards() }
+        viewModel.accounts.observe(viewLifecycleOwner) { rebuildCards() }
 
         val cached = CardsCache.load(requireContext())
         if (cached.isNotEmpty()) {
@@ -128,12 +165,60 @@ ViewCompat.setOnApplyWindowInsetsListener(binding.contentLayout) { v, insets ->
         }
         (activity as? HomeActivity)?.triggerRefreshCards()
 
+        binding.btnManageCard.setOnClickListener {
+            setManageMode(!isManageMode)
+        }
+
+        // Swipe-down on the manage card to dismiss manage mode
+        binding.manageCardView.root.setOnTouchListener { _, event ->
+            if (!isManageMode && !isTapMode) return@setOnTouchListener false
+            val mgr = binding.manageCardView.root
+            when (event.action) {
+                android.view.MotionEvent.ACTION_DOWN -> {
+                    mgr.animate().cancel()
+                    binding.tvSelectedCardType.animate().cancel()
+                    swipeDragStartRawY = event.rawY
+                    swipeIsDragging = false
+                    true
+                }
+                android.view.MotionEvent.ACTION_MOVE -> {
+                    val dy = (event.rawY - swipeDragStartRawY).coerceAtLeast(0f)
+                    if (dy > 12f || swipeIsDragging) {
+                        swipeIsDragging = true
+                        mgr.translationY = dy
+                        binding.tvSelectedCardType.translationY = dy * 0.6f
+                        val scale = 1f - (dy / (binding.contentLayout.height * 2.5f)).coerceIn(0f, 0.12f)
+                        mgr.scaleX = scale
+                        mgr.scaleY = scale
+                        true
+                    } else false
+                }
+                android.view.MotionEvent.ACTION_UP, android.view.MotionEvent.ACTION_CANCEL -> {
+                    if (swipeIsDragging) {
+                        val dy = (event.rawY - swipeDragStartRawY).coerceAtLeast(0f)
+                        swipeIsDragging = false
+                        if (dy > 130f) {
+                            if (isTapMode) setTapMode(false) else setManageMode(false)
+                        } else {
+                            // Snap back
+                            mgr.animate().translationY(0f).scaleX(1f).scaleY(1f)
+                                .setDuration(280).setInterpolator(DecelerateInterpolator()).start()
+                            binding.tvSelectedCardType.animate().translationY(0f)
+                                .setDuration(280).setInterpolator(DecelerateInterpolator()).start()
+                        }
+                        true
+                    } else false
+                }
+                else -> false
+            }
+        }
+
         binding.btnScanToPay.setOnClickListener {
             val item = cards.getOrNull(currentCardPosition) ?: return@setOnClickListener
             if (item is CardItem.Mib) {
                 Toast.makeText(requireContext(), R.string.mib_qr_nfc_not_supported, Toast.LENGTH_SHORT).show()
             } else {
-                pendingQrAccountNumber = (item as CardItem.Bml).account.accountNumber
+                pendingQrCardNumber = (item as CardItem.Bml).account.accountNumber
                 qrLauncher.launch(Intent(requireContext(), QrScannerActivity::class.java))
             }
         }
@@ -142,8 +227,17 @@ ViewCompat.setOnApplyWindowInsetsListener(binding.contentLayout) { v, insets ->
         binding.btnTapToPay.isEnabled = nfcAvailable
         binding.btnTapToPay.setOnClickListener {
             val item = cards.getOrNull(currentCardPosition) ?: return@setOnClickListener
-            val msg = if (item is CardItem.Mib) R.string.mib_qr_nfc_not_supported else R.string.work_in_progress
-            Toast.makeText(requireContext(), msg, Toast.LENGTH_SHORT).show()
+            if (item is CardItem.Mib) {
+                Toast.makeText(requireContext(), R.string.mib_qr_nfc_not_supported, Toast.LENGTH_SHORT).show()
+                return@setOnClickListener
+            }
+            val bmlItem = item as CardItem.Bml
+            val prefs = requireContext().getSharedPreferences("prefs", Context.MODE_PRIVATE)
+            if (prefs.getBoolean("biometrics_transfer_confirm", false)) {
+                showBiometricPromptForTap(bmlItem)
+            } else {
+                setTapMode(true, bmlItem)
+            }
         }
 
         val wip = View.OnClickListener {
@@ -154,6 +248,484 @@ ViewCompat.setOnApplyWindowInsetsListener(binding.contentLayout) { v, insets ->
         binding.btnBlock.setOnClickListener(wip)
     }
 
+    private fun setManageMode(enabled: Boolean) {
+        isManageMode = enabled
+        requireActivity().title = getString(if (enabled) R.string.card_manage else R.string.nav_pay_with_card)
+        if (enabled) enterManageMode() else exitManageMode()
+    }
+
+    private fun enterManageMode() {
+        val item = cards.getOrNull(currentCardPosition) ?: return
+
+        // Bind card data
+        val cv = binding.manageCardView
+        when (item) {
+            is CardItem.Mib -> {
+                cv.tvCardOwner.text = item.card.cardHolderName
+                cv.tvCardNumber.text = formatMasked(item.card.maskedCardNumber)
+                val assetPath = cardImageAsset(item.card)
+                if (assetPath != null) loadCardImage(cv.ivCardImage, assetPath)
+                else cv.ivCardImage.setImageDrawable(null)
+                bindCardStatus(cv.tvCardStatus, mibCardStatusLabel(item.card.cardStatus))
+                cv.root.alpha = 1f
+            }
+            is CardItem.Bml -> {
+                cv.tvCardOwner.text = item.account.accountBriefName
+                cv.tvCardNumber.text = formatMasked(item.account.accountNumber)
+                loadCardImage(cv.ivCardImage, BmlCardParser.cardImageAsset(item.account))
+                val isActive = item.account.statusDesc.equals("Active", ignoreCase = true)
+                bindCardStatus(cv.tvCardStatus, item.account.statusDesc.takeUnless { isActive })
+                cv.root.alpha = if (isActive) 1f else 0.45f
+            }
+        }
+
+        // Capture positions BEFORE layout changes (for enter animation + exit animation later)
+        val contentLoc = IntArray(2).also { binding.contentLayout.getLocationOnScreen(it) }
+        val lm = binding.rvCards.layoutManager as? LinearLayoutManager
+        val srcView = lm?.findViewByPosition(currentCardPosition)
+        val srcLoc = IntArray(2).also { srcView?.getLocationOnScreen(it) ?: run { it[0] = contentLoc[0]; it[1] = contentLoc[1] } }
+        val srcScreenTop = (srcLoc[1] - contentLoc[1]).toFloat()
+        val srcCenterX = (srcLoc[0] - contentLoc[0]).toFloat() + cardWidth / 2f
+
+        val textLoc = IntArray(2).also { binding.tvSelectedCardType.getLocationOnScreen(it) }
+        val textSrcScreenTop = (textLoc[1] - contentLoc[1]).toFloat()
+
+        // Apply layout changes
+        binding.btnManageCard.visibility = View.GONE
+        binding.topSpacer.visibility = View.GONE
+        binding.rvCards.visibility = View.GONE
+        binding.pageIndicator.visibility = View.GONE
+        binding.llPayButtons.visibility = View.GONE
+        binding.llManageButtons.visibility = View.VISIBLE
+        binding.llDefaultCardRow.visibility = View.VISIBLE
+        binding.llHideDashboardRow.visibility = View.VISIBLE
+        binding.manageCardView.root.visibility = View.VISIBLE
+
+        // Set switch state (clear listener first to avoid triggering on programmatic set)
+        val isBml = item is CardItem.Bml
+        binding.switchDefaultCard.setOnCheckedChangeListener(null)
+        binding.switchDefaultCard.isChecked = isBml && store.getDefaultCardAccountNumber() == (item as? CardItem.Bml)?.account?.accountNumber
+        binding.switchDefaultCard.setOnCheckedChangeListener { _, isChecked ->
+            if (item is CardItem.Mib) {
+                // MIB doesn't support NFC/QR pay — same toast as scan/tap to pay
+                binding.switchDefaultCard.setOnCheckedChangeListener(null)
+                binding.switchDefaultCard.isChecked = false
+                binding.switchDefaultCard.setOnCheckedChangeListener { _, c ->
+                    handleDefaultCardToggle(c)
+                }
+                Toast.makeText(requireContext(), R.string.mib_qr_nfc_not_supported, Toast.LENGTH_SHORT).show()
+            } else {
+                handleDefaultCardToggle(isChecked)
+            }
+        }
+
+        val accountNumber = (item as? CardItem.Bml)?.account?.accountNumber
+            ?: (item as? CardItem.Mib)?.card?.maskedCardNumber
+        binding.switchHideFromDashboard.setOnCheckedChangeListener(null)
+        binding.switchHideFromDashboard.isChecked = accountNumber != null &&
+            store.getHiddenDashboardCardNumbers().contains(accountNumber)
+        binding.switchHideFromDashboard.setOnCheckedChangeListener { _, isChecked ->
+            if (accountNumber != null) {
+                store.setCardHiddenFromDashboard(accountNumber, isChecked)
+            }
+        }
+
+        // After layout pass, compute offsets, save carousel snapshot, and animate
+        binding.contentLayout.doOnNextLayout {
+            val mgr = binding.manageCardView.root
+            val dstLoc = IntArray(2).also { mgr.getLocationOnScreen(it) }
+            val dstTop = (dstLoc[1] - contentLoc[1]).toFloat()
+            val dstCenterX = (dstLoc[0] - contentLoc[0]).toFloat() + mgr.width / 2f
+
+            val scaleStart = if (mgr.width > 0) cardWidth.toFloat() / mgr.width.toFloat() else 1f
+            val transXStart = srcCenterX - dstCenterX
+            val transYStart = srcScreenTop - dstTop
+
+            // Save the carousel card's position (relative to contentLayout) for the exit animation
+            carouselCardLayoutTop = srcScreenTop
+            carouselCardCenterX = srcCenterX
+            carouselTextLayoutTop = textSrcScreenTop
+
+            val textDstLoc = IntArray(2).also { binding.tvSelectedCardType.getLocationOnScreen(it) }
+            val textDstTop = (textDstLoc[1] - contentLoc[1]).toFloat()
+
+            mgr.pivotX = mgr.width / 2f
+            mgr.pivotY = 0f
+            mgr.scaleX = scaleStart
+            mgr.scaleY = scaleStart
+            mgr.translationX = transXStart
+            mgr.translationY = transYStart
+
+            mgr.animate()
+                .scaleX(1f).scaleY(1f)
+                .translationX(0f).translationY(0f)
+                .setDuration(380)
+                .setInterpolator(DecelerateInterpolator())
+                .start()
+
+            binding.tvSelectedCardType.translationY = textSrcScreenTop - textDstTop
+            binding.tvSelectedCardType.animate()
+                .translationY(0f)
+                .setDuration(380)
+                .setInterpolator(DecelerateInterpolator())
+                .start()
+        }
+    }
+
+    private fun handleDefaultCardToggle(isChecked: Boolean) {
+        val item = cards.getOrNull(currentCardPosition) as? CardItem.Bml ?: return
+        store.setDefaultCardAccountNumber(if (isChecked) item.account.accountNumber else null)
+        rebuildCards()
+    }
+
+    private fun exitManageMode() {
+        binding.manageCardView.root.animate().cancel()
+        binding.tvSelectedCardType.animate().cancel()
+
+        val mgr = binding.manageCardView.root
+        val contentLoc = IntArray(2).also { binding.contentLayout.getLocationOnScreen(it) }
+
+        // Compute layout top of manage card (strip current translationY which may be from a swipe drag)
+        val mgrLoc = IntArray(2).also { mgr.getLocationOnScreen(it) }
+        val mgrLayoutTop = (mgrLoc[1] - contentLoc[1]).toFloat() - mgr.translationY
+
+        val textLoc = IntArray(2).also { binding.tvSelectedCardType.getLocationOnScreen(it) }
+        val textLayoutTop = (textLoc[1] - contentLoc[1]).toFloat() - binding.tvSelectedCardType.translationY
+
+        // Target: animate card back to carousel position
+        val scaleEnd = if (mgr.width > 0) cardWidth.toFloat() / mgr.width.toFloat() else 1f
+        val mgrLayoutCenterX = (mgrLoc[0] - contentLoc[0]).toFloat() - mgr.translationX + mgr.width / 2f
+        val targetTransX = carouselCardCenterX - mgrLayoutCenterX
+        val targetTransY = carouselCardLayoutTop - mgrLayoutTop
+
+        val targetTextTransY = carouselTextLayoutTop - textLayoutTop
+
+        mgr.pivotX = mgr.width / 2f
+        mgr.pivotY = 0f
+
+        mgr.animate()
+            .scaleX(scaleEnd).scaleY(scaleEnd)
+            .translationX(targetTransX)
+            .translationY(targetTransY)
+            .setDuration(320)
+            .setInterpolator(AccelerateInterpolator())
+            .withEndAction {
+                mgr.scaleX = 1f; mgr.scaleY = 1f
+                mgr.translationX = 0f; mgr.translationY = 0f
+                mgr.visibility = View.GONE
+                binding.tvSelectedCardType.translationY = 0f
+
+                binding.btnManageCard.visibility = View.VISIBLE
+                binding.topSpacer.visibility = View.VISIBLE
+                binding.rvCards.visibility = View.VISIBLE
+                binding.llPayButtons.visibility = View.VISIBLE
+                binding.llManageButtons.visibility = View.GONE
+                binding.llDefaultCardRow.visibility = View.GONE
+                binding.llHideDashboardRow.visibility = View.GONE
+                binding.switchDefaultCard.setOnCheckedChangeListener(null)
+                binding.switchHideFromDashboard.setOnCheckedChangeListener(null)
+                buildDots(cards.size, currentCardPosition)
+            }
+            .start()
+
+        binding.tvSelectedCardType.animate()
+            .translationY(targetTextTransY)
+            .setDuration(320)
+            .setInterpolator(AccelerateInterpolator())
+            .withEndAction { binding.tvSelectedCardType.translationY = 0f }
+            .start()
+    }
+
+    // ── Tap-to-pay mode ────────────────────────────────────────────────────────
+
+    private fun setTapMode(enabled: Boolean, item: CardItem.Bml? = null) {
+        isTapMode = enabled
+        requireActivity().title = getString(if (enabled) R.string.card_pay_nfc else R.string.nav_pay_with_card)
+        if (enabled) enterTapMode(item!!) else exitTapMode()
+    }
+
+    private fun showBiometricPromptForTap(item: CardItem.Bml) {
+        val bmgr = BiometricManager.from(requireContext())
+        if (bmgr.canAuthenticate(BiometricManager.Authenticators.BIOMETRIC_STRONG) != BiometricManager.BIOMETRIC_SUCCESS) {
+            setTapMode(true, item)
+            return
+        }
+        val prompt = BiometricPrompt(this, ContextCompat.getMainExecutor(requireContext()),
+            object : BiometricPrompt.AuthenticationCallback() {
+                override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
+                    setTapMode(true, item)
+                }
+                override fun onAuthenticationError(errorCode: Int, errString: CharSequence) { }
+            })
+        prompt.authenticate(
+            BiometricPrompt.PromptInfo.Builder()
+                .setTitle(getString(R.string.card_pay_nfc))
+                .setSubtitle(item.account.accountBriefName)
+                .setNegativeButtonText(getString(R.string.cancel))
+                .build()
+        )
+    }
+
+    private fun enterTapMode(item: CardItem.Bml) {
+        // Bind card data to the shared manage card view
+        val cv = binding.manageCardView
+        cv.tvCardOwner.text = item.account.accountBriefName
+        cv.tvCardNumber.text = formatMasked(item.account.accountNumber)
+        loadCardImage(cv.ivCardImage, BmlCardParser.cardImageAsset(item.account))
+        val isActive = item.account.statusDesc.equals("Active", ignoreCase = true)
+        bindCardStatus(cv.tvCardStatus, item.account.statusDesc.takeUnless { isActive })
+        cv.root.alpha = if (isActive) 1f else 0.45f
+
+        // Snapshot carousel card position before layout changes (for animation)
+        val contentLoc = IntArray(2).also { binding.contentLayout.getLocationOnScreen(it) }
+        val lm = binding.rvCards.layoutManager as? LinearLayoutManager
+        val srcView = lm?.findViewByPosition(currentCardPosition)
+        val srcLoc = IntArray(2).also {
+            srcView?.getLocationOnScreen(it) ?: run { it[0] = contentLoc[0]; it[1] = contentLoc[1] }
+        }
+        val srcScreenTop = (srcLoc[1] - contentLoc[1]).toFloat()
+        val srcCenterX = (srcLoc[0] - contentLoc[0]).toFloat() + cardWidth / 2f
+        val textLoc = IntArray(2).also { binding.tvSelectedCardType.getLocationOnScreen(it) }
+        val textSrcScreenTop = (textLoc[1] - contentLoc[1]).toFloat()
+
+        carouselCardLayoutTop = srcScreenTop
+        carouselCardCenterX = srcCenterX
+        carouselTextLayoutTop = textSrcScreenTop
+
+        // Apply layout changes
+        binding.btnManageCard.visibility = View.GONE
+        binding.topSpacer.visibility = View.GONE
+        binding.rvCards.visibility = View.GONE
+        binding.pageIndicator.visibility = View.GONE
+        binding.divider.visibility = View.GONE
+        binding.llPayButtons.visibility = View.GONE
+        binding.llManageButtons.visibility = View.GONE
+        binding.llDefaultCardRow.visibility = View.GONE
+        binding.manageCardView.root.visibility = View.VISIBLE
+        binding.flTapMode.visibility = View.VISIBLE
+
+        // Build tap mode content: animation view + cancel button
+        binding.flTapMode.removeAllViews()
+        val animView = NfcTapAnimationView(requireContext())
+        tapAnimView = animView
+
+        val dp = resources.displayMetrics.density
+        val cancelBtn = MaterialButton(requireContext(), null,
+            com.google.android.material.R.attr.materialButtonOutlinedStyle
+        ).apply { setText(R.string.cancel); setOnClickListener { setTapMode(false) } }
+
+        val cancelWrapper = LinearLayout(requireContext()).apply {
+            orientation = LinearLayout.VERTICAL
+            gravity = Gravity.CENTER_HORIZONTAL
+            setPadding(0, 0, 0, (24 * dp).toInt())
+            addView(cancelBtn)
+        }
+        val container = LinearLayout(requireContext()).apply {
+            orientation = LinearLayout.VERTICAL
+            layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+            addView(View(requireContext()).apply {  // spacer pushes content below card
+                layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, 0, 1f)
+            })
+            addView(animView.apply {
+                layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, 0, 3f)
+            })
+            addView(cancelWrapper.apply {
+                layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)
+            })
+        }
+        binding.flTapMode.addView(container)
+
+        // Animate card up from carousel position (same as manage mode)
+        binding.contentLayout.doOnNextLayout {
+            val mgr = binding.manageCardView.root
+            val dstLoc = IntArray(2).also { mgr.getLocationOnScreen(it) }
+            val dstTop = (dstLoc[1] - contentLoc[1]).toFloat()
+            val dstCenterX = (dstLoc[0] - contentLoc[0]).toFloat() + mgr.width / 2f
+
+            mgr.pivotX = mgr.width / 2f
+            mgr.pivotY = 0f
+            mgr.scaleX = if (mgr.width > 0) cardWidth.toFloat() / mgr.width.toFloat() else 1f
+            mgr.scaleY = mgr.scaleX
+            mgr.translationX = srcCenterX - dstCenterX
+            mgr.translationY = srcScreenTop - dstTop
+
+            mgr.animate()
+                .scaleX(1f).scaleY(1f)
+                .translationX(0f).translationY(0f)
+                .setDuration(380).setInterpolator(DecelerateInterpolator()).start()
+
+            val textDstLoc = IntArray(2).also { binding.tvSelectedCardType.getLocationOnScreen(it) }
+            binding.tvSelectedCardType.translationY = textSrcScreenTop - (textDstLoc[1] - contentLoc[1]).toFloat()
+            binding.tvSelectedCardType.animate()
+                .translationY(0f)
+                .setDuration(380).setInterpolator(DecelerateInterpolator()).start()
+        }
+
+        fetchAndArmToken(item)
+    }
+
+    private fun exitTapMode() {
+        tapAnimView?.stopAnimation()
+        tapAnimView = null
+        BmlHostCardEmulatorService.clearToken()
+        BmlHostCardEmulatorService.onTransactionComplete = null
+
+        binding.manageCardView.root.animate().cancel()
+        binding.tvSelectedCardType.animate().cancel()
+
+        val mgr = binding.manageCardView.root
+        val contentLoc = IntArray(2).also { binding.contentLayout.getLocationOnScreen(it) }
+        val mgrLoc = IntArray(2).also { mgr.getLocationOnScreen(it) }
+        val mgrLayoutTop = (mgrLoc[1] - contentLoc[1]).toFloat() - mgr.translationY
+        val mgrLayoutCenterX = (mgrLoc[0] - contentLoc[0]).toFloat() - mgr.translationX + mgr.width / 2f
+
+        val textLoc = IntArray(2).also { binding.tvSelectedCardType.getLocationOnScreen(it) }
+        val textLayoutTop = (textLoc[1] - contentLoc[1]).toFloat() - binding.tvSelectedCardType.translationY
+
+        mgr.pivotX = mgr.width / 2f
+        mgr.pivotY = 0f
+
+        mgr.animate()
+            .scaleX(if (mgr.width > 0) cardWidth.toFloat() / mgr.width.toFloat() else 1f)
+            .scaleY(if (mgr.width > 0) cardWidth.toFloat() / mgr.width.toFloat() else 1f)
+            .translationX(carouselCardCenterX - mgrLayoutCenterX)
+            .translationY(carouselCardLayoutTop - mgrLayoutTop)
+            .setDuration(320)
+            .setInterpolator(AccelerateInterpolator())
+            .withEndAction {
+                mgr.scaleX = 1f; mgr.scaleY = 1f
+                mgr.translationX = 0f; mgr.translationY = 0f
+                mgr.visibility = View.GONE
+                binding.tvSelectedCardType.translationY = 0f
+                binding.flTapMode.visibility = View.GONE
+                binding.flTapMode.removeAllViews()
+                binding.btnManageCard.visibility = View.VISIBLE
+                binding.topSpacer.visibility = View.VISIBLE
+                binding.rvCards.visibility = View.VISIBLE
+                binding.divider.visibility = View.VISIBLE
+                binding.llPayButtons.visibility = View.VISIBLE
+                buildDots(cards.size, currentCardPosition)
+            }
+            .start()
+
+        binding.tvSelectedCardType.animate()
+            .translationY(carouselTextLayoutTop - textLayoutTop)
+            .setDuration(320)
+            .setInterpolator(AccelerateInterpolator())
+            .withEndAction { binding.tvSelectedCardType.translationY = 0f }
+            .start()
+    }
+
+    private fun fetchAndArmToken(item: CardItem.Bml) {
+        val app = requireActivity().application as BasedBankApp
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            val loginId = item.account.loginTag.removePrefix("bml_")
+            val session = app.bmlSessionFor(item.account)
+            val otpSeed = CredentialStore(requireContext()).loadBmlCredentials(loginId)?.otpSeed
+
+            if (session == null || otpSeed == null) {
+                if (isTapMode) {
+                    Toast.makeText(requireContext(),
+                        if (session == null) getString(R.string.transfer_session_unavailable)
+                        else "OTP unavailable",
+                        Toast.LENGTH_SHORT).show()
+                    setTapMode(false)
+                }
+                return@launch
+            }
+
+            (activity as? HomeActivity)?.setRefreshing(true)
+            val otp = Totp.generate(otpSeed)
+            val result = withContext(Dispatchers.IO) {
+                runCatching { BmlTapToPayClient().fetchTokens(session, item.account.internalId, otp) }
+            }
+            (activity as? HomeActivity)?.setRefreshing(false)
+            val token = result.getOrNull()?.firstOrNull()
+
+            if (!isTapMode) return@launch  // user cancelled while we were fetching
+
+            if (token == null) {
+                if (isTapMode) {
+                    Toast.makeText(requireContext(),
+                        result.exceptionOrNull()?.message ?: "Failed to get payment token",
+                        Toast.LENGTH_SHORT).show()
+                    setTapMode(false)
+                }
+                return@launch
+            }
+
+            BmlHostCardEmulatorService.setToken(token)
+            BmlHostCardEmulatorService.onTransactionComplete = { success ->
+                view?.post {
+                    if (!isTapMode) return@post
+                    setTapMode(false)
+                    if (success) Toast.makeText(requireContext(), "Payment complete", Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
+    }
+
+    private fun rebuildCards() {
+        // Remember which card is currently selected by identity so we can restore position after reorder
+        val currentCard = cards.getOrNull(currentCardPosition)
+
+        val defaultNum = store.getDefaultCardAccountNumber()
+        val mibItems = (viewModel.mibCards.value ?: emptyList()).map { CardItem.Mib(it) }
+        val bmlItems = (viewModel.accounts.value ?: emptyList())
+            .filter { it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT" || it.profileType == "BML_DEBIT" }
+            .map { CardItem.Bml(it) }
+        val all: List<CardItem> = mibItems + bmlItems
+        // Move default BML card to front
+        cards = if (defaultNum != null) {
+            val def = all.filterIsInstance<CardItem.Bml>().firstOrNull { it.account.accountNumber == defaultNum }
+            if (def != null) listOf(def) + all.filter { it !== def } else all
+        } else all
+
+        // Restore position to follow the same card after reorder
+        if (currentCard != null) {
+            val newPos = cards.indexOf(currentCard)
+            if (newPos >= 0 && newPos != currentCardPosition) {
+                currentCardPosition = newPos
+                binding.rvCards.scrollToPosition(newPos)
+            }
+        }
+
+        stackAdapter.update(cards)
+        binding.loadingView.visibility = View.GONE
+        val empty = cards.isEmpty()
+        binding.emptyView.visibility = if (empty) View.VISIBLE else View.GONE
+        binding.contentLayout.visibility = if (empty) View.GONE else View.VISIBLE
+        if (!empty) {
+            buildDots(cards.size, currentCardPosition)
+            updateCardInfo(currentCardPosition)
+        }
+
+        // Auto-enter tap mode when launched from shortcut, NFC prompt, or dashboard
+        if (!autoTapModeTriggered && arguments?.getBoolean(ARG_AUTO_TAP_MODE) == true) {
+            val targetAccount = arguments?.getString(ARG_AUTO_TAP_ACCOUNT)
+            val targetCard = if (targetAccount != null)
+                cards.filterIsInstance<CardItem.Bml>().firstOrNull { it.account.accountNumber == targetAccount }
+            else
+                cards.filterIsInstance<CardItem.Bml>().firstOrNull()
+            if (targetCard != null) {
+                autoTapModeTriggered = true
+                // Scroll to the target card first
+                val pos = cards.indexOf(targetCard)
+                if (pos >= 0) {
+                    currentCardPosition = pos
+                    binding.rvCards.scrollToPosition(pos)
+                }
+                val prefs = requireContext().getSharedPreferences("prefs", Context.MODE_PRIVATE)
+                if (prefs.getBoolean("biometrics_transfer_confirm", false)) {
+                    showBiometricPromptForTap(targetCard)
+                } else {
+                    setTapMode(true, targetCard)
+                }
+            }
+        }
+    }
+
     private fun applyCardScales() {
         val rv = binding.rvCards
         val rvCenter = rv.paddingStart + (rv.width - rv.paddingStart - rv.paddingEnd) / 2f
@@ -173,6 +745,7 @@ ViewCompat.setOnApplyWindowInsetsListener(binding.contentLayout) { v, insets ->
     }
 
     private fun buildDots(count: Int, selected: Int) {
+        if (isManageMode || isTapMode) return
         binding.pageIndicator.removeAllViews()
         if (count <= 1) {
             binding.pageIndicator.visibility = View.GONE
@@ -207,12 +780,36 @@ ViewCompat.setOnApplyWindowInsetsListener(binding.contentLayout) { v, insets ->
         }
     }
 
+    fun onBackPressed(): Boolean {
+        if (isTapMode) {
+            setTapMode(false)
+            return true
+        }
+        if (isManageMode) {
+            setManageMode(false)
+            return true
+        }
+        return false
+    }
+
+    override fun onPause() {
+        super.onPause()
+        if (isTapMode) {
+            BmlHostCardEmulatorService.clearToken()
+            BmlHostCardEmulatorService.onTransactionComplete = null
+        }
+    }
+
     override fun onResume() {
         super.onResume()
         requireActivity().title = getString(R.string.nav_pay_with_card)
     }
 
     override fun onDestroyView() {
+        tapAnimView?.stopAnimation()
+        tapAnimView = null
+        BmlHostCardEmulatorService.clearToken()
+        BmlHostCardEmulatorService.onTransactionComplete = null
         super.onDestroyView()
         _binding = null
     }
@@ -274,9 +871,105 @@ ViewCompat.setOnApplyWindowInsetsListener(binding.contentLayout) { v, insets ->
         }
     }
 
+    // ── NFC animation view ─────────────────────────────────────────────────────
+
+    private inner class NfcTapAnimationView(context: Context) : View(context) {
+
+        private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+        private val animator = ValueAnimator.ofFloat(0f, 1f).apply {
+            duration = 1600
+            repeatCount = ValueAnimator.INFINITE
+            repeatMode = ValueAnimator.RESTART
+            addUpdateListener { invalidate() }
+            start()
+        }
+
+        fun stopAnimation() = animator.cancel()
+
+        override fun onDraw(canvas: Canvas) {
+            val w = width.toFloat(); val h = height.toFloat()
+            if (w <= 0f || h <= 0f) return
+
+            val dp = resources.displayMetrics.density
+            val progress = animator.animatedFraction
+            val cx = w / 2f; val cy = h / 2f + 24 * dp
+
+            val colorOnSurface = MaterialColors.getColor(this,
+                com.google.android.material.R.attr.colorOnSurface, android.graphics.Color.BLACK)
+            val colorPrimary = MaterialColors.getColor(this,
+                com.google.android.material.R.attr.colorPrimary, android.graphics.Color.BLUE)
+            val colorSurfaceVariant = MaterialColors.getColor(this,
+                com.google.android.material.R.attr.colorSurfaceVariant, android.graphics.Color.LTGRAY)
+
+            // POS terminal (top center)
+            val posW = 44 * dp; val posH = 72 * dp
+            val posX = cx - posW / 2f; val posY = cy - 170 * dp
+
+            // Phone (bottom center)
+            val phoneW = 52 * dp; val phoneH = 90 * dp
+            val phoneX = cx - phoneW / 2f; val phoneY = cy + 30 * dp
+
+            // POS terminal body
+            paint.style = Paint.Style.FILL; paint.color = colorSurfaceVariant
+            canvas.drawRoundRect(posX, posY, posX + posW, posY + posH, 7 * dp, 7 * dp, paint)
+            paint.style = Paint.Style.STROKE; paint.strokeWidth = 2.5f * dp; paint.color = colorOnSurface
+            canvas.drawRoundRect(posX, posY, posX + posW, posY + posH, 7 * dp, 7 * dp, paint)
+
+            // POS screen
+            paint.style = Paint.Style.FILL; paint.color = colorPrimary; paint.alpha = 70
+            canvas.drawRoundRect(posX + 4 * dp, posY + 6 * dp,
+                posX + posW - 4 * dp, posY + posH * 0.45f, 4 * dp, 4 * dp, paint)
+            paint.alpha = 255
+
+            // POS card slot
+            paint.style = Paint.Style.STROKE; paint.strokeWidth = 2 * dp; paint.color = colorOnSurface
+            canvas.drawLine(posX + 6 * dp, posY + posH * 0.72f, posX + posW - 6 * dp, posY + posH * 0.72f, paint)
+
+            // Phone body
+            paint.style = Paint.Style.FILL; paint.color = colorSurfaceVariant
+            canvas.drawRoundRect(phoneX, phoneY, phoneX + phoneW, phoneY + phoneH, 8 * dp, 8 * dp, paint)
+            paint.style = Paint.Style.STROKE; paint.strokeWidth = 2.5f * dp; paint.color = colorOnSurface
+            canvas.drawRoundRect(phoneX, phoneY, phoneX + phoneW, phoneY + phoneH, 8 * dp, 8 * dp, paint)
+
+            // Phone screen
+            paint.style = Paint.Style.FILL; paint.color = colorPrimary; paint.alpha = 70
+            canvas.drawRoundRect(phoneX + 4 * dp, phoneY + 10 * dp,
+                phoneX + phoneW - 4 * dp, phoneY + phoneH - 15 * dp, 4 * dp, 4 * dp, paint)
+            paint.alpha = 255
+
+            // Animated NFC rings originating from phone top, travelling upward toward POS
+            val gapTop = posY + posH + 4 * dp
+            val originY = phoneY
+            val maxR = (originY - gapTop) - 4 * dp
+            paint.style = Paint.Style.STROKE; paint.strokeWidth = 3 * dp
+            for (i in 0..2) {
+                val p = ((progress + i / 3f) % 1f)
+                val r = (p * maxR + 6 * dp).coerceAtMost(maxR)
+                paint.color = colorPrimary; paint.alpha = ((1f - p) * 200).toInt().coerceIn(0, 255)
+                canvas.drawArc(RectF(cx - r, originY - r, cx + r, originY + r), -160f, 140f, false, paint)
+            }
+            paint.alpha = 255
+
+            // Label
+            paint.style = Paint.Style.FILL; paint.color = colorOnSurface; paint.alpha = 160
+            paint.textSize = 15 * dp; paint.textAlign = Paint.Align.CENTER
+            canvas.drawText(context.getString(R.string.card_pay_nfc), cx, phoneY + phoneH + 28 * dp, paint)
+            paint.alpha = 255; paint.textAlign = Paint.Align.LEFT
+        }
+    }
+
     companion object {
+        private const val ARG_AUTO_TAP_MODE = "auto_tap_mode"
+        private const val ARG_AUTO_TAP_ACCOUNT = "auto_tap_account"
+        fun newInstanceWithAutoTapMode(accountNumber: String? = null) = CardsFragment().apply {
+            arguments = Bundle().apply {
+                putBoolean(ARG_AUTO_TAP_MODE, true)
+                if (accountNumber != null) putString(ARG_AUTO_TAP_ACCOUNT, accountNumber)
+            }
+        }
+
         fun cardImageAsset(card: MibCard): String? = when (card.cardType) {
-            "51" -> "cards/mib/faisa.png"
+            "51" -> "cards/mib/faisa_card.png"
             "53" -> "cards/mib/visa_black_platinum.png"
             "57" -> "cards/mib/visa_blue_everyday.png"
             "70" -> "cards/mib/visa_business.png"

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

@@ -2,7 +2,9 @@ package sh.sar.basedbank.ui.home
 
 import android.content.Context
 import android.content.SharedPreferences
+import android.graphics.Color
 import android.os.Bundle
+import android.text.InputType
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -10,6 +12,7 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.ScrollView
 import android.widget.TextView
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.app.AppCompatDelegate.setApplicationLocales
 import androidx.core.os.LocaleListCompat
@@ -18,8 +21,11 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textfield.TextInputLayout
 import sh.sar.basedbank.R
 import sh.sar.basedbank.databinding.FragmentSettingsAppearanceBinding
+import sh.sar.basedbank.util.ThemeHelper
 import java.util.Collections
 
 class SettingsAppearanceFragment : Fragment() {
@@ -54,19 +60,29 @@ class SettingsAppearanceFragment : Fragment() {
         // Quick actions
         quickActions.clear()
         quickActions.addAll(NavCustomization.getQuickActions(prefs))
-        quickActionAdapter = NavItemAdapter(quickActions) {
-            NavCustomization.saveQuickActions(prefs, quickActions)
+        quickActionAdapter = NavItemAdapter(
+            items = quickActions,
+            onSave = { NavCustomization.saveQuickActions(prefs, quickActions) },
+            isEnabled = { !prefs.getBoolean("bottom_nav", false) }
+        )
+        setupNavItemRecyclerView(binding.rvQuickActions, quickActionAdapter, quickActions) {
+            !prefs.getBoolean("bottom_nav", false)
         }
-        setupNavItemRecyclerView(binding.rvQuickActions, quickActionAdapter, quickActions)
 
         // Bottom bar shortcuts
         slots.clear()
         slots.addAll(NavCustomization.getSlots(prefs))
-        slotAdapter = NavItemAdapter(slots) {
-            NavCustomization.saveSlots(prefs, slots)
-            (activity as? HomeActivity)?.rebuildBottomNav(prefs)
+        slotAdapter = NavItemAdapter(
+            items = slots,
+            onSave = {
+                NavCustomization.saveSlots(prefs, slots)
+                (activity as? HomeActivity)?.rebuildBottomNav(prefs)
+            },
+            isEnabled = { prefs.getBoolean("bottom_nav", false) }
+        )
+        setupNavItemRecyclerView(binding.rvNavSlots, slotAdapter, slots) {
+            prefs.getBoolean("bottom_nav", false)
         }
-        setupNavItemRecyclerView(binding.rvNavSlots, slotAdapter, slots)
         // Show labels toggle
         val showLabels = prefs.getBoolean("bottom_nav_show_labels", true)
         binding.switchShowLabels.isChecked = showLabels
@@ -93,8 +109,45 @@ class SettingsAppearanceFragment : Fragment() {
             }
             prefs.edit().putString("theme", key).apply()
             AppCompatDelegate.setDefaultNightMode(mode)
+            updateAccentState(key == "system")
+            updatePitchBlackState(key == "dark")
         }
 
+        // Pitch black
+        binding.switchPitchBlack.isChecked = prefs.getBoolean("pitch_black", false)
+        binding.switchPitchBlack.setOnCheckedChangeListener { _, checked ->
+            prefs.edit().putBoolean("pitch_black", checked).apply()
+            requireActivity().recreate()
+        }
+        val isDark = prefs.getString("theme", "system") == "dark"
+        updatePitchBlackState(isDark)
+
+        // Accent color
+        val savedPreset = prefs.getString("accent_preset", ThemeHelper.PRESET_BLUE)
+        binding.accentToggle.check(when (savedPreset) {
+            ThemeHelper.PRESET_RED -> R.id.btnAccentOrange
+            ThemeHelper.PRESET_GREEN  -> R.id.btnAccentGreen
+            ThemeHelper.PRESET_CUSTOM -> R.id.btnAccentCustom
+            else                      -> R.id.btnAccentBlue
+        })
+        binding.accentToggle.addOnButtonCheckedListener { _, checkedId, isChecked ->
+            if (!isChecked) return@addOnButtonCheckedListener
+            val preset = when (checkedId) {
+                R.id.btnAccentOrange -> ThemeHelper.PRESET_RED
+                R.id.btnAccentGreen  -> ThemeHelper.PRESET_GREEN
+                R.id.btnAccentCustom -> ThemeHelper.PRESET_CUSTOM
+                else                 -> ThemeHelper.PRESET_BLUE
+            }
+            if (preset == ThemeHelper.PRESET_CUSTOM) {
+                showCustomColorPicker()
+            } else {
+                prefs.edit().putString("accent_preset", preset).apply()
+                requireActivity().recreate()
+            }
+        }
+        val isSystem = prefs.getString("theme", "system") == "system"
+        updateAccentState(isSystem)
+
         // Language
         val currentLocales = AppCompatDelegate.getApplicationLocales()
         val currentLang = if (currentLocales.isEmpty) "en" else currentLocales[0]?.language ?: "en"
@@ -109,13 +162,18 @@ class SettingsAppearanceFragment : Fragment() {
     private fun setupNavItemRecyclerView(
         rv: RecyclerView,
         adapter: NavItemAdapter,
-        items: MutableList<Int>
+        items: MutableList<Int>,
+        isEnabled: () -> Boolean
     ) {
         rv.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
         rv.adapter = adapter
         ItemTouchHelper(object : ItemTouchHelper.SimpleCallback(
             ItemTouchHelper.START or ItemTouchHelper.END, 0
         ) {
+            override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int {
+                if (!isEnabled()) return 0
+                return super.getMovementFlags(recyclerView, viewHolder)
+            }
             override fun onMove(
                 rv: RecyclerView,
                 from: RecyclerView.ViewHolder,
@@ -134,11 +192,79 @@ class SettingsAppearanceFragment : Fragment() {
 
     private fun updateShortcutsVisibility() {
         val isBottom = prefs.getBoolean("bottom_nav", false)
+        binding.sectionQuickActions.alpha = if (isBottom) 0.38f else 1f
         binding.sectionBottomBarShortcuts.alpha = if (isBottom) 1f else 0.38f
+        binding.switchShowLabels.isClickable = isBottom
+        quickActionAdapter.notifyDataSetChanged()
+        slotAdapter.notifyDataSetChanged()
+    }
+
+    private fun updatePitchBlackState(isDark: Boolean) {
+        binding.rowPitchBlack.alpha = if (isDark) 1f else 0.38f
+        binding.switchPitchBlack.isEnabled = isDark
+    }
+
+    private fun updateAccentState(isSystem: Boolean) {
+        binding.sectionAccentColor.alpha = if (isSystem) 0.38f else 1f
+        for (i in 0 until binding.accentToggle.childCount) {
+            binding.accentToggle.getChildAt(i)?.isEnabled = !isSystem
+        }
+    }
+
+    private fun showCustomColorPicker() {
+        val ctx = requireContext()
+        val currentHex = prefs.getString("accent_custom_color", "") ?: ""
+        val inputLayout = TextInputLayout(ctx).apply {
+            hint = getString(R.string.accent_custom_hint)
+            val pad = (16 * resources.displayMetrics.density).toInt()
+            setPadding(pad, pad / 2, pad, 0)
+        }
+        val input = TextInputEditText(ctx).apply {
+            setText(currentHex)
+            inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS
+            setSingleLine(true)
+        }
+        inputLayout.addView(input)
+
+        val dialog = MaterialAlertDialogBuilder(ctx)
+            .setTitle(R.string.accent_custom_pick)
+            .setView(inputLayout)
+            .setPositiveButton(android.R.string.ok, null)
+            .setNegativeButton(R.string.cancel) { _, _ -> revertAccentToggle() }
+            .setOnCancelListener { revertAccentToggle() }
+            .show()
+
+        dialog.getButton(androidx.appcompat.app.AlertDialog.BUTTON_POSITIVE).setOnClickListener {
+            val raw = input.text.toString().trim()
+            val hex = if (raw.startsWith("#")) raw else "#$raw"
+            try {
+                Color.parseColor(hex)
+                prefs.edit()
+                    .putString("accent_preset", ThemeHelper.PRESET_CUSTOM)
+                    .putString("accent_custom_color", hex)
+                    .apply()
+                dialog.dismiss()
+                requireActivity().recreate()
+            } catch (_: Exception) {
+                Toast.makeText(ctx, R.string.accent_invalid_color, Toast.LENGTH_SHORT).show()
+            }
+        }
+    }
+
+    private fun revertAccentToggle() {
+        val saved = prefs.getString("accent_preset", ThemeHelper.PRESET_BLUE)
+        binding.accentToggle.check(when (saved) {
+            ThemeHelper.PRESET_RED -> R.id.btnAccentOrange
+            ThemeHelper.PRESET_GREEN  -> R.id.btnAccentGreen
+            ThemeHelper.PRESET_CUSTOM -> R.id.btnAccentCustom
+            else                      -> R.id.btnAccentBlue
+        })
     }
 
     private fun showItemPicker(items: MutableList<Int>, slotIndex: Int, adapter: NavItemAdapter) {
-        if (items === slots && !prefs.getBoolean("bottom_nav", false)) return
+        val isBottom = prefs.getBoolean("bottom_nav", false)
+        if (items === slots && !isBottom) return
+        if (items === quickActions && isBottom) return
         val ctx = requireContext()
         val otherIds = items.filterIndexed { i, _ -> i != slotIndex }.toSet()
         val available = NavCustomization.ALL_SWAPPABLE.filter { it.id !in otherIds }
@@ -147,6 +273,7 @@ class SettingsAppearanceFragment : Fragment() {
             LayoutInflater.from(ctx).inflate(R.layout.item_more_nav, listLayout, false).also { row ->
                 row.findViewById<ImageView>(R.id.ivIcon).setImageResource(item.iconRes)
                 row.findViewById<TextView>(R.id.tvLabel).setText(item.titleRes)
+                row.findViewById<TextView>(R.id.tvDescription).visibility = View.GONE
                 listLayout.addView(row)
             }
         }
@@ -169,7 +296,8 @@ class SettingsAppearanceFragment : Fragment() {
 
     private inner class NavItemAdapter(
         val items: MutableList<Int>,
-        val onSave: () -> Unit
+        val onSave: () -> Unit,
+        val isEnabled: () -> Boolean = { true }
     ) : RecyclerView.Adapter<NavItemAdapter.VH>() {
 
         inner class VH(view: View) : RecyclerView.ViewHolder(view) {
@@ -191,7 +319,12 @@ class SettingsAppearanceFragment : Fragment() {
             val def = NavCustomization.ALL_SWAPPABLE.find { it.id == items[position] } ?: return
             holder.ivNavIcon.setImageResource(def.iconRes)
             holder.tvNavLabel.setText(def.titleRes)
-            holder.itemView.setOnClickListener { showItemPicker(items, holder.adapterPosition, this) }
+            val enabled = isEnabled()
+            holder.itemView.setOnClickListener(
+                if (enabled) View.OnClickListener { showItemPicker(items, holder.adapterPosition, this) }
+                else null
+            )
+            holder.itemView.isClickable = enabled
         }
     }
 

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

@@ -1,7 +1,10 @@
 package sh.sar.basedbank.ui.home
 
+import android.Manifest
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
+import android.provider.Settings as AndroidSettings
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.net.Uri
@@ -15,6 +18,7 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
@@ -77,6 +81,29 @@ class SettingsLoginsFragment : Fragment() {
         handlePickedImage(bitmap)
     }
 
+    private val cameraPermissionLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestPermission()
+    ) { granted ->
+        if (granted) cameraLauncher.launch(cameraPhotoUri ?: return@registerForActivityResult)
+        else showCameraPermissionRationale()
+    }
+
+    private fun showCameraPermissionRationale() {
+        val ctx = requireContext()
+        MaterialAlertDialogBuilder(ctx)
+            .setTitle(R.string.qr_camera_permission_title)
+            .setMessage(R.string.camera_permission_profile_message)
+            .setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
+            .setPositiveButton(R.string.go_to_settings) { _, _ ->
+                startActivity(
+                    Intent(AndroidSettings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+                        data = Uri.fromParts("package", ctx.packageName, null)
+                    }
+                )
+            }
+            .show()
+    }
+
     private fun loadAndScaleBitmap(uri: Uri): Bitmap? {
         return try {
             val ctx = requireContext()
@@ -159,7 +186,11 @@ class SettingsLoginsFragment : Fragment() {
             val photoFile = File(ctx.cacheDir, "profile_photo_tmp.jpg")
             val uri = FileProvider.getUriForFile(ctx, "${ctx.packageName}.fileprovider", photoFile)
             cameraPhotoUri = uri
-            cameraLauncher.launch(uri)
+            if (ContextCompat.checkSelfPermission(ctx, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
+                cameraLauncher.launch(uri)
+            } else {
+                cameraPermissionLauncher.launch(Manifest.permission.CAMERA)
+            }
         }
         if (target is PendingImageTarget.Mib || currentBitmap != null || hasSavedImage(ctx, target)) {
             items += Triple(R.drawable.ic_delete, getString(R.string.profile_image_remove)) {

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

@@ -86,17 +86,6 @@ class SettingsSecurityFragment : Fragment() {
             (activity as? HomeActivity)?.resetAutolockTimer()
         }
 
-        // Hide sensitive information (enables/disables the eye icon in toolbar)
-        val viewModel = (requireActivity() as HomeActivity).let {
-            androidx.lifecycle.ViewModelProvider(it)[HomeViewModel::class.java]
-        }
-        binding.switchHideAmounts.isChecked = prefs.getBoolean("hide_sensitive_info", false)
-        binding.switchHideAmounts.setOnCheckedChangeListener { _, isChecked ->
-            prefs.edit().putBoolean("hide_sensitive_info", isChecked).apply()
-            if (!isChecked) viewModel.hideAmounts.value = false
-            requireActivity().invalidateOptionsMenu()
-        }
-
         // Block screenshots
         val blockScreenshots = prefs.getBoolean("block_screenshots", true)
         binding.switchBlockScreenshots.isChecked = blockScreenshots

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

@@ -92,9 +92,18 @@ class TransferFragment : Fragment() {
     // Values: "FAHIPAY_TRANSFER", "RAASTAS", "OOREDOO_BILL"
     private var selectedFahipayService: String? = null
 
+    // Form state preserved across view destroy/create when the fragment instance is cached
+    private var savedAmount = ""
+    private var savedRemarks = ""
+    private var savedToText = ""
+    private var savedToSubtitle = ""
+    private var savedToColorHex = "#607D8B"
+    private var savedToImageHash: String? = null
+
     // BML QR merchant payment mode (set when navigated from a card QR scan)
     private var bmlQrInfo: BmlQrPayInfo? = null
     private var bmlGatewayQr = false  // true for pay.bml.com.mv QRs (requires pre-initiate step)
+    private var bmlQrLookupAttempted = false  // prevents re-lookup after user clears the merchant
     private val dropdownProfileImageCache = mutableMapOf<String, Bitmap>()
 
     // BML business profile OTP flow state
@@ -125,9 +134,12 @@ class TransferFragment : Fragment() {
         val raw = result.data?.getStringExtra(QrScannerActivity.EXTRA_QR_CONTENT) ?: return@registerForActivityResult
 
         // BML card/gateway QR — hand off to dedicated payment screen
-        if (raw.startsWith("https://ebanking.bankofmaldives.com.mv/qrpay/") ||
-            raw.startsWith("https://pay.bml.com.mv/app/")) {
-            (requireActivity() as HomeActivity).navigateTo(R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(raw))
+        val bmlUrl = PaymvQrParser.extractBmlGatewayUrl(raw)
+        if (raw.startsWith("https://ebanking.bankofmaldives.com.mv/qrpay/") || bmlUrl != 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(bmlUrl ?: raw, fromCard?.accountNumber))
             return@registerForActivityResult
         }
 
@@ -136,6 +148,28 @@ class TransferFragment : Fragment() {
             Toast.makeText(requireContext(), R.string.transfer_qr_invalid, Toast.LENGTH_SHORT).show()
             return@registerForActivityResult
         }
+
+        // Cards can't pay PayMV QR — fall back to default account or clear selection
+        val isCard = selectedAccount?.let {
+            it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT" || it.profileType == "BML_DEBIT"
+        } ?: false
+        if (isCard) {
+            Toast.makeText(requireContext(), R.string.card_qr_paymv_unsupported, Toast.LENGTH_SHORT).show()
+            val defaultNum = CredentialStore(requireContext()).getDefaultAccountNumber()
+            val defaultAcc = defaultNum?.let { num -> viewModel.accounts.value?.firstOrNull { it.accountNumber == num } }
+            selectedAccount = defaultAcc
+            binding.tilAmount.prefixText = null
+            if (defaultAcc != null) {
+                updateAmountPrefix(defaultAcc)
+                showFromCard(defaultAcc)
+            } else {
+                binding.cardFromInfo.visibility = View.GONE
+                binding.tilFrom.visibility = View.VISIBLE
+                binding.actvFrom.setText("", false)
+            }
+            updateTransferButton()
+        }
+
         if (qr.amount != null) binding.etAmount.setText(qr.amount)
         if (qr.purpose != null) binding.etRemarks.setText(qr.purpose)
         prefillToFromContact(qr.accountNumber, "")
@@ -188,13 +222,15 @@ class TransferFragment : Fragment() {
             accountNumber: String,
             displayName: String,
             amount: String?,
-            remarks: String?
+            remarks: String?,
+            fromAccountNumber: String? = null
         ) = TransferFragment().apply {
             arguments = Bundle().apply {
                 putString(ARG_ACCOUNT, accountNumber)
                 putString(ARG_NAME, displayName)
                 putString(ARG_SUBTITLE, accountNumber)
                 putString(ARG_COLOR, "#607D8B")
+                if (fromAccountNumber != null) putString(ARG_FROM_ACCOUNT, fromAccountNumber)
                 if (amount != null) putString(ARG_AMOUNT_PREFILL, amount)
                 if (remarks != null) putString(ARG_REMARKS_PREFILL, remarks)
             }
@@ -218,11 +254,27 @@ class TransferFragment : Fragment() {
 
         childFragmentManager.setFragmentResultListener(ContactPickerSheetFragment.REQUEST_KEY, viewLifecycleOwner) { _, bundle ->
             val accountNumber = bundle.getString(ContactPickerSheetFragment.KEY_ACCOUNT_NUMBER) ?: return@setFragmentResultListener
+            if (accountNumber.startsWith("bmlqr:")) {
+                lookupBmlQrMerchant(accountNumber.removePrefix("bmlqr:"))
+                return@setFragmentResultListener
+            }
             val label     = bundle.getString(ContactPickerSheetFragment.KEY_LABEL) ?: ""
             val subtitle  = bundle.getString(ContactPickerSheetFragment.KEY_SUBTITLE) ?: accountNumber
             val colorHex  = bundle.getString(ContactPickerSheetFragment.KEY_COLOR) ?: "#607D8B"
             val imageHash = bundle.getString(ContactPickerSheetFragment.KEY_IMAGE_HASH)
             prefillToDirectly(accountNumber, label, subtitle, colorHex, imageHash)
+            if (selectedAccount == null) {
+                val defaultNum = CredentialStore(requireContext()).getDefaultAccountNumber()
+                if (defaultNum != null) {
+                    val defaultAcc = viewModel.accounts.value?.firstOrNull { it.accountNumber == defaultNum }
+                    if (defaultAcc != null) {
+                        selectedAccount = defaultAcc
+                        updateAmountPrefix(defaultAcc)
+                        showFromCard(defaultAcc)
+                        updateTransferButton()
+                    }
+                }
+            }
         }
 
         binding.btnPickContact.setOnClickListener {
@@ -262,9 +314,37 @@ class TransferFragment : Fragment() {
         if (arguments?.getBoolean(ARG_AUTO_SCAN, false) == true) {
             qrLauncher.launch(Intent(requireContext(), QrScannerActivity::class.java))
         }
+
+        // Restore form state when view is recreated on the cached no-args instance
+        if (arguments == null) {
+            if (resolvedAccountNumber.isNotEmpty()) {
+                val ownAccount = viewModel.accounts.value?.firstOrNull { it.accountNumber == resolvedAccountNumber }
+                if (ownAccount != null) {
+                    showToCard(ownAccount)
+                } else {
+                    binding.tvToAccountName.text = resolvedRecipientName
+                    binding.tvToBankBic.text = savedToSubtitle
+                    binding.tvToAccountDetails.visibility = View.GONE
+                    binding.tvToBalance.visibility = View.GONE
+                    binding.ivToPhoto.scaleType = android.widget.ImageView.ScaleType.CENTER_CROP
+                    binding.ivToPhoto.setImageBitmap(makeInitialsBitmap(resolvedRecipientName, savedToColorHex))
+                }
+                binding.tilTo.visibility = View.GONE
+                binding.btnPickContact.visibility = View.GONE
+                binding.btnScanQr.visibility = View.GONE
+                binding.cardToInfo.visibility = View.VISIBLE
+                if (savedToImageHash != null) loadToPhoto(savedToImageHash!!, isProfile = resolvedToOwnAccount != null)
+            } else if (savedToText.isNotEmpty()) {
+                binding.etTo.setText(savedToText)
+            }
+            if (savedAmount.isNotEmpty()) binding.etAmount.setText(savedAmount)
+            if (savedRemarks.isNotEmpty()) binding.etRemarks.setText(savedRemarks)
+            updateTransferButton()
+        }
     }
 
     private fun lookupBmlQrMerchant(qrUrl: String) {
+        bmlQrLookupAttempted = true
         bmlGatewayQr = qrUrl.startsWith("https://pay.bml.com.mv/app/")
         val base64Url = android.util.Base64.encodeToString(
             qrUrl.toByteArray(Charsets.UTF_8), android.util.Base64.NO_WRAP)
@@ -289,6 +369,35 @@ class TransferFragment : Fragment() {
                 return@launch
             }
             bmlQrInfo = info
+            if (info.amount == 0.0) {
+                RecentsCache.save(requireContext(), RecentPick(
+                    accountNumber = "bmlqr:$qrUrl",
+                    displayName   = info.merchantName,
+                    subtitle      = info.merchantAddress.ifBlank { "BML Merchant" },
+                    colorHex      = "#0066A1",
+                    imageHash     = null,
+                    isProfileImage = false
+                ))
+            }
+
+            // Auto-select the user's default BML card if no card was pre-selected
+            if (selectedAccount == null) {
+                val defaultNum = CredentialStore(requireContext()).getDefaultCardAccountNumber()
+                if (defaultNum != null) {
+                    val allAccounts = viewModel.accounts.value ?: emptyList()
+                    val defaultCard = allAccounts.firstOrNull {
+                        it.accountNumber == defaultNum &&
+                        (it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT" || it.profileType == "BML_DEBIT") &&
+                        it.statusDesc.equals("Active", ignoreCase = true)
+                    }
+                    if (defaultCard != null) {
+                        selectedAccount = defaultCard
+                        updateAmountPrefix(defaultCard)
+                        showFromCard(defaultCard)
+                        updateTransferButton()
+                    }
+                }
+            }
 
             // Show merchant in the "To" card — clear button hidden (can't change recipient for QR)
             binding.tvToAccountName.text = info.merchantName
@@ -297,7 +406,6 @@ class TransferFragment : Fragment() {
             binding.tvToBalance.visibility = View.GONE
             binding.ivToPhoto.scaleType = android.widget.ImageView.ScaleType.CENTER_CROP
             binding.ivToPhoto.setImageBitmap(makeInitialsBitmap(info.merchantName, "#0066A1"))
-            binding.btnClearToInfo.visibility = View.GONE
             binding.cardToInfo.visibility = View.VISIBLE
 
             // Pre-fill amount if dynamic QR
@@ -353,6 +461,14 @@ class TransferFragment : Fragment() {
 
             binding.actvFrom.setOnItemClickListener { _, _, position, _ ->
                 val picked = accountDropdownAdapter?.getAccount(position) ?: return@setOnItemClickListener
+                if (bmlQrInfo != null) {
+                    val isCard = picked.profileType == "BML_PREPAID" || picked.profileType == "BML_CREDIT" || picked.profileType == "BML_DEBIT"
+                    if (!isCard) {
+                        Toast.makeText(requireContext(), "Unsupported for BML QR — select a card", Toast.LENGTH_SHORT).show()
+                        binding.actvFrom.setText("", false)
+                        return@setOnItemClickListener
+                    }
+                }
                 selectedAccount = picked
                 updateAmountPrefix(picked)
                 showFromCard(picked)
@@ -369,6 +485,35 @@ class TransferFragment : Fragment() {
                     updateTransferButton()
                 }
             }
+
+            // Auto-select default account when arriving from contacts page (TO account already pre-filled)
+            if (selectedAccount == null && arguments?.getString(ARG_ACCOUNT) != null) {
+                val defaultNum = CredentialStore(requireContext()).getDefaultAccountNumber()
+                if (defaultNum != null) {
+                    val defaultAcc = accounts.firstOrNull { it.accountNumber == defaultNum }
+                    if (defaultAcc != null) {
+                        selectedAccount = defaultAcc
+                        updateAmountPrefix(defaultAcc)
+                        showFromCard(defaultAcc)
+                        updateTransferButton()
+                    }
+                }
+            }
+
+            // On a cold start (e.g. share intent), anyBmlSession() may be null when
+            // onViewCreated runs. Retry the lookup once sessions are available.
+            val pendingBmlQrUrl = arguments?.getString(ARG_BML_QR_URL)
+            if (pendingBmlQrUrl != null && !bmlQrLookupAttempted) {
+                val app = requireActivity().application as BasedBankApp
+                if (app.anyBmlSession() != null) lookupBmlQrMerchant(pendingBmlQrUrl)
+            }
+
+            // Re-render the from card when the view is recreated on a cached instance
+            if (selectedAccount != null && binding.cardFromInfo.visibility != View.VISIBLE) {
+                updateAmountPrefix(selectedAccount!!)
+                showFromCard(selectedAccount!!)
+                updateTransferButton()
+            }
         }
     }
 
@@ -506,6 +651,14 @@ class TransferFragment : Fragment() {
         binding.tilTo.setEndIconOnClickListener { lookupAccount() }
 
         binding.btnClearToInfo.setOnClickListener {
+            if (bmlQrInfo != null) {
+                bmlQrInfo = null
+                bmlGatewayQr = false
+                binding.tilAmount.isEnabled = true
+                binding.tilRemarks.isEnabled = true
+                binding.tilRemarks.alpha = 1f
+                binding.etAmount.setText("")
+            }
             resolvedAccountNumber = ""
             resolvedRecipientName = ""
             resolvedToOwnAccount = null
@@ -536,8 +689,21 @@ class TransferFragment : Fragment() {
 
     private fun lookupAccount() {
         if (selectedAccount == null) {
-            Toast.makeText(requireContext(), R.string.transfer_select_source_first, Toast.LENGTH_SHORT).show()
-            return
+            val defaultNum = CredentialStore(requireContext()).getDefaultAccountNumber()
+            if (defaultNum != null) {
+                val allAccounts = viewModel.accounts.value ?: emptyList()
+                val defaultAcc = allAccounts.firstOrNull { it.accountNumber == defaultNum }
+                if (defaultAcc != null) {
+                    selectedAccount = defaultAcc
+                    updateAmountPrefix(defaultAcc)
+                    showFromCard(defaultAcc)
+                    updateTransferButton()
+                }
+            }
+            if (selectedAccount == null) {
+                Toast.makeText(requireContext(), R.string.transfer_no_from_account, Toast.LENGTH_SHORT).show()
+                return
+            }
         }
         val accountNumber = AccountInputParser.normalize(binding.etTo.text?.toString()?.trim() ?: "")
         if (accountNumber.isBlank()) {
@@ -633,6 +799,13 @@ class TransferFragment : Fragment() {
                 resolvedAccountNumber = info.accountNumber
                 resolvedRecipientName = info.accountName
                 resolvedBankName = info.bankId
+                savedToSubtitle = "${info.accountNumber} · ${info.bankId}"
+                savedToColorHex = colorHex
+                savedToImageHash = when {
+                    matchedAcc?.profileImageHash != null -> matchedAcc.profileImageHash
+                    matchedCont?.customerImgHash != null -> matchedCont.customerImgHash
+                    else -> null
+                }
 
                 if (matchedAcc != null) {
                     showToCard(matchedAcc)
@@ -765,6 +938,9 @@ class TransferFragment : Fragment() {
     ) {
         resolvedAccountNumber = accountNumber
         resolvedRecipientName = displayName
+        savedToSubtitle = subtitle
+        savedToColorHex = colorHex
+        savedToImageHash = imageHash
         val contacts = viewModel.contacts.value ?: emptyList()
         resolvedBankName = contacts.firstOrNull { it.benefAccount == accountNumber }?.benefBankName ?: ""
 
@@ -820,13 +996,20 @@ class TransferFragment : Fragment() {
         message: String? = null,
         customView: android.view.View? = null,
         biometricSubtitle: String,
-        onConfirmed: () -> Unit
+        onConfirmed: (AlertDialog, android.widget.FrameLayout) -> Unit
     ) {
+        val imm = requireContext().getSystemService(Context.INPUT_METHOD_SERVICE) as android.view.inputmethod.InputMethodManager
+        imm.hideSoftInputFromWindow(requireView().windowToken, 0)
+
+        val frame = android.widget.FrameLayout(requireContext())
+        if (customView != null) frame.addView(customView)
+
         val builder = MaterialAlertDialogBuilder(requireContext())
             .setTitle(title)
-            .setPositiveButton(R.string.transfer_confirm) { _, _ -> onConfirmed() }
-            .setNegativeButton(android.R.string.cancel, null)
-        if (customView != null) builder.setView(customView) else builder.setMessage(message)
+            .setPositiveButton(R.string.transfer_confirm, null)
+            .setNegativeButton(android.R.string.cancel) { d, _ -> d.dismiss() }
+            .setCancelable(false)
+        if (customView != null) builder.setView(frame) else builder.setMessage(message)
         val dialog = builder.show()
         val prefs = requireContext().getSharedPreferences("prefs", Context.MODE_PRIVATE)
         val biometricTransferConfirm = prefs.getBoolean("biometrics_transfer_confirm", false)
@@ -837,8 +1020,7 @@ class TransferFragment : Fragment() {
                 val prompt = BiometricPrompt(this, ContextCompat.getMainExecutor(requireContext()),
                     object : BiometricPrompt.AuthenticationCallback() {
                         override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
-                            dialog.dismiss()
-                            onConfirmed()
+                            onConfirmed(dialog, frame)
                         }
                         override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
                             if (errorCode != BiometricPrompt.ERROR_CANCELED &&
@@ -857,6 +1039,10 @@ class TransferFragment : Fragment() {
                         .build()
                 )
             }
+        } else {
+            dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
+                onConfirmed(dialog, frame)
+            }
         }
     }
 
@@ -875,11 +1061,27 @@ class TransferFragment : Fragment() {
                 Toast.makeText(requireContext(), R.string.transfer_missing_internal_id, Toast.LENGTH_SHORT).show()
                 return
             }
+            val qrFromTypeLabel = AccountListParser.from(src)?.typeLabel
+                ?: BmlDashboardParser.productLabel(src.accountTypeName)
+            val qrFromDetail = listOfNotNull("BML", qrFromTypeLabel.ifBlank { null }).joinToString(" · ")
+            val qrConfirmView = buildTransferConfirmView(
+                amountCurrency = info.currency,
+                amountValue = "%.2f".format(amount),
+                fromName = src.accountBriefName,
+                fromNumber = src.accountNumber,
+                fromDetail = qrFromDetail,
+                toName = info.merchantName,
+                toNumber = "",
+                toDetail = info.merchantAddress.ifBlank { "BML Merchant" }
+            )
             showConfirmWithBiometric(
                 title = getString(R.string.transfer),
-                message = "Pay ${info.currency} ${"%.2f".format(amount)} to ${info.merchantName}?\n\nFrom: ${src.accountBriefName} · ${src.accountNumber}",
+                customView = qrConfirmView,
                 biometricSubtitle = "${info.currency} ${"%.2f".format(amount)} → ${info.merchantName}",
-                onConfirmed = { executeBmlQrPayment(src, debitAccount, info, amount) }
+                onConfirmed = { dialog, frame ->
+                    showProcessingInDialog(dialog, frame)
+                    executeBmlQrPayment(src, debitAccount, info, amount, dialog, frame)
+                }
             )
             return
         }
@@ -934,18 +1136,17 @@ class TransferFragment : Fragment() {
         val isUsdToMvr = currency.equals("USD", ignoreCase = true) && destCurrency.equals("MVR", ignoreCase = true)
         val isSrcCredit = src.profileType == "BML_CREDIT"
 
-        val mainMsg = "Send $currency $amountStr to $destDisplay?\n\nFrom: ${src.accountBriefName} · ${src.accountNumber}"
-
-        val doTransfer: () -> Unit = {
+        val doTransfer: (AlertDialog, android.widget.FrameLayout) -> Unit = { dialog, frame ->
             if (isBmlBusiness) {
-                // Business profile: async OTP channel selection flow
+                // Business profile: async OTP channel selection flow — dismiss dialog first
+                dialog.dismiss()
                 startBmlBusinessOtpFlow(
                     src, resolvedAccountNumber, destDisplay, amount, amountStr, remarks,
                     isSrcCard, isDestMib, currency, allAccounts, allContacts, capturedToAvatar
                 )
             } else {
+                showProcessingInDialog(dialog, frame)
                 binding.btnTransfer.isEnabled = false
-                (activity as? HomeActivity)?.setRefreshing(true)
                 viewLifecycleOwner.lifecycleScope.launch {
                     val (ok, msg, receipt) = withContext(Dispatchers.IO) {
                         if (!isSrcBml) {
@@ -955,14 +1156,15 @@ class TransferFragment : Fragment() {
                         }
                     }
                     binding.btnTransfer.isEnabled = true
-                    (activity as? HomeActivity)?.setRefreshing(false)
                     if (ok && receipt != null) {
                         ReceiptStore.save(requireContext(), receipt)
                         clearForm()
                         val activity = requireActivity() as HomeActivity
                         activity.triggerRefresh()
+                        dialog.dismiss()
                         activity.showWithBackStack(TransferReceiptFragment.newInstance(receipt, capturedToAvatar))
                     } else if (!ok) {
+                        dialog.dismiss()
                         if (msg == "CONNECTIVITY") {
                             (activity as? HomeActivity)?.showConnectivityBanner(getString(R.string.connectivity_no_internet))
                         } else {
@@ -973,56 +1175,202 @@ class TransferFragment : Fragment() {
             }
         }
 
-        val warningView: android.view.View? = if (isUsdToMvr || isSrcCredit) {
-            val ctx = requireContext()
-            val dp = resources.displayMetrics.density
-            LinearLayout(ctx).apply {
-                orientation = LinearLayout.VERTICAL
-                setPadding((24 * dp).toInt(), (16 * dp).toInt(), (24 * dp).toInt(), 0)
-                addView(TextView(ctx).apply { text = mainMsg })
-                if (isUsdToMvr) addView(TextView(ctx).apply {
-                    text = "⚠ You are transferring from a USD account to an MVR account. The currency will be converted at the bank's rate and this cannot be reversed!"
-                    setTextColor(Color.RED)
-                    textSize = 16f
-                    typeface = Typeface.DEFAULT_BOLD
-                    setPadding(0, (16 * dp).toInt(), 0, 0)
-                })
-                if (isSrcCredit) addView(TextView(ctx).apply {
-                    text = "⚠ Transferring from a credit card is treated as a cash advance. Cash advance fees will be charged on the 10th of the month."
-                    setTextColor(Color.RED)
-                    textSize = 16f
-                    typeface = Typeface.DEFAULT_BOLD
-                    setPadding(0, (16 * dp).toInt(), 0, 0)
-                })
+        val fromTypeLabel = AccountListParser.from(src)?.typeLabel
+            ?: if (src.bank == "BML") BmlDashboardParser.productLabel(src.accountTypeName)
+            else src.accountTypeName.ifBlank { src.profileType }
+        val fromBankLabel = when (src.bank) {
+            "BML"     -> "BML"
+            "FAHIPAY" -> "Fahipay"
+            "MIB"     -> "MIB"
+            else      -> src.bank
+        }
+        val fromDetail = listOfNotNull(fromBankLabel.ifBlank { null }, fromTypeLabel.ifBlank { null }).joinToString(" · ")
+
+        val toTypeLabel = resolvedToOwnAccount?.let { acc ->
+            AccountListParser.from(acc)?.typeLabel
+                ?: if (acc.bank == "BML") BmlDashboardParser.productLabel(acc.accountTypeName)
+                else acc.accountTypeName.ifBlank { acc.profileType }
+        }
+        val toBankLabel = resolvedToOwnAccount?.let { acc ->
+            when (acc.bank) {
+                "BML"     -> "BML"
+                "FAHIPAY" -> "Fahipay"
+                "MIB"     -> "MIB"
+                else      -> acc.bank
             }
-        } else null
+        } ?: when {
+            bankNameCapture.equals("MALBMVMV", ignoreCase = true) -> "BML"
+            bankNameCapture.equals("MADVMVMV", ignoreCase = true) -> "MIB"
+            bankNameCapture.isNotBlank() -> bankNameCapture
+            isDestMib -> "MIB"
+            else -> when (selectedFahipayService) {
+                "RAASTAS"         -> "Ooredoo · Raastas"
+                "OOREDOO_BILL"    -> "Ooredoo · Bill Pay"
+                "DHIRAAGU_RELOAD" -> "Dhiraagu · Reload"
+                "DHIRAAGU_BILL"   -> "Dhiraagu · Bill Pay"
+                else              -> ""
+            }
+        }
+        val toDetail = listOfNotNull(toBankLabel.ifBlank { null }, toTypeLabel?.ifBlank { null }).joinToString(" · ")
+
+        val warnings = buildList {
+            if (isUsdToMvr) add("⚠ You are transferring from a USD account to an MVR account. The currency will be converted at the bank's rate and this cannot be reversed!")
+            if (isSrcCredit) add("⚠ Transferring from a credit card is treated as a cash advance. Cash advance fees will be charged on the 10th of the month.")
+        }
+        val confirmView = buildTransferConfirmView(
+            amountCurrency = currency,
+            amountValue = "%.2f".format(amount),
+            fromName = src.accountBriefName,
+            fromNumber = src.accountNumber,
+            fromDetail = fromDetail,
+            toName = destDisplay,
+            toNumber = resolvedAccountNumber,
+            toDetail = toDetail,
+            warningTexts = warnings
+        )
         showConfirmWithBiometric(
             title = getString(R.string.transfer),
-            message = if (warningView == null) mainMsg else null,
-            customView = warningView,
-            biometricSubtitle = "$currency $amountStr → $destDisplay",
-            onConfirmed = { doTransfer() }
+            customView = confirmView,
+            biometricSubtitle = "$currency ${"%.2f".format(amount)} → $destDisplay",
+            onConfirmed = { dialog, frame -> doTransfer(dialog, frame) }
         )
     }
 
+    private fun buildTransferConfirmView(
+        amountCurrency: String,
+        amountValue: String,
+        fromName: String,
+        fromNumber: String,
+        fromDetail: String,
+        toName: String,
+        toNumber: String,
+        toDetail: String,
+        warningTexts: List<String> = emptyList()
+    ): android.view.View {
+        val ctx = requireContext()
+        val dp = resources.displayMetrics.density
+        val colorOnSurface = com.google.android.material.color.MaterialColors.getColor(
+            requireView(), com.google.android.material.R.attr.colorOnSurface, Color.BLACK)
+        val colorMuted = com.google.android.material.color.MaterialColors.getColor(
+            requireView(), com.google.android.material.R.attr.colorOnSurfaceVariant, Color.GRAY)
+        val colorPrimary = com.google.android.material.color.MaterialColors.getColor(
+            requireView(), com.google.android.material.R.attr.colorPrimary, Color.BLUE)
+        val MATCH = LinearLayout.LayoutParams.MATCH_PARENT
+        val WRAP  = LinearLayout.LayoutParams.WRAP_CONTENT
+
+        fun lp(w: Int = MATCH, h: Int = WRAP, init: LinearLayout.LayoutParams.() -> Unit = {}) =
+            LinearLayout.LayoutParams(w, h).apply(init)
+
+        fun accountBlock(label: String, name: String, number: String, detail: String) =
+            LinearLayout(ctx).apply {
+                orientation = LinearLayout.VERTICAL
+                gravity = Gravity.CENTER_HORIZONTAL
+                layoutParams = lp()
+                addView(TextView(ctx).apply {
+                    text = label
+                    textSize = 10f
+                    isAllCaps = true
+                    letterSpacing = 0.12f
+                    setTextColor(colorMuted)
+                    gravity = Gravity.CENTER
+                })
+                addView(TextView(ctx).apply {
+                    text = name
+                    textSize = 16f
+                    setTypeface(null, Typeface.BOLD)
+                    setTextColor(colorOnSurface)
+                    gravity = Gravity.CENTER
+                    layoutParams = lp { topMargin = (2 * dp).toInt() }
+                })
+                if (number.isNotBlank()) addView(TextView(ctx).apply {
+                    text = number
+                    textSize = 13f
+                    setTextColor(colorMuted)
+                    gravity = Gravity.CENTER
+                })
+                if (detail.isNotBlank()) addView(TextView(ctx).apply {
+                    text = detail
+                    textSize = 12f
+                    setTextColor(colorMuted)
+                    gravity = Gravity.CENTER
+                    alpha = 0.75f
+                })
+            }
+
+        return LinearLayout(ctx).apply {
+            orientation = LinearLayout.VERTICAL
+            gravity = Gravity.CENTER_HORIZONTAL
+            setPadding((20 * dp).toInt(), (8 * dp).toInt(), (20 * dp).toInt(), (8 * dp).toInt())
+
+            // Currency + amount on same line, centered, baseline-aligned
+            addView(LinearLayout(ctx).apply {
+                orientation = LinearLayout.HORIZONTAL
+                gravity = Gravity.CENTER_HORIZONTAL
+                layoutParams = lp { bottomMargin = (20 * dp).toInt() }
+                addView(TextView(ctx).apply {
+                    text = "$amountCurrency "
+                    textSize = 16f
+                    setTextColor(colorMuted)
+                    layoutParams = LinearLayout.LayoutParams(WRAP, WRAP)
+                })
+                addView(TextView(ctx).apply {
+                    text = amountValue
+                    textSize = 34f
+                    setTypeface(null, Typeface.BOLD)
+                    setTextColor(colorPrimary)
+                })
+            })
+
+            addView(accountBlock("From", fromName, fromNumber, fromDetail))
+
+            // Down arrow — centered
+            addView(ImageView(ctx).apply {
+                setImageResource(R.drawable.ic_arrow_right)
+                rotation = 90f
+                setColorFilter(colorMuted)
+                layoutParams = lp(WRAP, WRAP) {
+                    gravity = Gravity.CENTER_HORIZONTAL
+                    width  = (24 * dp).toInt()
+                    height = (24 * dp).toInt()
+                    topMargin    = (12 * dp).toInt()
+                    bottomMargin = (12 * dp).toInt()
+                }
+            })
+
+            addView(accountBlock("To", toName, toNumber, toDetail))
+
+            for (warning in warningTexts) {
+                addView(TextView(ctx).apply {
+                    text = warning
+                    setTextColor(Color.RED)
+                    textSize = 14f
+                    setTypeface(null, Typeface.BOLD)
+                    layoutParams = lp { topMargin = (16 * dp).toInt() }
+                })
+            }
+        }
+    }
+
     private fun executeBmlQrPayment(
         src: BankAccount,
         debitAccount: String,
         info: BmlQrPayInfo,
-        amount: Double
+        amount: Double,
+        dialog: AlertDialog,
+        frame: android.widget.FrameLayout
     ) {
         val app = requireActivity().application as BasedBankApp
         val loginId = src.loginTag.removePrefix("bml_")
         val session = bmlSessionFor(src) ?: run {
+            dialog.dismiss()
             Toast.makeText(requireContext(), R.string.transfer_session_unavailable, Toast.LENGTH_SHORT).show()
             return
         }
         val otp = CredentialStore(requireContext()).loadBmlCredentials(loginId)?.otpSeed
             ?.let { Totp.generate(it) }
-            ?: run { Toast.makeText(requireContext(), "OTP unavailable", Toast.LENGTH_SHORT).show(); return }
+            ?: run { dialog.dismiss(); Toast.makeText(requireContext(), "OTP unavailable", Toast.LENGTH_SHORT).show(); return }
 
         binding.btnTransfer.isEnabled = false
-        (activity as? HomeActivity)?.setRefreshing(true)
 
         viewLifecycleOwner.lifecycleScope.launch {
             val result = withContext(Dispatchers.IO) {
@@ -1043,75 +1391,174 @@ class TransferFragment : Fragment() {
                     sh.sar.basedbank.api.bml.BmlQrPayResult(false, errorMessage = e.message ?: "Payment failed")
                 }
             }
-            (activity as? HomeActivity)?.setRefreshing(false)
             if (_binding == null) return@launch
 
             if (result == null) {
+                dialog.dismiss()
                 binding.btnTransfer.isEnabled = true
                 Toast.makeText(requireContext(), "Failed to initiate payment", Toast.LENGTH_LONG).show()
                 return@launch
             }
             if (result.success) {
-                showBmlQrSuccessDialog(
-                    merchant = result.merchant.ifBlank { info.merchantName },
-                    amount   = result.amount.ifBlank { "%.2f".format(amount) },
-                    currency = result.currency.ifBlank { info.currency }
-                )
+                showSuccessInDialog(
+                    dialog, frame,
+                    amountCurrency = result.currency.ifBlank { info.currency },
+                    amountValue = result.amount.ifBlank { "%.2f".format(amount) },
+                    fromName = src.accountBriefName,
+                    toName = result.merchant.ifBlank { info.merchantName }
+                ) {
+                    clearForm()
+                    (activity as? HomeActivity)?.triggerRefresh()
+                }
             } else {
+                dialog.dismiss()
                 binding.btnTransfer.isEnabled = true
                 Toast.makeText(requireContext(), result.errorMessage, Toast.LENGTH_LONG).show()
             }
         }
     }
 
-    private fun showBmlQrSuccessDialog(merchant: String, amount: String, currency: String) {
+    private fun showProcessingInDialog(dialog: AlertDialog, frame: android.widget.FrameLayout) {
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE)?.visibility = View.GONE
+        dialog.getButton(AlertDialog.BUTTON_NEGATIVE)?.visibility = View.GONE
+        dialog.setCancelable(false)
         val ctx = requireContext()
         val dp = resources.displayMetrics.density
-        val container = android.widget.LinearLayout(ctx).apply {
-            orientation = android.widget.LinearLayout.VERTICAL
-            gravity = android.view.Gravity.CENTER_HORIZONTAL
-            setPadding((24 * dp).toInt(), (24 * dp).toInt(), (24 * dp).toInt(), (8 * dp).toInt())
+        val spinner = CircularProgressDrawable(ctx).apply {
+            setStyle(CircularProgressDrawable.LARGE)
+            setColorSchemeColors(com.google.android.material.color.MaterialColors.getColor(
+                requireView(), com.google.android.material.R.attr.colorPrimary, Color.GRAY))
+            start()
         }
-        container.addView(android.widget.ImageView(ctx).apply {
-            setImageResource(R.drawable.ic_check_circle)
-            setColorFilter(android.graphics.Color.parseColor("#4CAF50"))
-            layoutParams = android.widget.LinearLayout.LayoutParams(
-                (64 * dp).toInt(), (64 * dp).toInt()
-            ).apply { gravity = android.view.Gravity.CENTER_HORIZONTAL; bottomMargin = (16 * dp).toInt() }
+        frame.removeAllViews()
+        frame.addView(LinearLayout(ctx).apply {
+            orientation = LinearLayout.VERTICAL
+            gravity = Gravity.CENTER_HORIZONTAL
+            setPadding((24 * dp).toInt(), (24 * dp).toInt(), (24 * dp).toInt(), (24 * dp).toInt())
+            addView(ImageView(ctx).apply {
+                setImageDrawable(spinner)
+                layoutParams = LinearLayout.LayoutParams((48 * dp).toInt(), (48 * dp).toInt()).apply {
+                    gravity = Gravity.CENTER_HORIZONTAL
+                    bottomMargin = (12 * dp).toInt()
+                }
+            })
+            addView(TextView(ctx).apply {
+                text = "Processing..."
+                textSize = 16f
+                gravity = Gravity.CENTER
+                setTextColor(com.google.android.material.color.MaterialColors.getColor(
+                    requireView(), com.google.android.material.R.attr.colorOnSurface, Color.BLACK))
+            })
         })
-        container.addView(android.widget.TextView(ctx).apply {
-            text = "$currency $amount"
-            textSize = 28f
-            setTypeface(null, android.graphics.Typeface.BOLD)
-            setTextColor(com.google.android.material.color.MaterialColors.getColor(
-                requireView(), com.google.android.material.R.attr.colorOnSurface, android.graphics.Color.BLACK))
-            gravity = android.view.Gravity.CENTER
-            layoutParams = android.widget.LinearLayout.LayoutParams(
-                android.widget.LinearLayout.LayoutParams.WRAP_CONTENT,
-                android.widget.LinearLayout.LayoutParams.WRAP_CONTENT
-            ).apply { gravity = android.view.Gravity.CENTER_HORIZONTAL; bottomMargin = (8 * dp).toInt() }
-        })
-        container.addView(android.widget.TextView(ctx).apply {
-            text = merchant
-            textSize = 14f
-            setTextColor(com.google.android.material.color.MaterialColors.getColor(
-                requireView(), com.google.android.material.R.attr.colorOnSurfaceVariant, android.graphics.Color.GRAY))
-            gravity = android.view.Gravity.CENTER
-            layoutParams = android.widget.LinearLayout.LayoutParams(
-                android.widget.LinearLayout.LayoutParams.WRAP_CONTENT,
-                android.widget.LinearLayout.LayoutParams.WRAP_CONTENT
-            ).apply { gravity = android.view.Gravity.CENTER_HORIZONTAL }
-        })
-        MaterialAlertDialogBuilder(ctx)
-            .setTitle(R.string.bml_qr_payment_success)
-            .setView(container)
-            .setPositiveButton(android.R.string.ok) { _, _ ->
-                requireActivity().onBackPressedDispatcher.onBackPressed()
-            }
-            .setCancelable(false)
-            .show()
     }
 
+    private fun showSuccessInDialog(
+        dialog: AlertDialog,
+        frame: android.widget.FrameLayout,
+        amountCurrency: String,
+        amountValue: String,
+        fromName: String,
+        toName: String,
+        onDone: () -> Unit
+    ) {
+        val ctx = requireContext()
+        val dp = resources.displayMetrics.density
+        val colorOnSurface = com.google.android.material.color.MaterialColors.getColor(
+            requireView(), com.google.android.material.R.attr.colorOnSurface, Color.BLACK)
+        val colorMuted = com.google.android.material.color.MaterialColors.getColor(
+            requireView(), com.google.android.material.R.attr.colorOnSurfaceVariant, Color.GRAY)
+        val colorPrimary = com.google.android.material.color.MaterialColors.getColor(
+            requireView(), com.google.android.material.R.attr.colorPrimary, Color.BLUE)
+        val MATCH = LinearLayout.LayoutParams.MATCH_PARENT
+        val WRAP  = LinearLayout.LayoutParams.WRAP_CONTENT
+
+        frame.removeAllViews()
+        frame.addView(LinearLayout(ctx).apply {
+            orientation = LinearLayout.VERTICAL
+            gravity = Gravity.CENTER_HORIZONTAL
+            setPadding((24 * dp).toInt(), (20 * dp).toInt(), (24 * dp).toInt(), (8 * dp).toInt())
+
+            // Checkmark
+            addView(ImageView(ctx).apply {
+                setImageResource(R.drawable.ic_check_circle)
+                setColorFilter(Color.parseColor("#4CAF50"))
+                layoutParams = LinearLayout.LayoutParams((64 * dp).toInt(), (64 * dp).toInt()).apply {
+                    gravity = Gravity.CENTER_HORIZONTAL
+                    bottomMargin = (16 * dp).toInt()
+                }
+            })
+
+            // Currency + amount
+            addView(LinearLayout(ctx).apply {
+                orientation = LinearLayout.HORIZONTAL
+                gravity = Gravity.CENTER_HORIZONTAL
+                layoutParams = LinearLayout.LayoutParams(MATCH, WRAP).apply {
+                    bottomMargin = (16 * dp).toInt()
+                }
+                addView(TextView(ctx).apply {
+                    text = "$amountCurrency "
+                    textSize = 16f
+                    setTextColor(colorMuted)
+                    layoutParams = LinearLayout.LayoutParams(WRAP, WRAP)
+                })
+                addView(TextView(ctx).apply {
+                    text = amountValue
+                    textSize = 28f
+                    setTypeface(null, Typeface.BOLD)
+                    setTextColor(colorPrimary)
+                })
+            })
+
+            // From row
+            addView(LinearLayout(ctx).apply {
+                orientation = LinearLayout.HORIZONTAL
+                gravity = Gravity.CENTER_HORIZONTAL
+                layoutParams = LinearLayout.LayoutParams(MATCH, WRAP)
+                addView(TextView(ctx).apply {
+                    text = "From  "
+                    textSize = 12f
+                    setTextColor(colorMuted)
+                    layoutParams = LinearLayout.LayoutParams(WRAP, WRAP)
+                })
+                addView(TextView(ctx).apply {
+                    text = fromName
+                    textSize = 13f
+                    setTypeface(null, Typeface.BOLD)
+                    setTextColor(colorOnSurface)
+                    gravity = Gravity.CENTER
+                })
+            })
+
+            // To row
+            addView(LinearLayout(ctx).apply {
+                orientation = LinearLayout.HORIZONTAL
+                gravity = Gravity.CENTER_HORIZONTAL
+                layoutParams = LinearLayout.LayoutParams(MATCH, WRAP).apply {
+                    topMargin = (4 * dp).toInt()
+                }
+                addView(TextView(ctx).apply {
+                    text = "To  "
+                    textSize = 12f
+                    setTextColor(colorMuted)
+                    layoutParams = LinearLayout.LayoutParams(WRAP, WRAP)
+                })
+                addView(TextView(ctx).apply {
+                    text = toName
+                    textSize = 13f
+                    setTypeface(null, Typeface.BOLD)
+                    setTextColor(colorOnSurface)
+                    gravity = Gravity.CENTER
+                })
+            })
+        })
+
+        val okBtn = dialog.getButton(AlertDialog.BUTTON_POSITIVE)
+        okBtn?.visibility = View.VISIBLE
+        okBtn?.text = "OK"
+        okBtn?.setOnClickListener { dialog.dismiss(); onDone() }
+    }
+
+
     private fun doMibTransfer(
         src: BankAccount,
         destAccount: String,
@@ -1681,8 +2128,17 @@ class TransferFragment : Fragment() {
         requireActivity().title = getString(R.string.transfer)
     }
 
+
     override fun onDestroyView() {
         super.onDestroyView()
+        // Persist form state so it can be restored when the view is recreated
+        savedAmount = binding.etAmount.text?.toString() ?: ""
+        savedRemarks = binding.etRemarks.text?.toString() ?: ""
+        savedToText = if (resolvedAccountNumber.isEmpty()) binding.etTo.text?.toString() ?: "" else ""
+        // Reset in-progress OTP flow — it cannot sensibly resume after the view is gone
+        bmlOtpState = BmlOtpState.NONE
+        pendingBmlTransfer = null
+        bmlOtpChannel = null
         _binding = null
     }
 
@@ -1737,6 +2193,7 @@ class TransferFragment : Fragment() {
                         .also { it.root.tag = it }
                 }
                 val inactive = (acc.profileType == "BML_PREPAID" || acc.profileType == "BML_CREDIT" || acc.profileType == "BML_DEBIT") && !acc.statusDesc.equals("Active", ignoreCase = true)
+                val isCard = acc.profileType == "BML_PREPAID" || acc.profileType == "BML_CREDIT" || acc.profileType == "BML_DEBIT"
                 val isBmlAccount = acc.bank == "BML"
                 val ownerPrefix = if (isBmlAccount && acc.profileName.isNotBlank()) "${acc.profileName} · " else ""
                 val hide = viewModel.hideAmounts.value ?: false
@@ -1754,7 +2211,11 @@ class TransferFragment : Fragment() {
                 }
                 val balance = displayData?.balance ?: ""
                 b.tvDropdownBalance.text = if (hide && balance.isNotBlank()) maskAmount(balance) else balance
-                b.root.alpha = if (inactive) 0.4f else 1f
+                b.root.alpha = when {
+                    inactive -> 0.4f
+                    bmlQrInfo != null && !isCard -> 0.35f
+                    else -> 1f
+                }
                 val networkIcon = BmlCardParser.cardNetworkIcon(acc)
                 when {
                     networkIcon != null -> {

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

@@ -1,5 +1,8 @@
 package sh.sar.basedbank.ui.login
 
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -81,6 +84,17 @@ class CredentialsFragment : Fragment() {
         binding.btnLogin.isEnabled = false
         binding.btnLogin.setOnClickListener { attemptLogin() }
 
+        binding.cardOtp.setOnClickListener {
+            val code = binding.tvOtpCode.text.toString().replace(" ", "")
+            if (code.isNotEmpty()) {
+                val clipboard = requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+                clipboard.setPrimaryClip(ClipData.newPlainText("OTP", code))
+                if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.TIRAMISU) {
+                    Toast.makeText(requireContext(), "OTP copied", Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
+
         val loginFieldWatcher = object : TextWatcher {
             override fun afterTextChanged(s: Editable?) { updateLoginButtonState() }
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}

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

@@ -9,12 +9,14 @@ import sh.sar.basedbank.BasedBankApp
 import sh.sar.basedbank.LockActivity
 import sh.sar.basedbank.databinding.ActivityLoginBinding
 import sh.sar.basedbank.util.CredentialStore
+import sh.sar.basedbank.util.ThemeHelper
 
 class LoginActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityLoginBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        ThemeHelper.applyAccent(this)
         super.onCreate(savedInstanceState)
 
         // If security is configured and the user hasn't unlocked this session,
@@ -34,5 +36,8 @@ class LoginActivity : AppCompatActivity() {
             isAppearanceLightStatusBars = isLight
             isAppearanceLightNavigationBars = isLight
         }
+        val ta = obtainStyledAttributes(intArrayOf(android.R.attr.colorBackground))
+        window.statusBarColor = ta.getColor(0, if (isLight) android.graphics.Color.WHITE else android.graphics.Color.BLACK)
+        ta.recycle()
     }
 }

app/src/main/java/sh/sar/basedbank/ui/onboarding/OnboardingActivity.kt

@@ -19,6 +19,7 @@ import sh.sar.basedbank.R
 import sh.sar.basedbank.databinding.ActivityOnboardingBinding
 import sh.sar.basedbank.ui.login.LoginActivity
 import sh.sar.basedbank.util.CredentialStore
+import sh.sar.basedbank.util.ThemeHelper
 
 class OnboardingActivity : AppCompatActivity(), SecuritySetupFragment.Callback {
 
@@ -27,6 +28,7 @@ class OnboardingActivity : AppCompatActivity(), SecuritySetupFragment.Callback {
     private var countDownTimer: CountDownTimer? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        ThemeHelper.applyAccent(this)
         super.onCreate(savedInstanceState)
 
         // If security is already configured, onboarding is complete. Redirect to lock screen
@@ -45,6 +47,9 @@ class OnboardingActivity : AppCompatActivity(), SecuritySetupFragment.Callback {
             isAppearanceLightStatusBars = isLight
             isAppearanceLightNavigationBars = isLight
         }
+        val ta = obtainStyledAttributes(intArrayOf(android.R.attr.colorBackground))
+        window.statusBarColor = ta.getColor(0, if (isLight) android.graphics.Color.WHITE else android.graphics.Color.BLACK)
+        ta.recycle()
         prefs = getSharedPreferences("prefs", MODE_PRIVATE)
         val originalBottomPadding = binding.bottomBar.paddingBottom
         ViewCompat.setOnApplyWindowInsetsListener(binding.bottomBar) { view, insets ->
@@ -109,6 +114,9 @@ class OnboardingActivity : AppCompatActivity(), SecuritySetupFragment.Callback {
 
         binding.btnGetStarted.setOnClickListener {
             prefs.edit().putBoolean("onboarding_done", true).apply()
+            // Mark as unlocked so LoginActivity doesn't redirect to LockActivity.
+            // The user just completed setup — they shouldn't have to re-authenticate immediately.
+            (application as BasedBankApp).isUnlocked = true
             startActivity(Intent(this, LoginActivity::class.java))
             finish()
         }

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

@@ -5,6 +5,7 @@ data class AccountListDisplay(
     val number: String,
     val typeLabel: String,
     val balance: String,
+    val blockedBalance: String? = null, // null when zero or not applicable
     val isCard: Boolean = false,
     val cardBrandIcon: Int = 0,       // drawable res, only meaningful if isCard
     val statusLabel: String? = null   // null = active; shown as status pill if set

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

@@ -615,6 +615,41 @@ class CredentialStore(context: Context) {
         } catch (_: Exception) { null }
     }
 
+    // ── Default payment card ──────────────────────────────────────────────────
+
+    /** BML card account number the user has pinned as their default payment card, or null. */
+    fun getDefaultCardAccountNumber(): String? = prefs.getString("default_card_account_number", null)
+
+    fun setDefaultCardAccountNumber(accountNumber: String?) {
+        val editor = prefs.edit()
+        if (accountNumber == null) editor.remove("default_card_account_number")
+        else editor.putString("default_card_account_number", accountNumber)
+        editor.apply()
+    }
+
+    // ── Default transfer/QR account ───────────────────────────────────────────
+
+    /** Account number the user has pinned as their default source for transfers and PayMV QR, or null. */
+    fun getDefaultAccountNumber(): String? = prefs.getString("default_account_number", null)
+
+    fun setDefaultAccountNumber(accountNumber: String?) {
+        val editor = prefs.edit()
+        if (accountNumber == null) editor.remove("default_account_number")
+        else editor.putString("default_account_number", accountNumber)
+        editor.apply()
+    }
+
+    // ── Dashboard card visibility ─────────────────────────────────────────────
+
+    fun getHiddenDashboardCardNumbers(): Set<String> =
+        prefs.getStringSet("hidden_dashboard_cards", emptySet()) ?: emptySet()
+
+    fun setCardHiddenFromDashboard(accountNumber: String, hidden: Boolean) {
+        val current = getHiddenDashboardCardNumbers().toMutableSet()
+        if (hidden) current.add(accountNumber) else current.remove(accountNumber)
+        prefs.edit().putStringSet("hidden_dashboard_cards", current).apply()
+    }
+
     // ── MIB profile visibility (per loginId) ─────────────────────────────────
 
     /** Returns the set of MIB profile IDs the user has chosen to hide (for a given loginId). */

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

@@ -9,6 +9,24 @@ data class PaymvQrData(
 
 object PaymvQrParser {
 
+    /**
+     * Returns the BML gateway URL if [raw] is or contains one, otherwise null.
+     * Handles both plain URL QRs and combined EMV QRs (e.g. Fahipay+BML card QR).
+     * For combined EMV QRs the URL is parsed from TLV (root tag 35 → sub-tag 20 → sub-sub-tag 01)
+     * rather than via regex, to avoid greedily consuming subsequent EMV tag bytes.
+     */
+    fun extractBmlGatewayUrl(raw: String): String? {
+        if (raw.startsWith("https://pay.bml.com.mv/app/")) return raw
+        return try {
+            val root = parseTlv(raw)
+            val bmlMerchantInfo = root["35"]?.let { parseTlv(it) } ?: return null
+            val inner = bmlMerchantInfo["20"]?.let { parseTlv(it) } ?: return null
+            inner["01"]?.takeIf { it.startsWith("https://pay.bml.com.mv/app/") }
+        } catch (_: Exception) {
+            null
+        }
+    }
+
     fun parse(raw: String): PaymvQrData? {
         return try {
             val root = parseTlv(raw)
@@ -23,7 +41,7 @@ object PaymvQrParser {
 
             PaymvQrData(
                 accountNumber = merchantInfo?.get("03"),
-                amount = root["54"],
+                amount = root["54"]?.takeIf { it != "***" },
                 purpose = additionalData?.get("08"),
                 merchantName = root["59"]
             )

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

@@ -0,0 +1,78 @@
+package sh.sar.basedbank.util
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Color
+import android.os.Build
+import androidx.appcompat.app.AppCompatActivity
+import com.google.android.material.color.DynamicColors
+import com.google.android.material.color.DynamicColorsOptions
+import sh.sar.basedbank.R
+
+object ThemeHelper {
+
+    const val PRESET_BLUE   = "blue"
+    const val PRESET_RED    = "red"
+    const val PRESET_GREEN  = "green"
+    const val PRESET_CUSTOM = "custom"
+
+    fun isSystemTheme(context: Context): Boolean =
+        context.getSharedPreferences("prefs", Context.MODE_PRIVATE)
+            .getString("theme", "system") == "system"
+
+    fun getAccentPreset(context: Context): String =
+        context.getSharedPreferences("prefs", Context.MODE_PRIVATE)
+            .getString("accent_preset", PRESET_BLUE) ?: PRESET_BLUE
+
+    fun getCustomColor(context: Context): Int? {
+        val hex = context.getSharedPreferences("prefs", Context.MODE_PRIVATE)
+            .getString("accent_custom_color", null) ?: return null
+        return try { Color.parseColor(hex) } catch (_: Exception) { null }
+    }
+
+    fun presetSeedColor(context: Context, preset: String): Int = when (preset) {
+        PRESET_RED -> Color.parseColor("#D32F2F")
+        PRESET_GREEN  -> Color.parseColor("#4CAF50")
+        PRESET_CUSTOM -> getCustomColor(context) ?: Color.parseColor("#3F65AD")
+        else          -> Color.parseColor("#3F65AD")
+    }
+
+    fun isPitchBlackEnabled(context: Context): Boolean =
+        context.getSharedPreferences("prefs", Context.MODE_PRIVATE)
+            .getBoolean("pitch_black", false)
+
+    /**
+     * Apply the user-chosen accent theme to the given activity.
+     * Must be called BEFORE super.onCreate() so window-level attributes
+     * (status bar color, etc.) are resolved from the correct overlay.
+     * Has no effect when the theme is set to "system" (dynamic colors are
+     * handled by BasedBankApp via DynamicColors.applyToActivitiesIfAvailable).
+     */
+    fun applyAccent(activity: AppCompatActivity) {
+        if (isSystemTheme(activity)) return
+        val preset = getAccentPreset(activity)
+        val seed = presetSeedColor(activity, preset)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            val bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)
+            bitmap.setPixel(0, 0, seed)
+            DynamicColors.applyToActivityIfAvailable(
+                activity,
+                DynamicColorsOptions.Builder().setContentBasedSource(bitmap).build()
+            )
+        } else {
+            // API < 31: apply a simple style overlay (partial palette, but functional)
+            val styleRes = when (preset) {
+                PRESET_RED -> R.style.ThemeOverlay_Accent_Orange
+                PRESET_GREEN  -> R.style.ThemeOverlay_Accent_Green
+                else          -> R.style.ThemeOverlay_Accent_Blue
+            }
+            activity.theme.applyStyle(styleRes, true)
+        }
+
+        val prefs = activity.getSharedPreferences("prefs", Context.MODE_PRIVATE)
+        val isDark = prefs.getString("theme", "system") == "dark"
+        if (isDark && prefs.getBoolean("pitch_black", false)) {
+            activity.theme.applyStyle(R.style.ThemeOverlay_PitchBlack, true)
+        }
+    }
+}

app/src/main/java/sh/sar/basedbank/util/bmlapi/BmlDashboardParser.kt

@@ -26,11 +26,13 @@ object BmlDashboardParser {
                 statusLabel   = if (isActive) null else account.statusDesc
             )
         } else {
+            val blocked = account.blockedAmount.toDoubleOrNull() ?: 0.0
             AccountListDisplay(
-                name      = account.accountBriefName,
-                number    = account.accountNumber,
-                typeLabel = productLabel(account.accountTypeName),
-                balance   = listBalance(account)
+                name           = account.accountBriefName,
+                number         = account.accountNumber,
+                typeLabel      = productLabel(account.accountTypeName),
+                balance        = listBalance(account),
+                blockedBalance = if (blocked > 0.0) "${account.currencyName} ${account.blockedAmount}" else null
             )
         }
     }
@@ -52,9 +54,9 @@ object BmlDashboardParser {
         }
     }
 
-    /** Balance shown in the accounts list — ledger (working) balance for BML CASA. */
+    /** Balance shown in the accounts list — available balance, consistent with transfer/contact picker. */
     fun listBalance(account: BankAccount): String =
-        "${account.currencyName} ${account.currentBalance}"
+        "${account.currencyName} ${account.availableBalance}"
 
     fun cardBrandIcon(productName: String): Int = when {
         productName.contains("AMEX", ignoreCase = true) ||

app/src/main/java/sh/sar/basedbank/util/mibapi/MibAccountParser.kt

@@ -5,12 +5,16 @@ import sh.sar.basedbank.util.AccountListDisplay
 
 object MibAccountParser {
 
-    fun displayData(account: BankAccount) = AccountListDisplay(
-        name      = account.accountBriefName,
-        number    = account.accountNumber,
-        typeLabel = productLabel(account.accountTypeName),
-        balance   = "${account.currencyName} ${account.availableBalance}"
-    )
+    fun displayData(account: BankAccount): AccountListDisplay {
+        val blocked = account.blockedAmount.toDoubleOrNull() ?: 0.0
+        return AccountListDisplay(
+            name           = account.accountBriefName,
+            number         = account.accountNumber,
+            typeLabel      = productLabel(account.accountTypeName),
+            balance        = "${account.currencyName} ${account.availableBalance}",
+            blockedBalance = if (blocked > 0.0) "${account.currencyName} ${account.blockedAmount}" else null
+        )
+    }
 
     /**
      * Returns a display-ready product label for a MIB (Faisanet) account type name.

app/src/main/java/sh/sar/basedbank/util/mibapi/MibHistoryParser.kt

@@ -5,13 +5,16 @@ import sh.sar.basedbank.util.AccountHistoryDisplay
 
 object MibHistoryParser {
 
-    fun displayData(account: BankAccount) = AccountHistoryDisplay(
-        name             = account.accountBriefName,
-        number           = account.accountNumber,
-        bankPill         = null,   // MIB has no bank pill
-        typeLabel        = MibAccountParser.productLabel(account.accountTypeName),
-        availableBalance = "${account.currencyName} ${account.availableBalance}",
-        workingBalance   = "${account.currencyName} ${account.currentBalance}",
-        blockedBalance   = null
-    )
+    fun displayData(account: BankAccount): AccountHistoryDisplay {
+        val blocked = account.blockedAmount.toDoubleOrNull() ?: 0.0
+        return AccountHistoryDisplay(
+            name             = account.accountBriefName,
+            number           = account.accountNumber,
+            bankPill         = null,   // MIB has no bank pill
+            typeLabel        = MibAccountParser.productLabel(account.accountTypeName),
+            availableBalance = "${account.currencyName} ${account.availableBalance}",
+            workingBalance   = "${account.currencyName} ${account.currentBalance}",
+            blockedBalance   = if (blocked > 0.0) "${account.currencyName} ${account.blockedAmount}" else null
+        )
+    }
 }

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

@@ -5,19 +5,20 @@
     android:viewportWidth="60"
     android:viewportHeight="60">
 
-    <!-- White background -->
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M0 59.776h59.785V0H0z"/>
-
     <!-- Red background -->
     <path
         android:fillColor="#E21B23"
-        android:pathData="M3.297 56.421h53.191V3.356H3.298z"/>
+        android:pathData="M0 60h60V0H0z"/>
 
     <!-- White logo mark -->
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="evenOdd"
-        android:pathData="M37.421 6.708v34.059h-3.7V20.853L22.763 40.767H18.65l18.77-34.06zM18.517 51.073l.108.055c.552.283 1.106.564 1.623.564.515 0 1.068-.281 1.621-.564.615-.313 1.23-.627 1.88-.627.652 0 1.267.314 1.88.627.554.283 1.107.564 1.623.564s1.068-.281 1.621-.564c.615-.313 1.23-.627 1.88-.627.652 0 1.267.314 1.88.627.554.283 1.107.564 1.623.564s1.07-.281 1.623-.564c.613-.313 1.228-.627 1.878-.627.652 0 1.267.314 1.88.627.554.283 1.107.564 1.623.564s1.07-.281 1.623-.564l.314-.159v1.444l-.057.03c-.613.313-1.228.626-1.88.626-.65 0-1.265-.313-1.879-.626-.553-.283-1.108-.564-1.624-.564-.514 0-1.069.28-1.62.564-.616.313-1.23.626-1.88.626-.653 0-1.268-.313-1.88-.626-.554-.283-1.108-.564-1.624-.564s-1.068.28-1.62.564c-.616.313-1.23.626-1.88.626-.653 0-1.268-.313-1.88-.626-.554-.283-1.108-.564-1.624-.564s-1.069.28-1.622.564c-.614.313-1.228.626-1.879.626-.6 0-1.167-.265-1.73-.55v-1.446zm0-2.816l.108.055c.552.283 1.106.564 1.623.564.515 0 1.068-.281 1.621-.564.615-.313 1.23-.627 1.88-.627.652 0 1.267.314 1.88.627.554.283 1.107.564 1.623.564s1.068-.281 1.621-.564c.615-.313 1.23-.627 1.88-.627.652 0 1.267.314 1.88.627.554.283 1.107.564 1.623.564s1.07-.281 1.623-.564c.613-.313 1.228-.627 1.878-.627.652 0 1.267.314 1.88.627.554.283 1.107.564 1.623.564s1.07-.281 1.623-.564l.314-.159v1.444l-.057.028c-.613.315-1.228.627-1.88.627-.65 0-1.265-.312-1.879-.627-.553-.281-1.108-.562-1.624-.562-.514 0-1.069.28-1.62.562-.616.315-1.23.627-1.88.627-.653 0-1.268-.312-1.88-.627-.554-.281-1.108-.562-1.624-.562s-1.068.28-1.62.562c-.616.315-1.23.627-1.88.627-.653 0-1.268-.312-1.88-.627-.554-.281-1.108-.562-1.624-.562s-1.069.28-1.622.562c-.614.315-1.228.627-1.879.627-.6 0-1.167-.264-1.73-.55v-1.445zm12.428-6.042h12.41v3.969h-12.41v-.001H18.531l-2.1-3.968h14.514z"/>
+    <group
+        android:scaleX="0.85"
+        android:scaleY="0.85"
+        android:pivotX="30"
+        android:pivotY="30">
+        <path
+            android:fillColor="#FFFFFF"
+            android:fillType="evenOdd"
+            android:pathData="M37.421 6.708v34.059h-3.7V20.853L22.763 40.767H18.65l18.77-34.06zM18.517 51.073l.108.055c.552.283 1.106.564 1.623.564.515 0 1.068-.281 1.621-.564.615-.313 1.23-.627 1.88-.627.652 0 1.267.314 1.88.627.554.283 1.107.564 1.623.564s1.068-.281 1.621-.564c.615-.313 1.23-.627 1.88-.627.652 0 1.267.314 1.88.627.554.283 1.107.564 1.623.564s1.07-.281 1.623-.564c.613-.313 1.228-.627 1.878-.627.652 0 1.267.314 1.88.627.554.283 1.107.564 1.623.564s1.07-.281 1.623-.564l.314-.159v1.444l-.057.03c-.613.313-1.228.626-1.88.626-.65 0-1.265-.313-1.879-.626-.553-.283-1.108-.564-1.624-.564-.514 0-1.069.28-1.62.564-.616.313-1.23.626-1.88.626-.653 0-1.268-.313-1.88-.626-.554-.283-1.108-.564-1.624-.564s-1.068.28-1.62.564c-.616.313-1.23.626-1.88.626-.653 0-1.268-.313-1.88-.626-.554-.283-1.108-.564-1.624-.564s-1.069.28-1.622.564c-.614.313-1.228.626-1.879.626-.6 0-1.167-.265-1.73-.55v-1.446zm0-2.816l.108.055c.552.283 1.106.564 1.623.564.515 0 1.068-.281 1.621-.564.615-.313 1.23-.627 1.88-.627.652 0 1.267.314 1.88.627.554.283 1.107.564 1.623.564s1.068-.281 1.621-.564c.615-.313 1.23-.627 1.88-.627.652 0 1.267.314 1.88.627.554.283 1.107.564 1.623.564s1.07-.281 1.623-.564c.613-.313 1.228-.627 1.878-.627.652 0 1.267.314 1.88.627.554.283 1.107.564 1.623.564s1.07-.281 1.623-.564l.314-.159v1.444l-.057.028c-.613.315-1.228.627-1.88.627-.65 0-1.265-.312-1.879-.627-.553-.281-1.108-.562-1.624-.562-.514 0-1.069.28-1.62.562-.616.315-1.23.627-1.88.627-.653 0-1.268-.312-1.88-.627-.554-.281-1.108-.562-1.624-.562s-1.068.28-1.62.562c-.616.315-1.23.627-1.88.627-.653 0-1.268-.312-1.88-.627-.554-.281-1.108-.562-1.624-.562s-1.069.28-1.622.562c-.614.315-1.228.627-1.879.627-.6 0-1.167-.264-1.73-.55v-1.445zm12.428-6.042h12.41v3.969h-12.41v-.001H18.531l-2.1-3.968h14.514z"/>
+    </group>
 </vector>

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

@@ -0,0 +1,39 @@
+<?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">
+    <!-- Card icon -->
+    <path
+        android:fillColor="?attr/colorOnSurfaceVariant"
+        android:pathData="M20,4H4C2.89,4 2.01,4.89 2.01,6L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2V6C22,4.89 21.11,4 20,4zM20,18H4v-6h16V18zM20,8H4V6h16V8z" />
+    <!-- Background circle separating gear from card -->
+    <path
+        android:fillColor="?attr/colorSurface"
+        android:pathData="M12.5,18 A5.5,5.5 0 1 0 23.5,18 A5.5,5.5 0 1 0 12.5,18 Z" />
+    <!--
+        Simple 6-tooth gear, scaled 0.5x and placed at (18,18) in the icon.
+        The gear path is drawn in a 24×24 space (center 12,12); the group
+        transform maps it: point(x,y) → (x·0.5+12, y·0.5+12).
+        Outer radius=10, root radius=7, hub radius=4.
+        Teeth are rectangular (straight-line) so they stay crisp at small scale.
+        Outer ring is clockwise; hub hole is counterclockwise (nonZero cutout).
+    -->
+    <group
+        android:scaleX="0.5"
+        android:scaleY="0.5"
+        android:translateX="12"
+        android:translateY="12">
+        <path
+            android:fillColor="?attr/colorOnSurfaceVariant"
+            android:pathData="
+                M18.58,9.61 L21.85,10.26 L21.85,13.74 L18.58,14.39
+                L17.36,16.50 L18.43,19.66 L15.42,21.40 L13.22,18.89
+                L10.78,18.89 L8.58,21.40 L5.57,19.66 L6.64,16.50
+                L5.42,14.39 L2.15,13.74 L2.15,10.26 L5.42,9.61
+                L6.64,7.50 L5.57,4.34 L8.58,2.60 L10.78,5.11
+                L13.22,5.11 L15.42,2.60 L18.43,4.34 L17.36,7.50 Z
+                M12,8 A4,4 0 1 0 12,16 A4,4 0 1 0 12,8 Z" />
+    </group>
+</vector>

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

@@ -2,9 +2,41 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <!-- Phone outline -->
     <path
-        android:fillColor="?attr/colorOnSurface"
-        android:pathData="M20,2L4,2C2.9,2 2,2.9 2,4l0,16c0,1.1 0.9,2 2,2l16,0c1.1,0 2,-0.9 2,-2L22,4C22,2.9 21.1,2 20,2zM13,18l-2,0 0,-1c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5l-2,0c0,-1.65 -1.35,-3 -3,-3s-3,1.35 -3,3 1.35,3 3,3l0,-2 2,3zM19,12l-2,0c0,-2.76 -2.24,-5 -5,-5l0,-2C15.87,5 19,8.13 19,12z"/>
+        android:fillColor="#00000000"
+        android:strokeColor="?attr/colorOnSurface"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:pathData="M6.08,8.6 L20.45,8.6 A1.58,1.58,0,0,1,22.03,10.18 L22.03,37.81 A1.58,1.58,0,0,1,20.45,39.39 L6.08,39.39 A1.58,1.58,0,0,1,4.5,37.81 L4.5,10.18 A1.58,1.58,0,0,1,6.08,8.6 Z"/>
+
+    <!-- Top notch line -->
+    <path
+        android:fillColor="#00000000"
+        android:strokeColor="?attr/colorOnSurface"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:pathData="M4.5,12.55 L22.03,12.55"/>
+
+    <!-- Bottom notch line -->
+    <path
+        android:fillColor="#00000000"
+        android:strokeColor="?attr/colorOnSurface"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:pathData="M4.5,35.45 L22.03,35.45"/>
+
+    <!-- NFC waves (outer, mid, inner) -->
+    <path
+        android:fillColor="#00000000"
+        android:strokeColor="?attr/colorOnSurface"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:pathData="M36.07,9.29 a18.28,18.28,0,0,1,0,29.42 m-4,-24.16 a11.84,11.84,0,0,1,5,9.45 11.84,11.84,0,0,1,-5,9.45 m-3.68,-14 a5.67,5.67,0,0,1,0,9.1"/>
+
 </vector>

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

@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?attr/colorOnSurface"
+        android:fillColor="?attr/colorOnSurfaceVariant"
         android:pathData="M9.5,6.5v3h-3v-3H9.5zM11,5L5,5v5.5h6L11,5zM9.5,14.5v3h-3v-3H9.5zM11,13L5,13v5.5h6L11,13zM17.5,6.5v3h-3v-3H17.5zM19,5h-6v5.5h6L19,5zM13,13h1.5v1.5L13,14.5zM14.5,14.5L16,14.5L16,16h-1.5zM16,13h1.5v1.5L16,14.5zM13,16h1.5v1.5L13,17.5zM14.5,17.5L16,17.5L16,19h-1.5zM16,16h1.5v1.5L16,17.5zM17.5,14.5L19,14.5L19,16h-1.5zM17.5,17.5L19,17.5L19,19h-1.5z"/>
 </vector>

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

@@ -4,13 +4,47 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
+
     <group
         android:translateX="30"
         android:translateY="30"
-        android:scaleX="2"
-        android:scaleY="2">
+        android:scaleX="1.0"
+        android:scaleY="1.0">
+
+        <!-- Phone outline -->
         <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M20,4H4C2.89,4 2.01,4.89 2.01,6L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2V6C22,4.89 21.11,4 20,4zM20,18H4v-6h16V18zM20,8H4V6h16V8z" />
+            android:fillColor="#00000000"
+            android:strokeColor="#FFFFFF"
+            android:strokeWidth="2.5"
+            android:strokeLineCap="round"
+            android:strokeLineJoin="round"
+            android:pathData="M6.08,8.6 L20.45,8.6 A1.58,1.58,0,0,1,22.03,10.18 L22.03,37.81 A1.58,1.58,0,0,1,20.45,39.39 L6.08,39.39 A1.58,1.58,0,0,1,4.5,37.81 L4.5,10.18 A1.58,1.58,0,0,1,6.08,8.6 Z"/>
+
+        <!-- Top notch line -->
+        <path
+            android:fillColor="#00000000"
+            android:strokeColor="#FFFFFF"
+            android:strokeWidth="2.5"
+            android:strokeLineCap="round"
+            android:pathData="M4.5,12.55 L22.03,12.55"/>
+
+        <!-- Bottom notch line -->
+        <path
+            android:fillColor="#00000000"
+            android:strokeColor="#FFFFFF"
+            android:strokeWidth="2.5"
+            android:strokeLineCap="round"
+            android:pathData="M4.5,35.45 L22.03,35.45"/>
+
+        <!-- NFC waves -->
+        <path
+            android:fillColor="#00000000"
+            android:strokeColor="#FFFFFF"
+            android:strokeWidth="2.5"
+            android:strokeLineCap="round"
+            android:strokeLineJoin="round"
+            android:pathData="M36.07,9.29 a18.28,18.28,0,0,1,0,29.42 m-4,-24.16 a11.84,11.84,0,0,1,5,9.45 11.84,11.84,0,0,1,-5,9.45 m-3.68,-14 a5.67,5.67,0,0,1,0,9.1"/>
+
     </group>
+
 </vector>

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

@@ -87,6 +87,7 @@ app:menu="@menu/bottom_nav_menu" />
         android:layout_height="match_parent"
         android:layout_gravity="start"
         android:fitsSystemWindows="true"
+        app:headerLayout="@layout/nav_header"
         app:menu="@menu/drawer_menu" />
 
 </androidx.drawerlayout.widget.DrawerLayout>

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

@@ -14,12 +14,47 @@
             android:orientation="vertical"
             android:visibility="gone">
 
-            <!-- Top spacer: pushes card to vertical center -->
+            <!-- Manage Card button row -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="end"
+                android:paddingHorizontal="12dp"
+                android:paddingTop="4dp">
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnManageCard"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:minWidth="0dp"
+                    android:minHeight="0dp"
+                    android:text="@string/card_manage"
+                    android:textSize="12sp"
+                    app:icon="@drawable/ic_manage_card"
+                    app:iconSize="20dp"
+                    app:iconPadding="4dp" />
+
+            </LinearLayout>
+
+            <!-- Top spacer: pushes card to vertical center (hidden in manage mode) -->
             <View
+                android:id="@+id/topSpacer"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1" />
 
+            <!-- Manage mode: selected card with overlays -->
+            <include
+                android:id="@+id/manageCardView"
+                layout="@layout/item_card_stack"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="16dp"
+                android:layout_marginTop="8dp"
+                android:visibility="gone" />
+
             <!-- Horizontal card stack. Width/padding set programmatically for centering + peek. -->
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rvCards"
@@ -58,20 +93,22 @@
 
             <!-- Divider -->
             <View
+                android:id="@+id/divider"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginBottom="4dp"
                 android:background="?attr/colorOutlineVariant" />
 
-            <!-- Primary pay actions -->
+            <!-- Primary pay actions (normal mode) -->
             <LinearLayout
+                android:id="@+id/llPayButtons"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:paddingHorizontal="16dp"
                 android:paddingTop="8dp"
-                android:paddingBottom="4dp">
+                android:paddingBottom="12dp">
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnScanToPay"
@@ -111,61 +148,134 @@
 
             </LinearLayout>
 
-            <!-- Secondary card management actions -->
+            <!-- Default card toggle (manage mode only) -->
             <LinearLayout
+                android:id="@+id/llDefaultCardRow"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="4dp"
+                android:paddingBottom="4dp"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/card_set_as_default"
+                    android:textAppearance="?attr/textAppearanceBodyMedium" />
+
+                <com.google.android.material.materialswitch.MaterialSwitch
+                    android:id="@+id/switchDefaultCard"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+            </LinearLayout>
+
+            <!-- Hide from dashboard toggle (manage mode only) -->
+            <LinearLayout
+                android:id="@+id/llHideDashboardRow"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="4dp"
+                android:paddingBottom="4dp"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/card_hide_from_dashboard"
+                    android:textAppearance="?attr/textAppearanceBodyMedium" />
+
+                <com.google.android.material.materialswitch.MaterialSwitch
+                    android:id="@+id/switchHideFromDashboard"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+            </LinearLayout>
+
+            <!-- Card management actions (manage mode only) -->
+            <LinearLayout
+                android:id="@+id/llManageButtons"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:paddingHorizontal="8dp"
-                android:paddingTop="4dp"
-                android:paddingBottom="8dp">
+                android:paddingTop="8dp"
+                android:paddingBottom="12dp"
+                android:visibility="gone">
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnChangePin"
-                    style="@style/Widget.Material3.Button.TextButton"
+                    style="@style/Widget.Material3.Button.TonalButton"
                     android:layout_width="0dp"
                     android:layout_weight="1"
                     android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="4dp"
                     android:minWidth="0dp"
                     android:minHeight="0dp"
+                    android:paddingTop="14dp"
+                    android:paddingBottom="14dp"
                     android:text="@string/card_action_change_pin"
-                    android:textSize="11sp"
+                    android:textSize="12sp"
                     app:icon="@drawable/ic_edit"
-                    app:iconSize="16dp"
-                    app:iconPadding="3dp" />
+                    app:iconSize="22dp"
+                    app:iconGravity="top"
+                    app:iconPadding="6dp" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnFreeze"
-                    style="@style/Widget.Material3.Button.TextButton"
+                    style="@style/Widget.Material3.Button.TonalButton"
                     android:layout_width="0dp"
                     android:layout_weight="1"
                     android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="4dp"
                     android:minWidth="0dp"
                     android:minHeight="0dp"
+                    android:paddingTop="14dp"
+                    android:paddingBottom="14dp"
                     android:text="@string/card_action_freeze"
-                    android:textSize="11sp"
+                    android:textSize="12sp"
                     app:icon="@drawable/ic_freeze"
-                    app:iconSize="16dp"
-                    app:iconPadding="3dp" />
+                    app:iconSize="22dp"
+                    app:iconGravity="top"
+                    app:iconPadding="6dp" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnBlock"
-                    style="@style/Widget.Material3.Button.TextButton"
+                    style="@style/Widget.Material3.Button.TonalButton"
                     android:layout_width="0dp"
                     android:layout_weight="1"
                     android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="4dp"
                     android:minWidth="0dp"
                     android:minHeight="0dp"
+                    android:paddingTop="14dp"
+                    android:paddingBottom="14dp"
                     android:text="@string/card_action_block"
-                    android:textSize="11sp"
+                    android:textSize="12sp"
                     app:icon="@drawable/ic_block"
-                    app:iconSize="16dp"
-                    app:iconPadding="3dp" />
+                    app:iconSize="22dp"
+                    app:iconGravity="top"
+                    app:iconPadding="6dp" />
 
             </LinearLayout>
 
         </LinearLayout>
 
+        <!-- Tap-to-pay overlay: shown in tap mode, sits above contentLayout -->
+        <FrameLayout
+            android:id="@+id/flTapMode"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone" />
+
         <!-- Loading state -->
         <LinearLayout
             android:id="@+id/loadingView"

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

@@ -116,6 +116,8 @@
             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">

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

@@ -176,6 +176,139 @@
 
         </LinearLayout>
 
+        <!-- Blocked funds row: MVR + USD separate cards (hidden when no blocked amounts) -->
+        <LinearLayout
+            android:id="@+id/rowBlocked"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="16dp"
+            android:visibility="gone">
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/cardBlockedMvr"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginEnd="8dp"
+                app:cardElevation="1dp"
+                app:cardCornerRadius="12dp"
+                app:cardBackgroundColor="?attr/colorErrorContainer"
+                android:visibility="gone">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="16dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/dashboard_blocked_mvr"
+                        android:textAppearance="?attr/textAppearanceLabelSmall"
+                        android:textColor="?attr/colorOnErrorContainer" />
+
+                    <TextView
+                        android:id="@+id/tvBlockedMvr"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:text="MVR —"
+                        android:textAppearance="?attr/textAppearanceTitleMedium"
+                        android:textColor="?attr/colorOnErrorContainer" />
+
+                </LinearLayout>
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/cardBlockedUsd"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginStart="8dp"
+                app:cardElevation="1dp"
+                app:cardCornerRadius="12dp"
+                app:cardBackgroundColor="?attr/colorErrorContainer"
+                android:visibility="gone">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="16dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/dashboard_blocked_usd"
+                        android:textAppearance="?attr/textAppearanceLabelSmall"
+                        android:textColor="?attr/colorOnErrorContainer" />
+
+                    <TextView
+                        android:id="@+id/tvBlockedUsd"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:text="USD —"
+                        android:textAppearance="?attr/textAppearanceTitleMedium"
+                        android:textColor="?attr/colorOnErrorContainer" />
+
+                </LinearLayout>
+
+            </com.google.android.material.card.MaterialCardView>
+
+        </LinearLayout>
+
+        <!-- Overdue row (hidden when no overdue financing) -->
+        <LinearLayout
+            android:id="@+id/rowAttention"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="16dp"
+            android:visibility="gone">
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/cardOverdue"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:cardElevation="1dp"
+                app:cardCornerRadius="12dp"
+                app:cardBackgroundColor="?attr/colorErrorContainer"
+                android:clickable="true"
+                android:focusable="true"
+                android:visibility="gone">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="16dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/dashboard_overdue"
+                        android:textAppearance="?attr/textAppearanceLabelSmall"
+                        android:textColor="?attr/colorOnErrorContainer" />
+
+                    <TextView
+                        android:id="@+id/tvOverdueTotal"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:text="MVR —"
+                        android:textAppearance="?attr/textAppearanceTitleMedium"
+                        android:textColor="?attr/colorOnErrorContainer" />
+
+                </LinearLayout>
+
+            </com.google.android.material.card.MaterialCardView>
+
+        </LinearLayout>
+
         <!-- Pending Finances card -->
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/cardPendingFinances"
@@ -228,14 +361,6 @@
             android:layout_marginTop="16dp"
             android:visibility="gone">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/nav_pay_with_card"
-                android:textAppearance="?attr/textAppearanceLabelMedium"
-                android:textColor="?attr/colorOnSurfaceVariant"
-                android:layout_marginBottom="8dp"/>
-
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rvCards"
                 android:layout_width="match_parent"
@@ -261,14 +386,6 @@
         android:paddingTop="8dp"
         android:paddingBottom="16dp">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/dashboard_quick_actions"
-            android:textAppearance="?attr/textAppearanceLabelMedium"
-            android:textColor="?attr/colorOnSurfaceVariant"
-            android:layout_marginBottom="8dp" />
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

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

@@ -64,7 +64,6 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="12dp"
         android:hint="@string/paymvqr_amount_hint"
-        app:helperText="@string/paymvqr_amount_helper"
         app:prefixText="MVR ">
 
         <com.google.android.material.textfield.TextInputEditText
@@ -76,6 +75,47 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
+    <!-- Reference / purpose (optional) -->
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/tilReference"
+        style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
+        android:hint="@string/paymvqr_reference_hint">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/etReference"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="text"
+            android:maxLines="1" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <!-- Include phone number toggle -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:layout_marginBottom="12dp">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/paymvqr_include_phone"
+            android:textAppearance="?attr/textAppearanceBodyMedium" />
+
+        <com.google.android.material.materialswitch.MaterialSwitch
+            android:id="@+id/switchIncludePhone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="true" />
+
+    </LinearLayout>
+
     <!-- Action buttons — always visible; share/save disabled until QR is rendered -->
     <LinearLayout
         android:id="@+id/layoutActions"

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

@@ -45,22 +45,30 @@
 
         </com.google.android.material.button.MaterialButtonToggleGroup>
 
-        <!-- Quick actions (always active) -->
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/dashboard_quick_actions"
-            android:textAppearance="?attr/textAppearanceTitleMedium"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="12dp" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rvQuickActions"
+        <!-- Quick actions — shown only when drawer nav is active -->
+        <LinearLayout
+            android:id="@+id/sectionQuickActions"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:nestedScrollingEnabled="false"
-            android:overScrollMode="never"
-            android:layout_marginBottom="16dp" />
+            android:orientation="vertical"
+            android:layout_marginBottom="16dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/dashboard_quick_actions"
+                android:textAppearance="?attr/textAppearanceTitleMedium"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="12dp" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rvQuickActions"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:nestedScrollingEnabled="false"
+                android:overScrollMode="never" />
+
+        </LinearLayout>
 
         <!-- Bottom bar shortcuts — shown only when bottom nav is active -->
         <LinearLayout
@@ -148,6 +156,87 @@
 
         </com.google.android.material.button.MaterialButtonToggleGroup>
 
+        <!-- Pitch black — enabled only in explicit dark mode -->
+        <LinearLayout
+            android:id="@+id/rowPitchBlack"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            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_pitch_black"
+                android:textAppearance="?attr/textAppearanceBodyLarge" />
+
+            <com.google.android.material.materialswitch.MaterialSwitch
+                android:id="@+id/switchPitchBlack"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
+
+        <!-- Accent color — always shown, disabled/grayed in system theme mode -->
+        <LinearLayout
+            android:id="@+id/sectionAccentColor"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_marginTop="24dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_accent_color"
+                android:textAppearance="?attr/textAppearanceTitleMedium"
+                android:layout_marginBottom="12dp" />
+
+            <com.google.android.material.button.MaterialButtonToggleGroup
+                android:id="@+id/accentToggle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:singleSelection="true"
+                app:selectionRequired="true">
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnAccentBlue"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/accent_blue" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnAccentOrange"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/accent_orange" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnAccentGreen"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/accent_green" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnAccentCustom"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/accent_custom" />
+
+            </com.google.android.material.button.MaterialButtonToggleGroup>
+
+        </LinearLayout>
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

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

@@ -194,44 +194,6 @@
             android:layout_marginTop="24dp"
             android:layout_marginBottom="8dp" />
 
-        <LinearLayout
-            android:id="@+id/rowHideAmounts"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_vertical"
-            android:layout_marginBottom="4dp">
-
-            <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="@string/settings_hide_amounts"
-                    android:textAppearance="?attr/textAppearanceBodyLarge"
-                    android:textColor="?attr/colorOnSurface" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/settings_hide_amounts_desc"
-                    android:textAppearance="?attr/textAppearanceBodySmall"
-                    android:textColor="?attr/colorOnSurfaceVariant" />
-
-            </LinearLayout>
-
-            <com.google.android.material.materialswitch.MaterialSwitch
-                android:id="@+id/switchHideAmounts"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp" />
-
-        </LinearLayout>
-
         <LinearLayout
             android:id="@+id/rowBlockScreenshots"
             android:layout_width="match_parent"

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

@@ -72,6 +72,15 @@
                 android:textAppearance="?attr/textAppearanceTitleSmall"
                 android:textColor="?attr/colorOnSurface" />
 
+            <TextView
+                android:id="@+id/tvBlocked"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:textAppearance="?attr/textAppearanceLabelSmall"
+                android:textColor="?attr/colorError"
+                android:visibility="gone" />
+
             <ImageButton
                 android:id="@+id/btnTransfer"
                 android:layout_width="40dp"

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

@@ -182,6 +182,55 @@
 
         </LinearLayout>
 
+        <!-- Default account divider + row (shown only for non-card accounts) -->
+        <View
+            android:id="@+id/dividerDefaultAccount"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="16dp"
+            android:background="?attr/colorOutlineVariant"
+            android:visibility="gone" />
+
+        <LinearLayout
+            android:id="@+id/llDefaultAccountRow"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:layout_marginTop="12dp"
+            android:visibility="gone">
+
+            <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="Default account"
+                    android:textAppearance="?attr/textAppearanceBodyMedium"
+                    android:textColor="?attr/colorOnSurface" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Auto-selected for transfers and PayMV QR"
+                    android:textAppearance="?attr/textAppearanceLabelSmall"
+                    android:textColor="?attr/colorOnSurfaceVariant"
+                    android:layout_marginTop="2dp" />
+
+            </LinearLayout>
+
+            <com.google.android.material.materialswitch.MaterialSwitch
+                android:id="@+id/switchDefaultAccount"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp" />
+
+        </LinearLayout>
+
     </LinearLayout>
 
 </com.google.android.material.card.MaterialCardView>

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

@@ -2,7 +2,7 @@
 <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="280dp"
+    android:layout_width="320dp"
     android:layout_height="wrap_content"
     android:layout_marginEnd="12dp"
     app:cardCornerRadius="16dp"

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

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

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

@@ -6,6 +6,8 @@
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="16dp"
     android:layout_marginBottom="12dp"
+    android:clickable="true"
+    android:focusable="true"
     app:cardCornerRadius="16dp"
     app:cardElevation="2dp">
 

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    android:paddingTop="24dp"
+    android:paddingBottom="16dp">
+
+    <ImageView
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:src="@mipmap/ic_launcher"
+        android:contentDescription="@string/app_name" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:text="@string/app_name"
+        android:textAppearance="?attr/textAppearanceTitleMedium" />
+
+</LinearLayout>

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

@@ -115,11 +115,13 @@
     <!-- PayMV QR Generator -->
     <string name="paymvqr_select_account">Select account</string>
     <string name="paymvqr_amount_hint">Amount (optional)</string>
-    <string name="paymvqr_amount_helper">Leave empty to allow payer to enter any amount</string>
     <string name="paymvqr_share">Share</string>
     <string name="paymvqr_save_image">Save Image</string>
     <string name="paymvqr_saved">QR saved to gallery</string>
     <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>
@@ -148,6 +150,15 @@
     <string name="theme_system">System</string>
     <string name="theme_light">Light</string>
     <string name="theme_dark">Dark</string>
+    <string name="settings_pitch_black">Pitch Black</string>
+    <string name="settings_accent_color">Accent Color</string>
+    <string name="accent_blue">Blue</string>
+    <string name="accent_orange">Red</string>
+    <string name="accent_green">Green</string>
+    <string name="accent_custom">Custom</string>
+    <string name="accent_custom_pick">Custom Accent Color</string>
+    <string name="accent_custom_hint">#RRGGBB hex color</string>
+    <string name="accent_invalid_color">Invalid color — enter a valid hex code</string>
     <string name="language">Language</string>
     <string name="lang_english">English</string>
     <string name="lang_dhivehi">ދިވެހި</string>
@@ -208,6 +219,10 @@
     <string name="accounts">Accounts</string>
     <string name="cards">Cards</string>
     <string name="available_balance">Available Balance</string>
+    <string name="account_blocked_label">%1$s blocked</string>
+    <string name="dashboard_blocked_mvr">Blocked MVR</string>
+    <string name="dashboard_blocked_usd">Blocked USD</string>
+    <string name="dashboard_overdue">Overdue Financing</string>
 
     <!-- Transfer -->
     <string name="transfer_tab_quick">Quick Transfer</string>
@@ -223,13 +238,16 @@
     <string name="transfer_lookup_account">Look up account</string>
     <string name="transfer_clear_recipient">Clear recipient</string>
     <string name="transfer_pick_contact">Pick contact</string>
-    <string name="transfer_scan_qr">Scan QR</string>
+    <string name="transfer_scan_qr">Scan to Pay</string>
     <string name="qr_pick_image">Pick image</string>
     <string name="transfer_qr_invalid">Invalid or unsupported QR code</string>
+    <string name="card_qr_paymv_unsupported">PayMV QR is not supported for card payments — switching to transfer</string>
     <string name="qr_camera_permission_title">Camera permission required</string>
     <string name="qr_camera_permission_message">Camera access is needed to scan QR codes. Please grant the permission in Settings.</string>
+    <string name="camera_permission_profile_message">Camera access is needed to take a photo. Please grant the permission in Settings.</string>
     <string name="go_to_settings">Go to Settings</string>
     <string name="transfer_select_source_first">Select a source account first</string>
+    <string name="transfer_no_from_account">Please set a default account or select From account first</string>
     <string name="transfer_enter_account_first">Enter an account number first</string>
     <string name="transfer_account_not_found">Account not found</string>
     <string name="transfer_session_unavailable">Session unavailable — please re-login</string>
@@ -314,6 +332,9 @@
     <string name="card_pay_qr">Scan to Pay</string>
     <string name="card_pay_nfc">Tap to Pay</string>
     <string name="mib_qr_nfc_not_supported">Skill issue on MIB side, Not supported</string>
+    <string name="card_manage">Manage Card</string>
+    <string name="card_set_as_default">Set as Default Card</string>
+    <string name="card_hide_from_dashboard">Hide from Dashboard</string>
     <string name="card_action_change_pin">Change PIN</string>
     <string name="card_action_freeze">Freeze</string>
     <string name="card_action_block">Block</string>

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

@@ -6,4 +6,32 @@
         <item name="colorSecondary">@color/seed_secondary</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
     </style>
+
+    <!-- Accent overlays — applied on API < 31 as fallback when content-based dynamic colors unavailable -->
+    <style name="ThemeOverlay_Accent_Blue" parent="">
+        <item name="colorPrimary">#3F65AD</item>
+        <item name="colorSecondary">#9AD141</item>
+    </style>
+
+    <style name="ThemeOverlay_Accent_Orange" parent="">
+        <item name="colorPrimary">#D32F2F</item>
+        <item name="colorSecondary">#EF9A9A</item>
+    </style>
+
+    <style name="ThemeOverlay_Accent_Green" parent="">
+        <item name="colorPrimary">#4CAF50</item>
+        <item name="colorSecondary">#80CBC4</item>
+    </style>
+
+    <!-- Pitch black overlay — forces pure black surfaces for OLED displays -->
+    <style name="ThemeOverlay_PitchBlack" parent="">
+        <item name="android:colorBackground">#000000</item>
+        <item name="colorSurface">#000000</item>
+        <item name="colorSurfaceVariant">#0d0d0d</item>
+        <item name="colorSurfaceContainer">#0d0d0d</item>
+        <item name="colorSurfaceContainerLow">#000000</item>
+        <item name="colorSurfaceContainerLowest">#000000</item>
+        <item name="colorSurfaceContainerHigh">#1a1a1a</item>
+        <item name="colorSurfaceContainerHighest">#1a1a1a</item>
+    </style>
 </resources>

app/src/main/res/xml/bml_aid_list.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<host-apdu-service xmlns:android="http://schemas.android.com/apk/res/android"
+    android:description="@string/app_name"
+    android:requireDeviceUnlock="false">
+
+    <aid-group
+        android:description="@string/app_name"
+        android:category="payment">
+
+        <!-- PPSE: 2PAY.SYS.DDF01 -->
+        <aid-filter android:name="325041592E5359532E4444463031" />
+
+        <!-- Visa -->
+        <aid-filter android:name="A0000000031010" />
+
+        <!-- Mastercard -->
+        <aid-filter android:name="A0000000041010" />
+
+        <!-- Amex -->
+        <aid-filter android:name="A000000025" />
+
+    </aid-group>
+
+</host-apdu-service>

app/src/main/res/xml/shortcuts.xml

@@ -28,13 +28,13 @@
     </shortcut>
 
     <shortcut
-        android:shortcutId="pay_with_card"
+        android:shortcutId="tap_to_pay"
         android:enabled="true"
         android:icon="@drawable/ic_shortcut_pay_card"
-        android:shortcutShortLabel="@string/nav_pay_with_card"
-        android:shortcutLongLabel="@string/nav_pay_with_card">
+        android:shortcutShortLabel="@string/card_pay_nfc"
+        android:shortcutLongLabel="@string/card_pay_nfc">
         <intent
-            android:action="sh.sar.basedbank.OPEN_PAY_WITH_CARD"
+            android:action="sh.sar.basedbank.TAP_TO_PAY"
             android:targetPackage="sh.sar.basedbank"
             android:targetClass="sh.sar.basedbank.MainActivity" />
         <categories android:name="android.shortcut.conversation" />