version 1.0.7

This reverts commit 1602d061c1.

.idea/deploymentTargetSelector.xml

@@ -3,11 +3,11 @@
   <component name="deploymentTargetSelector">
     <selectionStates>
       <SelectionState runConfigName="app">
-        <option name="selectionMode" value="DROPDOWN" />
+        <option name="selectionMode" value="DIALOG" />
-        <DropdownSelection timestamp="2026-05-18T20:24:18.550107339Z">
+        <DropdownSelection timestamp="2026-05-22T00:11:32.873305232Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="Default" identifier="serial=10.0.1.239:5555;connection=ce61d84c" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=683a9830" />
             </handle>
           </Target>
         </DropdownSelection>
@@ -15,7 +15,7 @@
           <targets>
             <Target type="DEFAULT_BOOT">
               <handle>
-                <DeviceId pluginId="Default" identifier="serial=10.0.1.239:5555;connection=ce61d84c" />
+                <DeviceId pluginId="Default" identifier="serial=10.0.1.239:5555;connection=67d022c2" />
               </handle>
             </Target>
             <Target type="DEFAULT_BOOT">

app/build.gradle.kts

@@ -11,8 +11,8 @@ android {
         applicationId = "sh.sar.basedbank"
         minSdk = 26
         targetSdk = 36
-        versionCode = 3
+        versionCode = 6
-        versionName = "1.0.4"
+        versionName = "1.0.7"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

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

@@ -8,7 +8,7 @@ import sh.sar.basedbank.api.bml.BmlLoginFlow
 import sh.sar.basedbank.api.bml.BmlProfile
 import sh.sar.basedbank.api.bml.BmlSession
 import sh.sar.basedbank.api.fahipay.FahipaySession
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.api.mib.MibLoginFlow
 import sh.sar.basedbank.api.mib.MibProfile
 import sh.sar.basedbank.api.mib.MibSession
@@ -17,14 +17,14 @@ import sh.sar.basedbank.util.CredentialStore
 class BasedBankApp : Application() {
 
     // Held in memory after successful login; cleared on logout
-    var accounts: List<MibAccount> = emptyList()
+    var accounts: List<BankAccount> = emptyList()
     var fullName: String = ""
 
     /** Active MIB sessions keyed by loginId (= MIB username). */
     val mibSessions: MutableMap<String, MibSession> = mutableMapOf()
     val mibProfilesMap: MutableMap<String, List<MibProfile>> = mutableMapOf()
     val mibLoginFlows: MutableMap<String, MibLoginFlow> = mutableMapOf()
-    var mibAccounts: List<MibAccount> = emptyList()
+    var mibAccounts: List<BankAccount> = emptyList()
 
     /**
      * Active BML sessions keyed by profileId (a globally unique GUID per BML profile).
@@ -35,16 +35,16 @@ class BasedBankApp : Application() {
     val bmlProfilesMap: MutableMap<String, List<BmlProfile>> = mutableMapOf()
     /** BML login flows per loginId — hold the web session (cookies) needed for profile activation. */
     val bmlLoginFlows: MutableMap<String, BmlLoginFlow> = mutableMapOf()
-    var bmlAccounts: List<MibAccount> = emptyList()
+    var bmlAccounts: List<BankAccount> = emptyList()
 
     /** Active Fahipay sessions keyed by loginId (= profileId). */
     val fahipaySessions: MutableMap<String, FahipaySession> = mutableMapOf()
-    var fahipayAccounts: List<MibAccount> = emptyList()
+    var fahipayAccounts: List<BankAccount> = emptyList()
 
     // ─── MIB helpers ──────────────────────────────────────────────────────────
 
     /** Returns the MIB session for the given account (matched via loginTag). */
-    fun mibSessionFor(account: MibAccount): MibSession? =
+    fun mibSessionFor(account: BankAccount): MibSession? =
         mibSessions[account.loginTag.removePrefix("mib_")]
 
     /** Returns any available MIB session. */
@@ -73,7 +73,7 @@ class BasedBankApp : Application() {
      * Returns the BML session for the given account.
      * Looks up by profileId first (multi-profile), falls back to loginId (legacy single-profile).
      */
-    fun bmlSessionFor(account: MibAccount): BmlSession? {
+    fun bmlSessionFor(account: BankAccount): BmlSession? {
         val byProfile = if (account.profileId.isNotBlank()) bmlSessions[account.profileId] else null
         return byProfile ?: bmlSessions[account.loginTag.removePrefix("bml_")]
     }
@@ -100,7 +100,7 @@ class BasedBankApp : Application() {
     // ─── Fahipay helpers ──────────────────────────────────────────────────────
 
     /** Returns the Fahipay session for the given account (matched via loginTag = "fahipay_${profileId}"). */
-    fun fahipaySessionFor(account: MibAccount): FahipaySession? =
+    fun fahipaySessionFor(account: BankAccount): FahipaySession? =
         fahipaySessions[account.loginTag.removePrefix("fahipay_")]
 
     /** Serialises all MIB profile-switch + request sequences to prevent session corruption. */

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

@@ -32,6 +32,8 @@ class LockActivity : AppCompatActivity() {
     private lateinit var salt: String
     private lateinit var storedHash: String
     private var biometricsEnabled = false
+    private var autoUnlockPin = false
+    private var pinLength = 4
     private var isVerifying = false
 
     private val lockPrefs get() = getSharedPreferences("lock_attempts", MODE_PRIVATE)
@@ -61,6 +63,8 @@ class LockActivity : AppCompatActivity() {
         val prefs = getSharedPreferences("prefs", MODE_PRIVATE)
         method = prefs.getString("security_method", "pin") ?: "pin"
         biometricsEnabled = prefs.getBoolean("biometrics_enabled", false)
+        autoUnlockPin = prefs.getBoolean("auto_unlock_pin", false)
+        pinLength = prefs.getInt("pin_length", 4)
 
         val stored = CredentialStore(this).loadSecurityHash() ?: run { finish(); return }
         salt = stored.first
@@ -134,13 +138,18 @@ class LockActivity : AppCompatActivity() {
         when (key) {
             "⌫" -> if (pinDigits.isNotEmpty()) { pinDigits.removeLast(); updateDots() }
             "✓" -> if (pinDigits.size >= 4) verifyPin()
-            else -> if (pinDigits.size < 8) { pinDigits.add(key.toInt()); updateDots() }
+            else -> if (pinDigits.size < 8) {
+                pinDigits.add(key.toInt())
+                updateDots()
+                if (autoUnlockPin && pinDigits.size == pinLength) verifyPin()
+            }
         }
     }
 
     private fun updateDots() {
         val n = pinDigits.size
-        binding.tvLockPinDots.text = "●".repeat(n) + "○".repeat(maxOf(4 - n, 0))
+        val total = if (autoUnlockPin) pinLength else maxOf(n, 4)
+        binding.tvLockPinDots.text = "●".repeat(n) + "○".repeat(maxOf(total - n, 0))
     }
 
     private fun verifyPin() {

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

@@ -0,0 +1,198 @@
+package sh.sar.basedbank.api.bml
+
+import org.json.JSONObject
+import sh.sar.basedbank.api.models.BankAccount
+
+data class BmlUserInfo(
+    val fullName: String,
+    val email: String,
+    val mobile: String,
+    val customerId: String,
+    val idCard: String,
+    val birthdate: String
+)
+
+class BmlAccountClient {
+
+    private val client = newBmlApiClient()
+
+    fun fetchAccounts(
+        session: BmlSession,
+        loginTag: String,
+        profileName: String = "Personal",
+        profileId: String = ""
+    ): List<BankAccount> {
+        val resp = client.newCall(bmlApiRequest(session, "$BML_BASE_URL/api/mobile/dashboard")).execute()
+        val code = resp.code
+        val json = resp.body?.string()
+        resp.close()
+        if (code == 401 || code == 419) throw AuthExpiredException()
+        return parseDashboard(json ?: return emptyList(), loginTag, profileName, profileId)
+    }
+
+    /** Lightweight call to verify the session is alive. Throws [AuthExpiredException] on 401/419. */
+    fun checkProfile(session: BmlSession) {
+        val resp = client.newCall(bmlApiRequest(session, "$BML_BASE_URL/api/mobile/profile")).execute()
+        val code = resp.code
+        resp.close()
+        if (code == 401 || code == 419) throw AuthExpiredException()
+    }
+
+    fun fetchUserInfo(session: BmlSession): BmlUserInfo? {
+        val resp = client.newCall(bmlApiRequest(session, "$BML_BASE_URL/api/mobile/userinfo")).execute()
+        val json = resp.body?.string() ?: return null
+        resp.close()
+        return try {
+            val root = JSONObject(json)
+            if (!root.optBoolean("success")) return null
+            val user = root.optJSONObject("payload")?.optJSONObject("user") ?: return null
+            BmlUserInfo(
+                fullName   = user.optString("fullname").trim(),
+                email      = user.optString("email").trim(),
+                mobile     = user.optString("mobile_phone").trim(),
+                customerId = user.optString("customer_number").trim(),
+                idCard     = user.optString("idcard").trim(),
+                birthdate  = user.optString("birthdate").trim()
+            )
+        } catch (_: Exception) { null }
+    }
+
+    fun fetchLoanDetail(session: BmlSession, internalId: String): BmlLoanDetail? {
+        val resp = client.newCall(bmlApiRequest(session, "$BML_BASE_URL/api/mobile/account/$internalId")).execute()
+        val code = resp.code
+        val json = resp.body?.string() ?: return null
+        resp.close()
+        if (code == 401 || code == 419) throw AuthExpiredException()
+        return try {
+            val root = JSONObject(json)
+            if (!root.optBoolean("success")) return null
+            val p = root.optJSONObject("payload") ?: return null
+            BmlLoanDetail(
+                loanAmount       = p.optDouble("loanAmount", 0.0),
+                outstandingAmt   = p.optDouble("outstandingAmt", 0.0),
+                repayAmount      = p.optDouble("repayAmount", 0.0),
+                intRate          = p.optDouble("intRate", 0.0),
+                loanStatus       = p.optString("loanStatus"),
+                startDate        = p.optString("startDate"),
+                endDate          = p.optString("endDate"),
+                noOfRepayOverdue = p.optInt("noOfRepayOverdue", 0),
+                overdueAmount    = p.optDouble("overdueAmount", 0.0)
+            )
+        } catch (_: Exception) { null }
+    }
+
+    fun fetchTransferChannels(session: BmlSession): List<BmlOtpChannel> {
+        val resp = client.newCall(bmlApiRequest(session, "$BML_BASE_URL/api/mobile/transfer")).execute()
+        val json = resp.body?.string() ?: run { resp.close(); return emptyList() }
+        resp.close()
+        return try {
+            val root = JSONObject(json)
+            if (!root.optBoolean("success")) return emptyList()
+            val arr = root.optJSONObject("payload")
+                ?.optJSONObject("transfer")
+                ?.optJSONArray("otpChannel") ?: return emptyList()
+            (0 until arr.length()).map { i ->
+                val ch = arr.getJSONObject(i)
+                BmlOtpChannel(
+                    channel     = ch.optString("channel"),
+                    description = ch.optString("description"),
+                    masked      = ch.optString("masked")
+                )
+            }
+        } catch (_: Exception) { emptyList() }
+    }
+
+    private fun parseDashboard(
+        json: String,
+        loginTag: String,
+        profileName: String,
+        profileId: String
+    ): List<BankAccount> {
+        val root = JSONObject(json)
+        if (!root.optBoolean("success")) return emptyList()
+        val dashboard = root.optJSONObject("payload")?.optJSONArray("dashboard") ?: return emptyList()
+
+        val casaAccounts  = mutableListOf<BankAccount>()
+        val prepaidCards  = mutableListOf<BankAccount>()
+        val loanAccounts  = mutableListOf<BankAccount>()
+
+        for (i in 0 until dashboard.length()) {
+            val item        = dashboard.getJSONObject(i)
+            val currency    = item.optString("currency", "MVR")
+            val accountType = item.optString("account_type", "CASA")
+            val product     = item.optString("product")
+            val accountNumber = item.optString("account")
+            val status      = item.optString("account_status", "Active")
+            val internalId  = item.optString("id", "")
+
+            if (accountType == "CASA") {
+                val available = item.optDouble("availableBalance", 0.0)
+                casaAccounts.add(BankAccount(
+                    bank             = "BML",
+                    profileName      = profileName,
+                    profileType      = "BML",
+                    accountNumber    = accountNumber,
+                    accountBriefName = item.optString("alias"),
+                    currencyName     = currency,
+                    accountTypeName  = product,
+                    availableBalance = "%.2f".format(available),
+                    currentBalance   = "%.2f".format(item.optDouble("ledgerBalance", 0.0)),
+                    blockedAmount    = "%.2f".format(item.optDouble("lockedAmount", 0.0)),
+                    mvrBalance       = if (currency == "MVR") "%.2f".format(available) else "0.00",
+                    statusDesc       = status,
+                    profileImageHash = null,
+                    loginTag         = loginTag,
+                    profileId        = profileId,
+                    internalId       = internalId
+                ))
+            } else if (accountType == "Loan") {
+                val outstanding = Math.abs(item.optDouble("availableBalance", 0.0))
+                loanAccounts.add(BankAccount(
+                    bank             = "BML",
+                    profileName      = profileName,
+                    profileType      = "BML_LOAN",
+                    accountNumber    = accountNumber,
+                    accountBriefName = item.optString("alias"),
+                    currencyName     = currency,
+                    accountTypeName  = product,
+                    availableBalance = "%.2f".format(outstanding),
+                    currentBalance   = "%.2f".format(outstanding),
+                    blockedAmount    = "0.00",
+                    mvrBalance       = "0.00",
+                    statusDesc       = status,
+                    profileImageHash = null,
+                    loginTag         = loginTag,
+                    profileId        = profileId,
+                    internalId       = internalId
+                ))
+            } else if (accountType == "Card") {
+                val isVisible = item.optBoolean("account_visible", false)
+                if (!isVisible) continue
+                val isPrepaid   = item.optBoolean("prepaid_card", false)
+                val cardBalance = item.optJSONObject("cardBalance")
+                val available   = cardBalance?.optDouble("AvailableLimit", 0.0) ?: 0.0
+                val current     = cardBalance?.optDouble("CurrentBalance", 0.0) ?: 0.0
+                prepaidCards.add(BankAccount(
+                    bank             = "BML",
+                    profileName      = profileName,
+                    profileType      = if (isPrepaid) "BML_PREPAID" else "BML_CREDIT",
+                    accountNumber    = accountNumber,
+                    accountBriefName = item.optString("alias").ifBlank { product },
+                    currencyName     = currency,
+                    accountTypeName  = product,
+                    availableBalance = "%.2f".format(available),
+                    currentBalance   = "%.2f".format(current),
+                    blockedAmount    = "0.00",
+                    mvrBalance       = if (currency == "MVR") "%.2f".format(available) else "0.00",
+                    statusDesc       = status,
+                    profileImageHash = null,
+                    loginTag         = loginTag,
+                    profileId        = profileId,
+                    internalId       = internalId
+                ))
+            }
+        }
+
+        return casaAccounts + prepaidCards + loanAccounts
+    }
+}

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

@@ -0,0 +1,21 @@
+package sh.sar.basedbank.api.bml
+
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import java.util.concurrent.TimeUnit
+
+internal const val BML_BASE_URL = "https://www.bankofmaldives.com.mv/internetbanking"
+internal const val BML_USER_AGENT = "bml-mobile-banking/348 (POCO; Android 14; 22101320I)"
+internal const val BML_APP_VERSION = "2.1.44.348"
+
+internal fun newBmlApiClient(): OkHttpClient = OkHttpClient.Builder()
+    .connectTimeout(30, TimeUnit.SECONDS)
+    .readTimeout(30, TimeUnit.SECONDS)
+    .build()
+
+internal fun bmlApiRequest(session: BmlSession, url: String): Request =
+    Request.Builder().url(url)
+        .header("Authorization", "Bearer ${session.accessToken}")
+        .header("User-Agent", BML_USER_AGENT)
+        .header("x-app-version", BML_APP_VERSION)
+        .build()

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

@@ -0,0 +1,95 @@
+package sh.sar.basedbank.api.bml
+
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.json.JSONArray
+import org.json.JSONObject
+import sh.sar.basedbank.api.models.BankContact
+
+class BmlContactsClient {
+
+    private val client = newBmlApiClient()
+
+    fun fetchContacts(session: BmlSession, loginId: String): List<BankContact> {
+        val resp = client.newCall(bmlApiRequest(session, "$BML_BASE_URL/api/mobile/contacts")).execute()
+        val json = resp.body?.string() ?: return emptyList()
+        resp.close()
+        return parseContacts(json, loginId)
+    }
+
+    fun saveContact(
+        session: BmlSession,
+        contactType: String,
+        account: String,
+        alias: String,
+        currency: String? = null,
+        name: String? = null,
+        swift: String? = null
+    ): Boolean {
+        val bodyObj = JSONObject().apply {
+            put("contact_type", contactType)
+            put("account", account)
+            put("alias", alias)
+            if (currency != null) put("currency", currency)
+            if (name != null) put("name", name)
+            if (swift != null) put("swift", swift)
+        }
+        val resp = client.newCall(
+            Request.Builder().url("$BML_BASE_URL/api/mobile/contacts")
+                .post(bodyObj.toString().toRequestBody("application/json".toMediaType()))
+                .header("Authorization", "Bearer ${session.accessToken}")
+                .header("User-Agent", BML_USER_AGENT)
+                .header("x-app-version", BML_APP_VERSION)
+                .header("Accept", "application/json")
+                .build()
+        ).execute()
+        val json = resp.body?.string() ?: return false
+        resp.close()
+        return try { JSONObject(json).optBoolean("success") } catch (_: Exception) { false }
+    }
+
+    fun deleteContact(session: BmlSession, contactId: String): Boolean {
+        val body = """{"_method":"delete"}""".toRequestBody("application/json".toMediaType())
+        val resp = client.newCall(
+            Request.Builder().url("$BML_BASE_URL/api/mobile/contacts/$contactId")
+                .post(body)
+                .header("Authorization", "Bearer ${session.accessToken}")
+                .header("User-Agent", BML_USER_AGENT)
+                .header("x-app-version", BML_APP_VERSION)
+                .header("accept", "application/json")
+                .build()
+        ).execute()
+        val bodyStr = resp.body?.string() ?: return false
+        resp.close()
+        return try { JSONObject(bodyStr).optBoolean("success") } catch (_: Exception) { false }
+    }
+
+    private fun parseContacts(json: String, loginId: String): List<BankContact> {
+        val root = JSONObject(json)
+        if (!root.optBoolean("success")) return emptyList()
+        val payload: JSONArray = root.optJSONArray("payload") ?: return emptyList()
+        val result = mutableListOf<BankContact>()
+        for (i in 0 until payload.length()) {
+            val item = payload.getJSONObject(i)
+            val account = item.optString("account", "")
+            if (account.isBlank()) continue
+            result.add(BankContact(
+                benefNo         = "bml_${item.optInt("id")}",
+                benefName       = item.optString("name"),
+                benefNickName   = item.optString("alias", item.optString("name")),
+                benefAccount    = account,
+                benefType       = "I",
+                bankColor       = "#0066A1",
+                benefBankName   = "Bank of Maldives",
+                bankCode        = "",
+                benefStatus     = item.optString("status", "S"),
+                transferCyDesc  = item.optString("currency", "MVR"),
+                customerImgHash = null,
+                benefCategoryId = "BML",
+                profileId       = loginId
+            ))
+        }
+        return result
+    }
+}

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

@@ -0,0 +1,64 @@
+package sh.sar.basedbank.api.bml
+
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.json.JSONObject
+import java.util.concurrent.TimeUnit
+
+class BmlForeignLimitsClient {
+
+    // Foreign limits use a different host than the main BML API
+    private val BASE_URL = "https://app.bankofmaldives.com.mv/api/v2"
+
+    private val client = OkHttpClient.Builder()
+        .connectTimeout(30, TimeUnit.SECONDS)
+        .readTimeout(30, TimeUnit.SECONDS)
+        .build()
+
+    fun fetchForeignLimits(session: BmlSession): List<BmlForeignLimit> {
+        val resp = client.newCall(
+            Request.Builder().url("$BASE_URL/foreign-limits")
+                .header("Authorization", "Bearer ${session.accessToken}")
+                .header("User-Agent", BML_USER_AGENT)
+                .header("x-app-version", BML_APP_VERSION)
+                .header("Accept", "application/json")
+                .build()
+        ).execute()
+        val code = resp.code
+        val json = resp.body?.string()
+        resp.close()
+        if (code == 401 || code == 419) throw AuthExpiredException()
+        return parseForeignLimits(json ?: return emptyList())
+    }
+
+    private fun parseForeignLimits(json: String): List<BmlForeignLimit> {
+        return try {
+            val root = JSONObject(json)
+            if (!root.optBoolean("success")) return emptyList()
+            val payload = root.optJSONArray("payload") ?: return emptyList()
+            (0 until payload.length()).map { i ->
+                val item  = payload.getJSONObject(i)
+                val usage = item.optJSONObject("usageByCategory") ?: JSONObject()
+                val atm   = usage.optJSONObject("ATM")  ?: JSONObject()
+                val ecom  = usage.optJSONObject("ECOM") ?: JSONObject()
+                val pos   = usage.optJSONObject("POS")  ?: JSONObject()
+                BmlForeignLimit(
+                    type             = item.optString("type", "Debit"),
+                    used             = item.optDouble("used", 0.0),
+                    totalLimit       = item.optDouble("totalLimit", 0.0),
+                    generalCap       = item.optDouble("generalCap", 0.0),
+                    generalRemaining = item.optDouble("generalRemaining", 0.0),
+                    medicalRemaining = item.optDouble("medicalRemaining", 0.0),
+                    isAtmEnabled     = item.optBoolean("isAtmEnabled", false),
+                    isPosEnabled     = item.optBoolean("isPosEnabled", false),
+                    atmRemaining     = atm.optDouble("remaining", 0.0),
+                    atmLimit         = atm.optDouble("limit", 0.0),
+                    ecomRemaining    = ecom.optDouble("remaining", 0.0),
+                    ecomLimit        = ecom.optDouble("limit", 0.0),
+                    posRemaining     = pos.optDouble("remaining", 0.0),
+                    posLimit         = pos.optDouble("limit", 0.0)
+                )
+            }
+        } catch (_: Exception) { emptyList() }
+    }
+}

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

@@ -0,0 +1,174 @@
+package sh.sar.basedbank.api.bml
+
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.json.JSONObject
+import sh.sar.basedbank.api.models.BankTransaction
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+class BmlHistoryClient {
+
+    private val client = newBmlApiClient()
+
+    fun fetchAccountHistory(
+        session: BmlSession,
+        accountId: String,
+        accountDisplayName: String,
+        accountNumber: String,
+        page: Int
+    ): Pair<List<BankTransaction>, Int> {
+        val resp = client.newCall(
+            Request.Builder().url("$BML_BASE_URL/api/mobile/account/$accountId/history/$page")
+                .header("Authorization", "Bearer ${session.accessToken}")
+                .header("User-Agent", BML_USER_AGENT)
+                .header("x-app-version", BML_APP_VERSION)
+                .build()
+        ).execute()
+        val code = resp.code
+        val json = resp.body?.string() ?: return Pair(emptyList(), 0)
+        resp.close()
+        if (code == 401 || code == 419) throw AuthExpiredException()
+        return try {
+            val root = JSONObject(json)
+            if (!root.optBoolean("success")) return Pair(emptyList(), 0)
+            val payload = root.optJSONObject("payload") ?: return Pair(emptyList(), 0)
+            val totalPages = payload.optInt("totalPages", 0)
+            val history = payload.optJSONArray("history") ?: return Pair(emptyList(), totalPages)
+            val transactions = (0 until history.length()).map { i ->
+                val item = history.getJSONObject(i)
+                val desc = item.optString("description").trim()
+                val narrative1 = item.optString("narrative1")
+                val date = when (desc) {
+                    "Purchase" -> parsePurchaseNarrative1(narrative1) ?: item.optString("bookingDate")
+                    "Transfer Debit", "Transfer Credit" -> parseTransferNarrative1(narrative1) ?: item.optString("bookingDate")
+                    else -> item.optString("bookingDate")
+                }
+                BankTransaction(
+                    id                 = item.optString("id"),
+                    date               = date,
+                    description        = desc,
+                    amount             = item.optDouble("amount", 0.0),
+                    currency           = item.optString("currency"),
+                    counterpartyName   = item.optString("narrative2").takeIf { it.isNotBlank() },
+                    reference          = item.optString("reference").takeIf { it.isNotBlank() },
+                    accountNumber      = accountNumber,
+                    accountDisplayName = accountDisplayName,
+                    source             = "BML"
+                )
+            }
+            Pair(transactions, totalPages)
+        } catch (_: Exception) { Pair(emptyList(), 0) }
+    }
+
+    fun fetchCardHistory(
+        session: BmlSession,
+        cardId: String,
+        accountDisplayName: String,
+        accountNumber: String,
+        month: String
+    ): List<BankTransaction> {
+        val body = """{"card":"$cardId","month":"$month"}"""
+            .toRequestBody("application/json".toMediaType())
+        val resp = client.newCall(
+            Request.Builder().url("$BML_BASE_URL/api/mobile/card/statement").post(body)
+                .header("Authorization", "Bearer ${session.accessToken}")
+                .header("User-Agent", BML_USER_AGENT)
+                .header("x-app-version", BML_APP_VERSION)
+                .build()
+        ).execute()
+        val code = resp.code
+        val json = resp.body?.string() ?: return emptyList()
+        resp.close()
+        if (code == 401 || code == 419) throw AuthExpiredException()
+        return try {
+            val root = JSONObject(json)
+            if (!root.optBoolean("success")) return emptyList()
+            val payload = root.optJSONObject("payload") ?: return emptyList()
+            val result = mutableListOf<BankTransaction>()
+
+            val authDetails = payload.optJSONObject("outstanding")
+                ?.optJSONArray("CardOutStdAuthDetails")
+            if (authDetails != null) {
+                for (i in 0 until authDetails.length()) {
+                    val item = authDetails.getJSONObject(i)
+                    result.add(BankTransaction(
+                        id                 = "auth_${item.optString("TranApprCode")}_$i",
+                        date               = item.optString("DateTime"),
+                        description        = item.optString("TranDesc").trim(),
+                        amount             = item.optDouble("BillingAmount", 0.0),
+                        currency           = item.optString("BillingCcy", "MVR"),
+                        counterpartyName   = null,
+                        reference          = item.optString("TranApprCode").takeIf { it.isNotBlank() },
+                        accountNumber      = accountNumber,
+                        accountDisplayName = accountDisplayName,
+                        source             = "BML_CARD"
+                    ))
+                }
+            }
+
+            val unbilled = payload.optJSONObject("unbilled")
+                ?.optJSONArray("CardUnbillTxnDetails")
+            if (unbilled != null) {
+                for (i in 0 until unbilled.length()) {
+                    val item = unbilled.getJSONObject(i)
+                    result.add(BankTransaction(
+                        id                 = "unbilled_${item.optString("TranApprCode")}_$i",
+                        date               = item.optString("DateTime"),
+                        description        = item.optString("TranDesc").trim(),
+                        amount             = item.optDouble("BillingAmount", 0.0),
+                        currency           = item.optString("BillingCcy", "MVR"),
+                        counterpartyName   = null,
+                        reference          = item.optString("TranApprCode").takeIf { it.isNotBlank() },
+                        accountNumber      = accountNumber,
+                        accountDisplayName = accountDisplayName,
+                        source             = "BML_CARD"
+                    ))
+                }
+            }
+
+            val statement = payload.optJSONArray("cardstatement")
+            if (statement != null) {
+                for (i in 0 until statement.length()) {
+                    val item = statement.getJSONObject(i)
+                    result.add(BankTransaction(
+                        id                 = "stmt_${item.optString("TranRef", i.toString())}",
+                        date               = item.optString("TransDate", item.optString("TranDate", "")),
+                        description        = item.optString("TranDesc", item.optString("Description", "")).trim(),
+                        amount             = -item.optDouble("TranAmount", 0.0),
+                        currency           = item.optString("TranCcy", "MVR"),
+                        counterpartyName   = null,
+                        reference          = item.optString("TranRef").takeIf { it.isNotBlank() },
+                        accountNumber      = accountNumber,
+                        accountDisplayName = accountDisplayName,
+                        source             = "BML_CARD"
+                    ))
+                }
+            }
+            result
+        } catch (_: Exception) { emptyList() }
+    }
+
+    // "12-05-2026 041675" → first 4 digits of time part as HH:mm
+    private fun parsePurchaseNarrative1(narrative1: String): String? {
+        return try {
+            val parts = narrative1.split(" ")
+            if (parts.size < 2) null
+            else {
+                val timePart = parts[1].take(4)
+                val combined = "${parts[0]} ${timePart.take(2)}:${timePart.drop(2)}:00"
+                val date = SimpleDateFormat("dd-MM-yyyy HH:mm:ss", Locale.US).parse(combined)
+                date?.let { SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).format(it) }
+            }
+        } catch (_: Exception) { null }
+    }
+
+    // "11-04-2026 13-17-08" → yyyy-MM-dd HH:mm:ss
+    private fun parseTransferNarrative1(narrative1: String): String? {
+        return try {
+            val date = SimpleDateFormat("dd-MM-yyyy HH-mm-ss", Locale.US).parse(narrative1)
+            date?.let { SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).format(it) }
+        } catch (_: Exception) { null }
+    }
+}

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

@@ -7,19 +7,15 @@ import okhttp3.FormBody
 import okhttp3.HttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.RequestBody.Companion.toRequestBody
 import org.json.JSONArray
 import org.json.JSONObject
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
-import sh.sar.basedbank.api.mib.MibBeneficiary
-import sh.sar.basedbank.api.mib.Transaction
 import sh.sar.basedbank.util.Totp
 import java.security.MessageDigest
 import java.security.SecureRandom
-import java.text.SimpleDateFormat
 import java.util.Base64
-import java.util.Locale
 import java.util.concurrent.TimeUnit
 
 class AuthExpiredException : Exception("Session expired")
@@ -53,11 +49,6 @@ class BmlLoginFlow {
         .readTimeout(30, TimeUnit.SECONDS)
         .build()
 
-    private val apiClient = OkHttpClient.Builder()
-        .connectTimeout(30, TimeUnit.SECONDS)
-        .readTimeout(30, TimeUnit.SECONDS)
-        .build()
-
     /** PKCE params — generated once per login and reused across all profile activations. */
     private var codeVerifier: String = ""
     private var codeChallenge: String = ""
@@ -121,15 +112,27 @@ class BmlLoginFlow {
         twoFaResp.close()
         if (twoFaResp.code != 302) throw Exception("OTP verification failed — check your OTP seed")
 
-        // Step 5: GET /web/profile — returns list of profiles for this account
+        // Step 5: GET /web/profile — multi-profile accounts return a 200 with a profile picker;
+        // single-profile accounts skip the picker and redirect straight to /web/redirect with
+        // blaze_identity already set in the response cookies.
         val profileResp = client.newCall(
             Request.Builder().url("$BASE_URL/web/profile")
                 .header("User-Agent", WEB_USER_AGENT).build()
         ).execute()
+        val profileCode = profileResp.code
+        val profileLocation = profileResp.header("Location") ?: ""
         val profileBody = profileResp.body?.string() ?: ""
         profileResp.close()
 
-        lastProfiles = parseProfiles(profileBody)
+        lastProfiles = if (profileCode == 302) {
+            // Any 302 from GET /web/profile means the server auto-activated the sole profile
+            // and blaze_identity is already set — no profile picker shown.
+            // Use username as a stable temporary profileId (unique per login); it will be
+            // replaced by the real BML customer ID after fetchUserInfo in finishBmlLogin().
+            listOf(BmlProfile(profileId = username, name = "Personal", type = "Profile", profileType = "default", autoActivated = true))
+        } else {
+            parseProfiles(profileBody)
+        }
         return lastProfiles
     }
 
@@ -144,6 +147,13 @@ class BmlLoginFlow {
      *   [requestBusinessOtp] + [submitBusinessOtp].
      */
     fun activateProfile(profile: BmlProfile, loginTag: String): BmlActivationResult {
+        // Single-profile accounts: server already activated during login() and set blaze_identity.
+        // autoActivated=true is the sentinel for this case — skip the profile GET entirely.
+        if (profile.autoActivated) {
+            val (session, accounts) = doOAuthAndFetchAccounts(loginTag, profile.name, profile.profileId)
+            return BmlActivationResult.Success(session, accounts)
+        }
+
         val xsrf = xsrfToken()
         val reqBuilder = Request.Builder()
             .url("$BASE_URL/web/profile/${profile.profileId}")
@@ -156,8 +166,9 @@ class BmlLoginFlow {
         resp.close()
 
         return when {
-            code == 409 || (code == 302 && "/web/redirect" in location) -> {
+            code == 409 || (code == 302 && "/web/profile/2fa/business" !in location) -> {
-                // Profile activated — blaze_identity cookie set in response headers
+                // Profile activated — blaze_identity cookie set in response headers.
+                // Any 302 that isn't to the business 2FA page means success.
                 val (session, accounts) = doOAuthAndFetchAccounts(loginTag, profile.name, profile.profileId)
                 BmlActivationResult.Success(session, accounts)
             }
@@ -214,7 +225,7 @@ class BmlLoginFlow {
         code: String,
         profile: BmlProfile,
         loginTag: String
-    ): Pair<BmlSession, List<MibAccount>> {
+    ): Pair<BmlSession, List<BankAccount>> {
         // Refresh XSRF token before submitting
         client.newCall(
             Request.Builder().url("$BASE_URL/web/profile/2fa/business")
@@ -255,7 +266,7 @@ class BmlLoginFlow {
         loginTag: String,
         profileName: String,
         profileId: String
-    ): Pair<BmlSession, List<MibAccount>> {
+    ): Pair<BmlSession, List<BankAccount>> {
         val authorizeUrl = HttpUrl.Builder()
             .scheme("https").host("www.bankofmaldives.com.mv")
             .addPathSegments("internetbanking/oauth/authorize")
@@ -299,401 +310,45 @@ class BmlLoginFlow {
         val tokenJson = tokenResp.body?.string() ?: throw Exception("Empty token response")
         tokenResp.close()
 
-        val accessToken = JSONObject(tokenJson).optString("access_token")
+        val tokenObj = JSONObject(tokenJson)
+        val accessToken = tokenObj.optString("access_token")
             .takeIf { it.isNotBlank() } ?: throw Exception("Token exchange failed")
+        val refreshToken = tokenObj.optString("refresh_token", "")
+        val expiresIn = tokenObj.optLong("expires_in", 0L)
+        val expiresAt = if (expiresIn > 0) System.currentTimeMillis() + expiresIn * 1000L else 0L
 
-        val session = BmlSession(accessToken = accessToken, deviceId = deviceId)
+        val session = BmlSession(accessToken = accessToken, deviceId = deviceId, refreshToken = refreshToken, expiresAt = expiresAt)
-        val accounts = fetchAccounts(session, loginTag, profileName, profileId)
+        val accounts = BmlAccountClient().fetchAccounts(session, loginTag, profileName, profileId)
         return Pair(session, accounts)
     }
+    // ─── Token refresh ───────────────────────────────────────────────────────
 
-    // ─── API methods ─────────────────────────────────────────────────────────
+    /**
-
+     * Uses the saved refresh token to obtain a new access token without re-login.
-    fun fetchAccounts(
+     * Returns a new [BmlSession] with updated tokens.
-        session: BmlSession,
+     */
-        loginTag: String,
+    fun refreshSession(session: BmlSession): BmlSession {
-        profileName: String = "Personal",
+        val body = FormBody.Builder()
-        profileId: String = ""
+            .add("grant_type", "refresh_token")
-    ): List<MibAccount> {
+            .add("refresh_token", session.refreshToken)
-        val resp = apiClient.newCall(apiRequest(session, "$BASE_URL/api/mobile/dashboard")).execute()
+            .add("client_id", CLIENT_ID)
-        val code = resp.code
+            .add("Device-ID", session.deviceId)
-        val json = resp.body?.string()
+            .add("User-Agent", APP_USER_AGENT)
-        resp.close()
+            .add("x-app-version", APP_VERSION)
-        if (code == 401 || code == 419) throw AuthExpiredException()
-        return parseDashboard(json ?: return emptyList(), loginTag, profileName, profileId)
-    }
-
-    fun fetchForeignLimits(session: BmlSession): List<BmlForeignLimit> {
-        val resp = apiClient.newCall(
-            Request.Builder().url("https://app.bankofmaldives.com.mv/api/v2/foreign-limits")
-                .header("Authorization", "Bearer ${session.accessToken}")
-                .header("User-Agent", APP_USER_AGENT)
-                .header("x-app-version", APP_VERSION)
-                .header("Accept", "application/json")
-                .build()
-        ).execute()
-        val code = resp.code
-        val json = resp.body?.string()
-        resp.close()
-        if (code == 401 || code == 419) throw AuthExpiredException()
-        return parseForeignLimits(json ?: return emptyList())
-    }
-
-    data class BmlUserInfo(
-        val fullName: String,
-        val email: String,
-        val mobile: String,
-        val customerId: String,
-        val idCard: String,
-        val birthdate: String
-    )
-
-    fun fetchUserInfo(session: BmlSession): BmlUserInfo? {
-        val resp = apiClient.newCall(apiRequest(session, "$BASE_URL/api/mobile/userinfo")).execute()
-        val json = resp.body?.string() ?: return null
-        resp.close()
-        return try {
-            val root = JSONObject(json)
-            if (!root.optBoolean("success")) return null
-            val user = root.optJSONObject("payload")?.optJSONObject("user") ?: return null
-            BmlUserInfo(
-                fullName = user.optString("fullname").trim(),
-                email = user.optString("email").trim(),
-                mobile = user.optString("mobile_phone").trim(),
-                customerId = user.optString("customer_number").trim(),
-                idCard = user.optString("idcard").trim(),
-                birthdate = user.optString("birthdate").trim()
-            )
-        } catch (_: Exception) { null }
-    }
-
-    fun validateAccount(session: BmlSession, input: String): BmlAccountValidation? {
-        val resp = apiClient.newCall(
-            Request.Builder().url("$BASE_URL/api/mobile/validate/account/$input")
-                .header("Authorization", "Bearer ${session.accessToken}")
-                .header("User-Agent", APP_USER_AGENT)
-                .header("x-app-version", APP_VERSION)
-                .header("Accept", "application/json")
-                .build()
-        ).execute()
-        val json = resp.body?.string() ?: return null
-        resp.close()
-        return try {
-            val root = JSONObject(json)
-            if (!root.optBoolean("success")) return null
-            val payload = root.optJSONObject("payload") ?: return null
-            val trnType = payload.optString("trnType", "")
-            val validationType = payload.optString("validationType", "")
-            if (validationType == "alias") {
-                val cdtrAcct = payload.optJSONObject("CdtrAcct") ?: return null
-                BmlAccountValidation(
-                    trnType = trnType,
-                    validationType = validationType,
-                    account = cdtrAcct.optString("Acct"),
-                    originalInput = input,
-                    name = payload.optString("contact_name").trim(),
-                    alias = null,
-                    currency = payload.optString("currency", "MVR"),
-                    agnt = cdtrAcct.optString("FinInstnId").takeIf { it.isNotBlank() }
-                )
-            } else {
-                BmlAccountValidation(
-                    trnType = trnType,
-                    validationType = validationType,
-                    account = payload.optString("account"),
-                    originalInput = input,
-                    name = payload.optString("name"),
-                    alias = payload.optString("alias").takeIf { it.isNotBlank() && it != "null" },
-                    currency = payload.optString("currency", "MVR")
-                )
-            }
-        } catch (_: Exception) { null }
-    }
-
-    fun verifyMibAccount(session: BmlSession, account: String): BmlAccountValidation? {
-        val resp = apiClient.newCall(
-            Request.Builder().url("$BASE_URL/api/mobile/favara/account-verification/$account/MIB")
-                .header("Authorization", "Bearer ${session.accessToken}")
-                .header("User-Agent", APP_USER_AGENT)
-                .header("x-app-version", APP_VERSION)
-                .header("Accept", "application/json")
-                .build()
-        ).execute()
-        val json = resp.body?.string() ?: return null
-        resp.close()
-        return try {
-            val root = JSONObject(json)
-            if (!root.optBoolean("success")) return null
-            BmlAccountValidation(
-                trnType = "DOT",
-                validationType = "MIB",
-                account = root.optString("account"),
-                originalInput = account,
-                name = root.optString("name"),
-                alias = null,
-                currency = "MVR",
-                agnt = root.optString("agnt").takeIf { it.isNotBlank() }
-            )
-        } catch (_: Exception) { null }
-    }
-
-    fun saveContact(
-        session: BmlSession,
-        contactType: String,
-        account: String,
-        alias: String,
-        currency: String? = null,
-        name: String? = null,
-        swift: String? = null
-    ): Boolean {
-        val bodyObj = JSONObject().apply {
-            put("contact_type", contactType)
-            put("account", account)
-            put("alias", alias)
-            if (currency != null) put("currency", currency)
-            if (name != null) put("name", name)
-            if (swift != null) put("swift", swift)
-        }
-        val resp = apiClient.newCall(
-            Request.Builder().url("$BASE_URL/api/mobile/contacts")
-                .post(bodyObj.toString().toRequestBody("application/json".toMediaType()))
-                .header("Authorization", "Bearer ${session.accessToken}")
-                .header("User-Agent", APP_USER_AGENT)
-                .header("x-app-version", APP_VERSION)
-                .header("Accept", "application/json")
-                .build()
-        ).execute()
-        val json = resp.body?.string() ?: return false
-        resp.close()
-        return try { JSONObject(json).optBoolean("success") } catch (_: Exception) { false }
-    }
-
-    fun fetchContacts(session: BmlSession, loginId: String): List<MibBeneficiary> {
-        val resp = apiClient.newCall(apiRequest(session, "$BASE_URL/api/mobile/contacts")).execute()
-        val json = resp.body?.string() ?: return emptyList()
-        resp.close()
-        return parseContacts(json, loginId)
-    }
-
-    fun initiateTransfer(
-        session: BmlSession,
-        debitAccount: String,
-        creditAccount: String,
-        amount: Double,
-        transferType: String,
-        currency: String,
-        bank: String? = null
-    ): Boolean {
-        val jo = JSONObject().apply {
-            put("debitAccount", debitAccount)
-            put("creditAccount", creditAccount)
-            put("debitAmount", amount)
-            put("transfertype", transferType)
-            put("currency", currency)
-            put("channel", "token")
-            if (bank != null) put("bank", bank)
-        }
-        val body = jo.toString().toRequestBody("application/json".toMediaType())
-        val request = Request.Builder()
-            .url("$BASE_URL/api/mobile/transfer")
-            .post(body)
-            .header("Authorization", "Bearer ${session.accessToken}")
-            .header("User-Agent", APP_USER_AGENT)
-            .header("x-app-version", APP_VERSION)
-            .header("accept", "application/json")
             .build()
-        return apiClient.newCall(request).execute().use { response ->
+        val resp = newBmlApiClient().newCall(
-            val bodyStr = response.body?.string() ?: return@use false
+            Request.Builder().url("$BASE_URL/oauth/token").post(body)
-            try {
+                .header("User-Agent", WEB_USER_AGENT).build()
-                val json = JSONObject(bodyStr)
-                json.optBoolean("success") && json.optInt("code") == 22
-            } catch (_: Exception) { false }
-        }
-    }
-
-    fun confirmTransfer(
-        session: BmlSession,
-        debitAccount: String,
-        creditAccount: String,
-        amount: Double,
-        transferType: String,
-        currency: String,
-        otp: String,
-        remarks: String = "",
-        bank: String? = null
-    ): BmlTransferResult {
-        val jo = JSONObject().apply {
-            put("debitAccount", debitAccount)
-            put("creditAccount", creditAccount)
-            put("debitAmount", amount)
-            put("transfertype", transferType)
-            put("currency", currency)
-            put("channel", "token")
-            put("otp", otp)
-            if (remarks.isNotBlank()) put("remarks", remarks)
-            if (bank != null) put("bank", bank)
-        }
-        val body = jo.toString().toRequestBody("application/json".toMediaType())
-        val request = Request.Builder()
-            .url("$BASE_URL/api/mobile/transfer")
-            .post(body)
-            .header("Authorization", "Bearer ${session.accessToken}")
-            .header("User-Agent", APP_USER_AGENT)
-            .header("x-app-version", APP_VERSION)
-            .header("accept", "application/json")
-            .build()
-        return apiClient.newCall(request).execute().use { response ->
-            val bodyStr = response.body?.string()
-                ?: return@use BmlTransferResult(false, errorMessage = "No response")
-            try {
-                val json = JSONObject(bodyStr)
-                if (!json.optBoolean("success")) {
-                    BmlTransferResult(false, errorMessage = json.optString("message").ifBlank { "Transfer failed" })
-                } else {
-                    val payload = json.optJSONObject("payload")
-                    BmlTransferResult(
-                        success = true,
-                        reference = payload?.optString("reference") ?: "",
-                        timestamp = payload?.optString("timestamp") ?: "",
-                        message = json.optString("message")
-                    )
-                }
-            } catch (_: Exception) { BmlTransferResult(false, errorMessage = "Parse error") }
-        }
-    }
-
-    fun deleteContact(session: BmlSession, contactId: String): Boolean {
-        val body = """{"_method":"delete"}""".toRequestBody("application/json".toMediaType())
-        val request = Request.Builder()
-            .url("$BASE_URL/api/mobile/contacts/$contactId")
-            .post(body)
-            .header("Authorization", "Bearer ${session.accessToken}")
-            .header("User-Agent", APP_USER_AGENT)
-            .header("x-app-version", APP_VERSION)
-            .header("accept", "application/json")
-            .build()
-        return apiClient.newCall(request).execute().use { response ->
-            val bodyStr = response.body?.string() ?: return@use false
-            try { JSONObject(bodyStr).optBoolean("success") } catch (_: Exception) { false }
-        }
-    }
-
-    fun fetchAccountHistory(
-        session: BmlSession,
-        accountId: String,
-        accountDisplayName: String,
-        accountNumber: String,
-        page: Int
-    ): Pair<List<Transaction>, Int> {
-        val resp = apiClient.newCall(
-            Request.Builder().url("$BASE_URL/api/mobile/account/$accountId/history/$page")
-                .header("Authorization", "Bearer ${session.accessToken}")
-                .header("User-Agent", APP_USER_AGENT)
-                .header("x-app-version", APP_VERSION)
-                .build()
         ).execute()
-        val code = resp.code
+        val json = resp.body?.string() ?: throw Exception("Empty refresh response")
-        val json = resp.body?.string() ?: return Pair(emptyList(), 0)
         resp.close()
-        if (code == 401 || code == 419) throw AuthExpiredException()
+        val obj = JSONObject(json)
-        return try {
+        val newAccess = obj.optString("access_token").takeIf { it.isNotBlank() }
-            val root = JSONObject(json)
+            ?: throw Exception("Token refresh failed")
-            if (!root.optBoolean("success")) return Pair(emptyList(), 0)
+        val newRefresh = obj.optString("refresh_token", "").ifBlank { session.refreshToken }
-            val payload = root.optJSONObject("payload") ?: return Pair(emptyList(), 0)
+        val expiresIn = obj.optLong("expires_in", 0L)
-            val totalPages = payload.optInt("totalPages", 0)
+        val expiresAt = if (expiresIn > 0) System.currentTimeMillis() + expiresIn * 1000L else 0L
-            val history = payload.optJSONArray("history") ?: return Pair(emptyList(), totalPages)
+        return BmlSession(accessToken = newAccess, deviceId = session.deviceId, refreshToken = newRefresh, expiresAt = expiresAt)
-            val transactions = (0 until history.length()).map { i ->
-                val item = history.getJSONObject(i)
-                val desc = item.optString("description").trim()
-                val narrative1 = item.optString("narrative1")
-                val date = when (desc) {
-                    "Purchase" -> parsePurchaseNarrative1(narrative1) ?: item.optString("bookingDate")
-                    "Transfer Debit", "Transfer Credit" -> parseTransferNarrative1(narrative1) ?: item.optString("bookingDate")
-                    else -> item.optString("bookingDate")
-                }
-                Transaction(
-                    id = item.optString("id"),
-                    date = date,
-                    description = desc,
-                    amount = item.optDouble("amount", 0.0),
-                    currency = item.optString("currency"),
-                    counterpartyName = item.optString("narrative2").takeIf { it.isNotBlank() },
-                    reference = item.optString("reference").takeIf { it.isNotBlank() },
-                    accountNumber = accountNumber,
-                    accountDisplayName = accountDisplayName,
-                    source = "BML"
-                )
-            }
-            Pair(transactions, totalPages)
-        } catch (_: Exception) { Pair(emptyList(), 0) }
-    }
-
-    fun fetchCardHistory(
-        session: BmlSession,
-        cardId: String,
-        accountDisplayName: String,
-        accountNumber: String,
-        month: String
-    ): List<Transaction> {
-        val body = """{"card":"$cardId","month":"$month"}"""
-            .toRequestBody("application/json".toMediaType())
-        val resp = apiClient.newCall(
-            Request.Builder().url("$BASE_URL/api/mobile/card/statement").post(body)
-                .header("Authorization", "Bearer ${session.accessToken}")
-                .header("User-Agent", APP_USER_AGENT)
-                .header("x-app-version", APP_VERSION)
-                .build()
-        ).execute()
-        val code = resp.code
-        val json = resp.body?.string() ?: return emptyList()
-        resp.close()
-        if (code == 401 || code == 419) throw AuthExpiredException()
-        return try {
-            val root = JSONObject(json)
-            if (!root.optBoolean("success")) return emptyList()
-            val payload = root.optJSONObject("payload") ?: return emptyList()
-            val result = mutableListOf<Transaction>()
-
-            val authDetails = payload.optJSONObject("outstanding")
-                ?.optJSONArray("CardOutStdAuthDetails")
-            if (authDetails != null) {
-                for (i in 0 until authDetails.length()) {
-                    val item = authDetails.getJSONObject(i)
-                    result.add(Transaction(
-                        id = "auth_${item.optString("TranApprCode")}_$i",
-                        date = item.optString("DateTime"),
-                        description = item.optString("TranDesc").trim(),
-                        amount = item.optDouble("BillingAmount", 0.0),
-                        currency = item.optString("BillingCcy", "MVR"),
-                        counterpartyName = null,
-                        reference = item.optString("TranApprCode").takeIf { it.isNotBlank() },
-                        accountNumber = accountNumber,
-                        accountDisplayName = accountDisplayName,
-                        source = "BML_CARD"
-                    ))
-                }
-            }
-
-            val statement = payload.optJSONArray("cardstatement")
-            if (statement != null) {
-                for (i in 0 until statement.length()) {
-                    val item = statement.getJSONObject(i)
-                    result.add(Transaction(
-                        id = "stmt_${item.optString("TranRef", i.toString())}",
-                        date = item.optString("TransDate", item.optString("TranDate", "")),
-                        description = item.optString("TranDesc", item.optString("Description", "")).trim(),
-                        amount = -item.optDouble("TranAmount", 0.0),
-                        currency = item.optString("TranCcy", "MVR"),
-                        counterpartyName = null,
-                        reference = item.optString("TranRef").takeIf { it.isNotBlank() },
-                        accountNumber = accountNumber,
-                        accountDisplayName = accountDisplayName,
-                        source = "BML_CARD"
-                    ))
-                }
-            }
-            result
-        } catch (_: Exception) { emptyList() }
     }
 
     // ─── Parsing ──────────────────────────────────────────────────────────────
@@ -747,148 +402,6 @@ class BmlLoginFlow {
             }
         } catch (_: Exception) { emptyList() }
     }
-
-    private fun parseDashboard(
-        json: String,
-        loginTag: String,
-        profileName: String = "Personal",
-        profileId: String = ""
-    ): List<MibAccount> {
-        val root = JSONObject(json)
-        if (!root.optBoolean("success")) return emptyList()
-        val dashboard = root.optJSONObject("payload")?.optJSONArray("dashboard") ?: return emptyList()
-
-        val casaAccounts = mutableListOf<MibAccount>()
-        val prepaidCards = mutableListOf<MibAccount>()
-
-        for (i in 0 until dashboard.length()) {
-            val item = dashboard.getJSONObject(i)
-            val currency = item.optString("currency", "MVR")
-            val accountType = item.optString("account_type", "CASA")
-            val product = item.optString("product")
-            val accountNumber = item.optString("account")
-            val status = item.optString("account_status", "Active")
-            val internalId = item.optString("id", "")
-
-            if (accountType == "CASA") {
-                val available = item.optDouble("availableBalance", 0.0)
-                casaAccounts.add(MibAccount(
-                    bank        = "BML",
-                    profileName = profileName,
-                    profileType = "BML",
-                    accountNumber = accountNumber,
-                    accountBriefName = item.optString("alias"),
-                    currencyName = currency,
-                    accountTypeName = product,
-                    availableBalance = "%.2f".format(available),
-                    currentBalance = "%.2f".format(item.optDouble("ledgerBalance", 0.0)),
-                    blockedAmount = "%.2f".format(item.optDouble("lockedAmount", 0.0)),
-                    mvrBalance = if (currency == "MVR") "%.2f".format(available) else "0.00",
-                    statusDesc = status,
-                    profileImageHash = null,
-                    loginTag = loginTag,
-                    profileId = profileId,
-                    internalId = internalId
-                ))
-            } else if (accountType == "Card") {
-                val isVisible = item.optBoolean("account_visible", false)
-                if (!isVisible) continue
-                val isPrepaid = item.optBoolean("prepaid_card", false)
-                val cardBalance = item.optJSONObject("cardBalance")
-                val available = cardBalance?.optDouble("AvailableLimit", 0.0) ?: 0.0
-                val current   = cardBalance?.optDouble("CurrentBalance", 0.0) ?: 0.0
-                prepaidCards.add(MibAccount(
-                    bank        = "BML",
-                    profileName = profileName,
-                    profileType = if (isPrepaid) "BML_PREPAID" else "BML_CREDIT",
-                    accountNumber = accountNumber,
-                    accountBriefName = item.optString("alias").ifBlank { product },
-                    currencyName = currency,
-                    accountTypeName = product,
-                    availableBalance = "%.2f".format(available),
-                    currentBalance = "%.2f".format(current),
-                    blockedAmount = "0.00",
-                    mvrBalance = if (currency == "MVR") "%.2f".format(available) else "0.00",
-                    statusDesc = status,
-                    profileImageHash = null,
-                    loginTag = loginTag,
-                    profileId = profileId,
-                    internalId = internalId
-                ))
-            }
-        }
-
-        return casaAccounts + prepaidCards
-    }
-
-    private fun parseForeignLimits(json: String): List<BmlForeignLimit> {
-        return try {
-            val root = JSONObject(json)
-            if (!root.optBoolean("success")) return emptyList()
-            val payload = root.optJSONArray("payload") ?: return emptyList()
-            (0 until payload.length()).map { i ->
-                val item = payload.getJSONObject(i)
-                val usage = item.optJSONObject("usageByCategory") ?: JSONObject()
-                val atm  = usage.optJSONObject("ATM")  ?: JSONObject()
-                val ecom = usage.optJSONObject("ECOM") ?: JSONObject()
-                val pos  = usage.optJSONObject("POS")  ?: JSONObject()
-                BmlForeignLimit(
-                    type             = item.optString("type", "Debit"),
-                    used             = item.optDouble("used", 0.0),
-                    totalLimit       = item.optDouble("totalLimit", 0.0),
-                    generalCap       = item.optDouble("generalCap", 0.0),
-                    generalRemaining = item.optDouble("generalRemaining", 0.0),
-                    medicalRemaining = item.optDouble("medicalRemaining", 0.0),
-                    isAtmEnabled     = item.optBoolean("isAtmEnabled", false),
-                    isPosEnabled     = item.optBoolean("isPosEnabled", false),
-                    atmRemaining     = atm.optDouble("remaining", 0.0),
-                    atmLimit         = atm.optDouble("limit", 0.0),
-                    ecomRemaining    = ecom.optDouble("remaining", 0.0),
-                    ecomLimit        = ecom.optDouble("limit", 0.0),
-                    posRemaining     = pos.optDouble("remaining", 0.0),
-                    posLimit         = pos.optDouble("limit", 0.0)
-                )
-            }
-        } catch (_: Exception) { emptyList() }
-    }
-
-    private fun parseContacts(json: String, loginId: String = ""): List<MibBeneficiary> {
-        val root = JSONObject(json)
-        if (!root.optBoolean("success")) return emptyList()
-        val payload: JSONArray = root.optJSONArray("payload") ?: return emptyList()
-        val result = mutableListOf<MibBeneficiary>()
-        for (i in 0 until payload.length()) {
-            val item = payload.getJSONObject(i)
-            val account = item.optString("account", "")
-            if (account.isBlank()) continue
-            result.add(MibBeneficiary(
-                benefNo = "bml_${item.optInt("id")}",
-                benefName = item.optString("name"),
-                benefNickName = item.optString("alias", item.optString("name")),
-                benefAccount = account,
-                benefType = "I",
-                bankColor = "#0066A1",
-                benefBankName = "Bank of Maldives",
-                bankCode = "",
-                benefStatus = item.optString("status", "S"),
-                transferCyDesc = item.optString("currency", "MVR"),
-                customerImgHash = null,
-                benefCategoryId = "BML",
-                profileId = loginId
-            ))
-        }
-        return result
-    }
-
-    // ─── Helpers ──────────────────────────────────────────────────────────────
-
-    private fun apiRequest(session: BmlSession, url: String) =
-        Request.Builder().url(url)
-            .header("Authorization", "Bearer ${session.accessToken}")
-            .header("User-Agent", APP_USER_AGENT)
-            .header("x-app-version", APP_VERSION)
-            .build()
-
     private fun xsrfToken(): String? =
         cookieStore["www.bankofmaldives.com.mv"]?.firstOrNull { it.name == "XSRF-TOKEN" }?.value
 
@@ -915,25 +428,4 @@ class BmlLoginFlow {
         return bytes.joinToString("") { "%02x".format(it) }
     }
 
-    // "12-05-2026 041675" → first 4 digits of time part as HH:mm
-    private fun parsePurchaseNarrative1(narrative1: String): String? {
-        return try {
-            val parts = narrative1.split(" ")
-            if (parts.size < 2) null
-            else {
-                val timePart = parts[1].take(4)
-                val combined = "${parts[0]} ${timePart.take(2)}:${timePart.drop(2)}:00"
-                val date = SimpleDateFormat("dd-MM-yyyy HH:mm:ss", Locale.US).parse(combined)
-                date?.let { SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).format(it) }
-            }
-        } catch (_: Exception) { null }
-    }
-
-    // "11-04-2026 13-17-08" → yyyy-MM-dd HH:mm:ss
-    private fun parseTransferNarrative1(narrative1: String): String? {
-        return try {
-            val date = SimpleDateFormat("dd-MM-yyyy HH-mm-ss", Locale.US).parse(narrative1)
-            date?.let { SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).format(it) }
-        } catch (_: Exception) { null }
-    }
 }

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

@@ -1,17 +1,22 @@
 package sh.sar.basedbank.api.bml
 
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
 
 data class BmlSession(
     val accessToken: String,
-    val deviceId: String
+    val deviceId: String,
-)
+    val refreshToken: String = "",
+    val expiresAt: Long = 0L       // Unix millis; 0 = unknown
+) {
+    fun isExpired() = expiresAt > 0L && System.currentTimeMillis() >= expiresAt
+}
 
 data class BmlProfile(
     val profileId: String,
     val name: String,
     val type: String,           // "Profile" (personal) or "Business"
-    val profileType: String     // "default" or "business"
+    val profileType: String,    // "default" or "business"
+    val autoActivated: Boolean = false  // true for single-profile accounts where server skips the picker
 )
 
 data class BmlOtpChannel(
@@ -23,7 +28,7 @@ data class BmlOtpChannel(
 sealed class BmlActivationResult {
     data class Success(
         val session: BmlSession,
-        val accounts: List<MibAccount>
+        val accounts: List<BankAccount>
     ) : BmlActivationResult()
     data class NeedsBusinessOtp(
         val channels: List<BmlOtpChannel>
@@ -49,6 +54,18 @@ data class BmlTransferResult(
     val errorMessage: String = ""
 )
 
+data class BmlLoanDetail(
+    val loanAmount: Double,
+    val outstandingAmt: Double,     // negative as returned by API
+    val repayAmount: Double,
+    val intRate: Double,
+    val loanStatus: String,
+    val startDate: String,          // ISO8601 e.g. "2023-10-26T00:00:00+05:00"
+    val endDate: String,
+    val noOfRepayOverdue: Int,
+    val overdueAmount: Double
+)
+
 data class BmlForeignLimit(
     val type: String,
     val used: Double,

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

@@ -0,0 +1,100 @@
+package sh.sar.basedbank.api.bml
+
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.json.JSONObject
+
+class BmlTransferClient {
+
+    private val client = newBmlApiClient()
+
+    /** Step 1: initiate the transfer (triggers OTP). Returns true if the server accepted it. */
+    fun initiateTransfer(
+        session: BmlSession,
+        debitAccount: String,
+        creditAccount: String,
+        amount: Double,
+        transferType: String,
+        currency: String,
+        bank: String? = null,
+        channel: String = "token"
+    ): Boolean {
+        val jo = JSONObject().apply {
+            put("debitAccount", debitAccount)
+            put("creditAccount", creditAccount)
+            put("debitAmount", amount)
+            put("transfertype", transferType)
+            put("currency", currency)
+            put("channel", channel)
+            if (bank != null) put("bank", bank)
+        }
+        val request = Request.Builder()
+            .url("$BML_BASE_URL/api/mobile/transfer")
+            .post(jo.toString().toRequestBody("application/json".toMediaType()))
+            .header("Authorization", "Bearer ${session.accessToken}")
+            .header("User-Agent", BML_USER_AGENT)
+            .header("x-app-version", BML_APP_VERSION)
+            .header("accept", "application/json")
+            .build()
+        return client.newCall(request).execute().use { response ->
+            val bodyStr = response.body?.string() ?: return@use false
+            try {
+                val json = JSONObject(bodyStr)
+                json.optBoolean("success") && json.optInt("code") == 22
+            } catch (_: Exception) { false }
+        }
+    }
+
+    /** Step 2: confirm with OTP. Returns a [BmlTransferResult] with success/reference/error. */
+    fun confirmTransfer(
+        session: BmlSession,
+        debitAccount: String,
+        creditAccount: String,
+        amount: Double,
+        transferType: String,
+        currency: String,
+        otp: String,
+        remarks: String = "",
+        bank: String? = null,
+        channel: String = "token"
+    ): BmlTransferResult {
+        val jo = JSONObject().apply {
+            put("debitAccount", debitAccount)
+            put("creditAccount", creditAccount)
+            put("debitAmount", amount)
+            put("transfertype", transferType)
+            put("currency", currency)
+            put("channel", channel)
+            put("otp", otp)
+            if (remarks.isNotBlank()) put("remarks", remarks)
+            if (bank != null) put("bank", bank)
+        }
+        val request = Request.Builder()
+            .url("$BML_BASE_URL/api/mobile/transfer")
+            .post(jo.toString().toRequestBody("application/json".toMediaType()))
+            .header("Authorization", "Bearer ${session.accessToken}")
+            .header("User-Agent", BML_USER_AGENT)
+            .header("x-app-version", BML_APP_VERSION)
+            .header("accept", "application/json")
+            .build()
+        return client.newCall(request).execute().use { response ->
+            val bodyStr = response.body?.string()
+                ?: return@use BmlTransferResult(false, errorMessage = "No response")
+            try {
+                val json = JSONObject(bodyStr)
+                if (!json.optBoolean("success")) {
+                    BmlTransferResult(false, errorMessage = json.optString("message").ifBlank { "Transfer failed" })
+                } else {
+                    val payload = json.optJSONObject("payload")
+                    BmlTransferResult(
+                        success   = true,
+                        reference = payload?.optString("reference") ?: "",
+                        timestamp = payload?.optString("timestamp") ?: "",
+                        message   = json.optString("message")
+                    )
+                }
+            } catch (_: Exception) { BmlTransferResult(false, errorMessage = "Parse error") }
+        }
+    }
+}

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

@@ -0,0 +1,79 @@
+package sh.sar.basedbank.api.bml
+
+import okhttp3.Request
+import org.json.JSONObject
+
+class BmlValidateClient {
+
+    private val client = newBmlApiClient()
+
+    fun validateAccount(session: BmlSession, input: String): BmlAccountValidation? {
+        val resp = client.newCall(
+            Request.Builder().url("$BML_BASE_URL/api/mobile/validate/account/$input")
+                .header("Authorization", "Bearer ${session.accessToken}")
+                .header("User-Agent", BML_USER_AGENT)
+                .header("x-app-version", BML_APP_VERSION)
+                .header("Accept", "application/json")
+                .build()
+        ).execute()
+        val json = resp.body?.string() ?: return null
+        resp.close()
+        return try {
+            val root = JSONObject(json)
+            if (!root.optBoolean("success")) return null
+            val payload = root.optJSONObject("payload") ?: return null
+            val trnType = payload.optString("trnType", "")
+            val validationType = payload.optString("validationType", "")
+            if (validationType == "alias") {
+                val cdtrAcct = payload.optJSONObject("CdtrAcct") ?: return null
+                BmlAccountValidation(
+                    trnType        = trnType,
+                    validationType = validationType,
+                    account        = cdtrAcct.optString("Acct"),
+                    originalInput  = input,
+                    name           = payload.optString("contact_name").trim(),
+                    alias          = null,
+                    currency       = payload.optString("currency", "MVR"),
+                    agnt           = cdtrAcct.optString("FinInstnId").takeIf { it.isNotBlank() }
+                )
+            } else {
+                BmlAccountValidation(
+                    trnType        = trnType,
+                    validationType = validationType,
+                    account        = payload.optString("account"),
+                    originalInput  = input,
+                    name           = payload.optString("name"),
+                    alias          = payload.optString("alias").takeIf { it.isNotBlank() && it != "null" },
+                    currency       = payload.optString("currency", "MVR")
+                )
+            }
+        } catch (_: Exception) { null }
+    }
+
+    fun verifyMibAccount(session: BmlSession, account: String): BmlAccountValidation? {
+        val resp = client.newCall(
+            Request.Builder().url("$BML_BASE_URL/api/mobile/favara/account-verification/$account/MIB")
+                .header("Authorization", "Bearer ${session.accessToken}")
+                .header("User-Agent", BML_USER_AGENT)
+                .header("x-app-version", BML_APP_VERSION)
+                .header("Accept", "application/json")
+                .build()
+        ).execute()
+        val json = resp.body?.string() ?: return null
+        resp.close()
+        return try {
+            val root = JSONObject(json)
+            if (!root.optBoolean("success")) return null
+            BmlAccountValidation(
+                trnType        = "DOT",
+                validationType = "MIB",
+                account        = root.optString("account"),
+                originalInput  = account,
+                name           = root.optString("name"),
+                alias          = null,
+                currency       = "MVR",
+                agnt           = root.optString("agnt").takeIf { it.isNotBlank() }
+            )
+        } catch (_: Exception) { null }
+    }
+}

app/src/main/java/sh/sar/basedbank/api/fahipay/FahipayAccountClient.kt

@@ -0,0 +1,76 @@
+package sh.sar.basedbank.api.fahipay
+
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.json.JSONObject
+import sh.sar.basedbank.api.models.BankAccount
+import java.util.concurrent.TimeUnit
+
+class FahipayAccountClient {
+
+    private val BASE_URL = "https://fahipay.mv"
+    private val UA = "okhttp/4.12.0"
+
+    private val client = OkHttpClient.Builder()
+        .connectTimeout(30, TimeUnit.SECONDS)
+        .readTimeout(30, TimeUnit.SECONDS)
+        .build()
+
+    private fun Request.Builder.auth(session: FahipaySession): Request.Builder = this
+        .header("authid", session.authId)
+        .header("Cookie", "__Secure-sess=${session.sessionCookie}")
+        .header("content-type", "multipart/form-data")
+        .header("User-Agent", UA)
+
+    fun fetchProfile(session: FahipaySession): FahipayUserProfile {
+        val resp = client.newCall(
+            Request.Builder().url("$BASE_URL/actions/getprofile/?lang=en")
+                .auth(session).build()
+        ).execute()
+        val json = resp.body?.string() ?: throw Exception("Empty profile response")
+        resp.close()
+        val obj = JSONObject(json)
+        val props = obj.optJSONObject("props") ?: JSONObject()
+        return FahipayUserProfile(
+            fullName = obj.optString("fullname").trim(),
+            email = obj.optString("email").trim(),
+            mobile = obj.optString("mobile").trim(),
+            nid = obj.optString("nid").trim(),
+            profileId = obj.optString("profileID").trim(),
+            walletAccount = props.optString("acc", ""),
+            linkedAccounts = props.optJSONObject("accs")?.toString() ?: "{}"
+        )
+    }
+
+    fun fetchBalance(session: FahipaySession): Double {
+        val resp = client.newCall(
+            Request.Builder().url("$BASE_URL/actions/getbalance/?lang=en")
+                .auth(session).build()
+        ).execute()
+        val json = resp.body?.string() ?: return 0.0
+        resp.close()
+        return try {
+            val obj = JSONObject(json)
+            if (obj.optBoolean("error")) 0.0 else obj.optDouble("balance", 0.0)
+        } catch (_: Exception) { 0.0 }
+    }
+
+    fun buildAccount(profile: FahipayUserProfile, balance: Double, loginTag: String): BankAccount =
+        BankAccount(
+            bank             = "FAHIPAY",
+            profileName      = profile.fullName.ifBlank { "Fahipay" },
+            profileType      = "FAHIPAY",
+            accountNumber    = profile.walletAccount,
+            accountBriefName = "Fahipay Wallet",
+            currencyName     = "MVR",
+            accountTypeName  = "Digital Wallet",
+            availableBalance = "%.2f".format(balance),
+            currentBalance   = "%.2f".format(balance),
+            blockedAmount    = "0.00",
+            mvrBalance       = "%.2f".format(balance),
+            statusDesc       = "Active",
+            profileImageHash = null,
+            loginTag         = loginTag,
+            internalId       = profile.profileId
+        )
+}

app/src/main/java/sh/sar/basedbank/api/fahipay/FahipayContactsClient.kt

@@ -0,0 +1,69 @@
+package sh.sar.basedbank.api.fahipay
+
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.json.JSONObject
+import sh.sar.basedbank.api.models.BankContact
+import sh.sar.basedbank.util.AccountInputParser
+import java.util.concurrent.TimeUnit
+
+class FahipayContactsClient {
+
+    private val BASE_URL = "https://fahipay.mv"
+    private val UA = "okhttp/4.12.0"
+
+    private val client = OkHttpClient.Builder()
+        .connectTimeout(30, TimeUnit.SECONDS)
+        .readTimeout(30, TimeUnit.SECONDS)
+        .build()
+
+    fun fetchContacts(session: FahipaySession): List<FahipayContactGroup> {
+        val endpoints = listOf(
+            Triple("FAHIPAY_RAASTAS",       "Raastas",       "ooredooraastas"),
+            Triple("FAHIPAY_RELOAD",        "Reload",        "dhiraagureload"),
+            Triple("FAHIPAY_OOREDOO_BILL",  "Ooredoo Bill",  "ooredoobillpay"),
+            Triple("FAHIPAY_DHIRAAGU_BILL", "Dhiraagu Bill", "dhiraagubillpay")
+        )
+        val result = mutableListOf<FahipayContactGroup>()
+        for ((catId, label, page) in endpoints) {
+            try {
+                val resp = client.newCall(
+                    Request.Builder()
+                        .url("$BASE_URL/api/app/favs/?page=$page&lang=en")
+                        .header("authid", session.authId)
+                        .header("Cookie", "__Secure-sess=${session.sessionCookie}")
+                        .header("User-Agent", UA)
+                        .build()
+                ).execute()
+                val json = resp.body?.string() ?: continue
+                resp.close()
+                val obj = JSONObject(json)
+                val groupObj = obj.optJSONObject(page) ?: continue
+                val contacts = mutableListOf<BankContact>()
+                for (key in groupObj.keys()) {
+                    val entry = groupObj.getJSONObject(key)
+                    val number = entry.optString("number")
+                    val name = entry.optString("name").trim().ifBlank { number }
+                    if (AccountInputParser.detect(number) != AccountInputParser.InputType.PHONE) continue
+                    contacts.add(BankContact(
+                        benefNo          = "fp_${page}_$number",
+                        benefName        = "",
+                        benefNickName    = name,
+                        benefAccount     = number,
+                        benefType        = "FAHIPAY",
+                        bankColor        = "#FF6B00",
+                        benefBankName    = label,
+                        bankCode         = "",
+                        benefStatus      = "",
+                        transferCyDesc   = "",
+                        customerImgHash  = null,
+                        benefCategoryId  = catId,
+                        profileId        = ""
+                    ))
+                }
+                if (contacts.isNotEmpty()) result.add(FahipayContactGroup(catId, label, contacts))
+            } catch (_: Exception) {}
+        }
+        return result
+    }
+}

app/src/main/java/sh/sar/basedbank/api/fahipay/FahipayHistoryClient.kt

@@ -0,0 +1,60 @@
+package sh.sar.basedbank.api.fahipay
+
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.json.JSONObject
+import sh.sar.basedbank.api.models.BankTransaction
+import java.util.concurrent.TimeUnit
+
+class FahipayHistoryClient {
+
+    private val BASE_URL = "https://fahipay.mv"
+    private val UA = "okhttp/4.12.0"
+    private val PAGE_SIZE = 15
+
+    private val client = OkHttpClient.Builder()
+        .connectTimeout(30, TimeUnit.SECONDS)
+        .readTimeout(30, TimeUnit.SECONDS)
+        .build()
+
+    fun fetchHistory(
+        session: FahipaySession,
+        accountDisplayName: String,
+        accountNumber: String,
+        start: Int
+    ): Pair<List<BankTransaction>, Int> {
+        val resp = client.newCall(
+            Request.Builder()
+                .url("$BASE_URL/actions/activity/?s=$start&l=$PAGE_SIZE&lang=en")
+                .header("authid", session.authId)
+                .header("Cookie", "__Secure-sess=${session.sessionCookie}")
+                .header("content-type", "multipart/form-data")
+                .header("User-Agent", UA)
+                .build()
+        ).execute()
+        val json = resp.body?.string() ?: return Pair(emptyList(), 0)
+        resp.close()
+        return try {
+            val obj = JSONObject(json)
+            val total = obj.optInt("total", 0)
+            val entries = obj.optJSONArray("entries") ?: return Pair(emptyList(), total)
+            val list = (0 until entries.length()).map { i ->
+                val e = entries.getJSONObject(i)
+                BankTransaction(
+                    id = e.optString("transaction"),
+                    date = e.optString("date"),
+                    description = e.optString("name").trim(),
+                    amount = e.optDouble("amount", 0.0),
+                    currency = "MVR",
+                    counterpartyName = e.optString("details").takeIf { it.isNotBlank() },
+                    reference = e.optString("transaction").takeIf { it.isNotBlank() },
+                    accountNumber = accountNumber,
+                    accountDisplayName = accountDisplayName,
+                    source = "FAHIPAY",
+                    iconUrl = e.optString("icon").takeIf { it.isNotBlank() }
+                )
+            }
+            Pair(list, total)
+        } catch (_: Exception) { Pair(emptyList(), 0) }
+    }
+}

app/src/main/java/sh/sar/basedbank/api/fahipay/FahipayLoginFlow.kt

@@ -10,10 +10,6 @@ import okhttp3.Request
 import okhttp3.RequestBody
 import okio.Buffer
 import org.json.JSONObject
-import sh.sar.basedbank.api.mib.MibAccount
-import sh.sar.basedbank.api.mib.MibBeneficiary
-import sh.sar.basedbank.api.mib.Transaction
-import sh.sar.basedbank.util.AccountInputParser
 import java.security.SecureRandom
 import java.util.concurrent.TimeUnit
 
@@ -21,8 +17,6 @@ class FahipayLoginFlow {
 
     private val BASE_URL = "https://fahipay.mv"
     private val UA_WEBVIEW = "Mozilla/5.0 (Linux; Android 14; ${Build.MODEL} Build/AP2A.240905.003; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/129.0.6668.70 Mobile Safari/537.36"
-    private val UA_OKHTTP = "okhttp/4.12.0"
-    private val PAGE_SIZE = 15
 
     private val cookieStore = mutableMapOf<String, MutableList<Cookie>>()
     private val cookieJar = object : CookieJar {
@@ -144,165 +138,6 @@ class FahipayLoginFlow {
             ?: throw Exception("No authID in OTP response")
     }
 
-    fun fetchProfile(session: FahipaySession): FahipayUserProfile {
-        val resp = client.newCall(
-            Request.Builder().url("$BASE_URL/actions/getprofile/?lang=en")
-                .header("authid", session.authId)
-                .header("content-type", "multipart/form-data")
-                .header("User-Agent", UA_OKHTTP)
-                .build()
-        ).execute()
-        val json = resp.body?.string() ?: throw Exception("Empty profile response")
-        resp.close()
-
-        val obj = JSONObject(json)
-        val props = obj.optJSONObject("props") ?: JSONObject()
-        return FahipayUserProfile(
-            fullName = obj.optString("fullname").trim(),
-            email = obj.optString("email").trim(),
-            mobile = obj.optString("mobile").trim(),
-            nid = obj.optString("nid").trim(),
-            profileId = obj.optString("profileID").trim(),
-            walletAccount = props.optString("acc", ""),
-            linkedAccounts = props.optJSONObject("accs")?.toString() ?: "{}"
-        )
-    }
-
-    fun fetchBalance(session: FahipaySession): Double {
-        val resp = client.newCall(
-            Request.Builder().url("$BASE_URL/actions/getbalance/?lang=en")
-                .header("authid", session.authId)
-                .header("content-type", "multipart/form-data")
-                .header("User-Agent", UA_OKHTTP)
-                .build()
-        ).execute()
-        val json = resp.body?.string() ?: return 0.0
-        resp.close()
-        return try {
-            val obj = JSONObject(json)
-            if (obj.optBoolean("error")) 0.0 else obj.optDouble("balance", 0.0)
-        } catch (_: Exception) { 0.0 }
-    }
-
-    fun buildAccount(profile: FahipayUserProfile, balance: Double, loginTag: String): MibAccount =
-        MibAccount(
-            bank        = "FAHIPAY",
-            profileName = profile.fullName.ifBlank { "Fahipay" },
-            profileType = "FAHIPAY",
-            accountNumber = profile.walletAccount,
-            accountBriefName = "Fahipay Wallet",
-            currencyName = "MVR",
-            accountTypeName = "Digital Wallet",
-            availableBalance = "%.2f".format(balance),
-            currentBalance = "%.2f".format(balance),
-            blockedAmount = "0.00",
-            mvrBalance = "%.2f".format(balance),
-            statusDesc = "Active",
-            profileImageHash = null,
-            loginTag = loginTag,
-            internalId = profile.profileId
-        )
-
-    /**
-     * Fetches paginated activity history.
-     * @param start  offset (0-based)
-     * @return Pair of (transactions, total count)
-     */
-    fun fetchHistory(
-        session: FahipaySession,
-        accountDisplayName: String,
-        accountNumber: String,
-        start: Int
-    ): Pair<List<Transaction>, Int> {
-        val resp = client.newCall(
-            Request.Builder()
-                .url("$BASE_URL/actions/activity/?s=$start&l=$PAGE_SIZE&lang=en")
-                .header("authid", session.authId)
-                .header("content-type", "multipart/form-data")
-                .header("User-Agent", UA_OKHTTP)
-                .build()
-        ).execute()
-        val json = resp.body?.string() ?: return Pair(emptyList(), 0)
-        resp.close()
-        return try {
-            val obj = JSONObject(json)
-            val total = obj.optInt("total", 0)
-            val entries = obj.optJSONArray("entries") ?: return Pair(emptyList(), total)
-            val list = (0 until entries.length()).map { i ->
-                val e = entries.getJSONObject(i)
-                Transaction(
-                    id = e.optString("transaction"),
-                    date = e.optString("date"),
-                    description = e.optString("name").trim(),
-                    amount = e.optDouble("amount", 0.0),
-                    currency = "MVR",
-                    counterpartyName = e.optString("details").takeIf { it.isNotBlank() },
-                    reference = e.optString("transaction").takeIf { it.isNotBlank() },
-                    accountNumber = accountNumber,
-                    accountDisplayName = accountDisplayName,
-                    source = "FAHIPAY",
-                    iconUrl = e.optString("icon").takeIf { it.isNotBlank() }
-                )
-            }
-            Pair(list, total)
-        } catch (_: Exception) { Pair(emptyList(), 0) }
-    }
-
-    /**
-     * Fetches Fahipay saved favourites for the 4 service groups.
-     * Only includes entries whose number is a valid 7-digit Maldivian phone number (starts with 7 or 9).
-     * Groups with no valid entries are omitted.
-     */
-    fun fetchContacts(session: FahipaySession): List<FahipayContactGroup> {
-        val endpoints = listOf(
-            Triple("FAHIPAY_RAASTAS",       "Raastas",       "ooredooraastas"),
-            Triple("FAHIPAY_RELOAD",        "Reload",        "dhiraagureload"),
-            Triple("FAHIPAY_OOREDOO_BILL",  "Ooredoo Bill",  "ooredoobillpay"),
-            Triple("FAHIPAY_DHIRAAGU_BILL", "Dhiraagu Bill", "dhiraagubillpay")
-        )
-        val result = mutableListOf<FahipayContactGroup>()
-        for ((catId, label, page) in endpoints) {
-            try {
-                val resp = client.newCall(
-                    Request.Builder()
-                        .url("$BASE_URL/api/app/favs/?page=$page&lang=en")
-                        .header("authid", session.authId)
-                        .header("User-Agent", UA_OKHTTP)
-                        .build()
-                ).execute()
-                val json = resp.body?.string() ?: continue
-                resp.close()
-                val obj = JSONObject(json)
-                // Empty group comes back as a JSON array [], not an object — optJSONObject returns null
-                val groupObj = obj.optJSONObject(page) ?: continue
-                val contacts = mutableListOf<MibBeneficiary>()
-                for (key in groupObj.keys()) {
-                    val entry = groupObj.getJSONObject(key)
-                    val number = entry.optString("number")
-                    val name = entry.optString("name").trim().ifBlank { number }
-                    if (AccountInputParser.detect(number) != AccountInputParser.InputType.PHONE) continue
-                    contacts.add(MibBeneficiary(
-                        benefNo = "fp_${page}_$number",
-                        benefName = "",
-                        benefNickName = name,
-                        benefAccount = number,
-                        benefType = "FAHIPAY",
-                        bankColor = "#FF6B00",
-                        benefBankName = label,
-                        bankCode = "",
-                        benefStatus = "",
-                        transferCyDesc = "",
-                        customerImgHash = null,
-                        benefCategoryId = catId,
-                        profileId = ""
-                    ))
-                }
-                if (contacts.isNotEmpty()) result.add(FahipayContactGroup(catId, label, contacts))
-            } catch (_: Exception) {}
-        }
-        return result
-    }
-
     private fun deviceParts(deviceUuid: String): Array<Pair<String, String>> = arrayOf(
         "device[available]" to "true",
         "device[platform]" to "Android",

app/src/main/java/sh/sar/basedbank/api/fahipay/FahipayModels.kt

@@ -1,5 +1,7 @@
 package sh.sar.basedbank.api.fahipay
 
+import sh.sar.basedbank.api.models.BankContact
+
 data class FahipaySession(
     val authId: String,
     val sessionCookie: String
@@ -23,5 +25,5 @@ data class FahipayLoginStep(
 data class FahipayContactGroup(
     val categoryId: String,
     val label: String,
-    val contacts: List<sh.sar.basedbank.api.mib.MibBeneficiary>
+    val contacts: List<BankContact>
 )

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

@@ -0,0 +1,62 @@
+package sh.sar.basedbank.api.mib
+
+import okhttp3.FormBody
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.json.JSONObject
+import java.util.concurrent.TimeUnit
+
+class MibCardsClient {
+
+    private val BASE_WV_URL = "https://faisamobilex-wv.mib.com.mv"
+
+    private val client = OkHttpClient.Builder()
+        .connectTimeout(20, TimeUnit.SECONDS)
+        .readTimeout(20, TimeUnit.SECONDS)
+        .build()
+
+    private fun cookieHeader(session: MibSession) =
+        "mbmodel=IOS-1.0; xxid=${session.xxid}; IBSID=${session.xxid}; " +
+        "mbnonce=${session.nonceGenerator}; time-tracker=597"
+
+    fun fetchCards(session: MibSession, loginTag: String): List<MibCard> {
+        val body = FormBody.Builder()
+            .add("name", "")
+            .add("start", "1")
+            .add("end", "50")
+            .add("includeCount", "1")
+            .build()
+
+        val request = Request.Builder()
+            .url("$BASE_WV_URL/ajaxDebitCard/fetchCardInfos")
+            .post(body)
+            .header("Cookie", cookieHeader(session))
+            .header("User-Agent", "Mozilla/5.0 (Linux; Android 14; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/129.0.6668.70 Mobile Safari/537.36")
+            .header("X-Requested-With", "XMLHttpRequest")
+            .header("Accept", "*/*")
+            .header("Origin", BASE_WV_URL)
+            .header("Referer", "$BASE_WV_URL//debitCards?dashurl=1")
+            .build()
+
+        return client.newCall(request).execute().use { response ->
+            val bodyStr = response.body?.string() ?: return emptyList()
+            val json = try { JSONObject(bodyStr) } catch (_: Exception) { return emptyList() }
+            if (!json.optBoolean("success")) return emptyList()
+            val data = json.optJSONArray("data") ?: return emptyList()
+            (0 until data.length()).map { i ->
+                val item = data.getJSONObject(i)
+                MibCard(
+                    cardId = item.optString("cardId"),
+                    maskedCardNumber = item.optString("maskedCardNumber"),
+                    cardStatus = item.optString("cardStatus"),
+                    cardType = item.optString("cardType"),
+                    cardTypeDesc = item.optString("cardTypeDesc"),
+                    customerId = item.optString("customerId"),
+                    phoneNumber = item.optString("phoneNumber"),
+                    cardHolderName = item.optString("cardHolderName"),
+                    loginTag = loginTag
+                )
+            }
+        }
+    }
+}

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

@@ -356,44 +356,6 @@ class MibLoginFlow(private val credentialStore: CredentialStore) {
         }
     }
 
-    data class MibPersonalProfile(
-        val fullName: String,
-        val username: String,
-        val email: String,
-        val mobile: String,
-        val enrolled: String
-    )
-
-    /** Fetches the customer's profile info from the Faisanet personal profile page. */
-    fun fetchPersonalProfile(session: MibSession): MibPersonalProfile? {
-        val cookieHeader = "mbmodel=IOS-1.0; xxid=${session.xxid}; " +
-            "IBSID=${session.xxid}; mbnonce=${session.nonceGenerator}; time-tracker=597"
-        val request = Request.Builder()
-            .url("https://faisamobilex-wv.mib.com.mv/personalProfile")
-            .get()
-            .header("Cookie", cookieHeader)
-            .build()
-        return try {
-            val resp = client.newCall(request).execute()
-            val html = resp.body?.string() ?: return null
-            resp.close()
-            fun scrape(label: String): String {
-                val r = Regex("""<span[^>]*>\s*<b[^>]*>\s*$label\s*</b[^>]*>.*?<span[^>]*>([^<]+)</span>""",
-                    setOf(RegexOption.DOT_MATCHES_ALL, RegexOption.IGNORE_CASE))
-                return r.find(html)?.groupValues?.get(1)?.trim() ?: ""
-            }
-            val nameRegex = Regex("""<h5 class="mb-1 text-dark fw-semibold">\s*([^<]+)\s*</h5>""")
-            val fullName = nameRegex.find(html)?.groupValues?.get(1)?.trim() ?: return null
-            MibPersonalProfile(
-                fullName = fullName,
-                username = scrape("Username:"),
-                email = scrape("Email:"),
-                mobile = scrape("Mobile no:"),
-                enrolled = scrape("Enrolled:")
-            )
-        } catch (_: Exception) { null }
-    }
-
     /** Fetches a profile image via P41. Returns base64 JPEG string, or null if not found. */
     fun fetchProfileImage(session: MibSession, imageHash: String): String? {
         val payload = baseData(session, "P41").apply {

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

@@ -1,5 +1,16 @@
 package sh.sar.basedbank.api.mib
 
+import sh.sar.basedbank.api.models.BankAccount
+import sh.sar.basedbank.api.models.BankContact
+import sh.sar.basedbank.api.models.BankContactCategory
+import sh.sar.basedbank.api.models.BankTransaction
+
+// Kept for source compatibility within the mib package
+typealias MibAccount = BankAccount
+typealias MibBeneficiary = BankContact
+typealias Transaction = BankTransaction
+typealias MibBeneficiaryCategory = BankContactCategory
+
 data class MibSession(
     val appId: String,
     val xxid: String,
@@ -19,25 +30,6 @@ data class MibProfile(
     val customerImage: String?
 )
 
-data class MibAccount(
-    val bank: String,             // "MIB", "BML", "FAHIPAY" — set by the login flow
-    val profileName: String,
-    val profileType: String,
-    val cifType: String = "",     // MIB: human-readable profile category (e.g. "Individual", "Sole Propr"); empty for other banks
-    val accountNumber: String,
-    val accountBriefName: String,
-    val currencyName: String,
-    val accountTypeName: String,
-    val availableBalance: String,
-    val currentBalance: String,
-    val blockedAmount: String,
-    val mvrBalance: String,
-    val statusDesc: String,
-    val profileImageHash: String?,
-    val loginTag: String = "",
-    val profileId: String = "",  // MIB profile ID; empty for BML accounts
-    val internalId: String = ""  // BML internal UUID; empty for MIB accounts
-)
 
 data class MibTransferResult(
     val success: Boolean,
@@ -46,27 +38,6 @@ data class MibTransferResult(
     val errorMessage: String = ""
 )
 
-data class MibBeneficiaryCategory(
-    val id: String,
-    val categoryName: String,
-    val numBenef: Int
-)
-
-data class MibBeneficiary(
-    val benefNo: String,
-    val benefName: String,
-    val benefNickName: String,
-    val benefAccount: String,
-    val benefType: String,       // L=Local, I=Internal(MIB), S=Swift
-    val bankColor: String,
-    val benefBankName: String,
-    val bankCode: String,
-    val benefStatus: String,
-    val transferCyDesc: String,
-    val customerImgHash: String?,
-    val benefCategoryId: String,  // "0" = uncategorized
-    val profileId: String = ""    // MIB profile ID; empty for BML contacts
-)
 
 data class MibIpsAccountInfo(
     val accountName: String,
@@ -74,18 +45,17 @@ data class MibIpsAccountInfo(
     val bankId: String
 )
 
-data class Transaction(
+
-    val id: String,
+data class MibCard(
-    val date: String,                   // "YYYY-MM-DD HH:mm:ss" for MIB, ISO8601 for BML
+    val cardId: String,
-    val description: String,
+    val maskedCardNumber: String,
-    val amount: Double,                 // negative = debit, positive = credit
+    val cardStatus: String,
-    val currency: String,
+    val cardType: String,
-    val counterpartyName: String?,
+    val cardTypeDesc: String,
-    val reference: String?,
+    val customerId: String,
-    val accountNumber: String,
+    val phoneNumber: String,
-    val accountDisplayName: String,
+    val cardHolderName: String,
-    val source: String,                 // "MIB", "BML", "BML_CARD", "FAHIPAY"
+    val loginTag: String
-    val iconUrl: String? = null         // merchant icon URL (Fahipay only)
 )
 
 data class MibFinanceDeal(

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

@@ -0,0 +1,50 @@
+package sh.sar.basedbank.api.mib
+
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import java.util.concurrent.TimeUnit
+
+data class MibPersonalProfile(
+    val fullName: String,
+    val username: String,
+    val email: String,
+    val mobile: String,
+    val enrolled: String
+)
+
+class MibProfileClient {
+
+    private val client = OkHttpClient.Builder()
+        .connectTimeout(30, TimeUnit.SECONDS)
+        .readTimeout(30, TimeUnit.SECONDS)
+        .build()
+
+    fun fetchPersonalProfile(session: MibSession): MibPersonalProfile? {
+        val cookieHeader = "mbmodel=IOS-1.0; xxid=${session.xxid}; " +
+            "IBSID=${session.xxid}; mbnonce=${session.nonceGenerator}; time-tracker=597"
+        val request = Request.Builder()
+            .url("https://faisamobilex-wv.mib.com.mv/personalProfile")
+            .get()
+            .header("Cookie", cookieHeader)
+            .build()
+        return try {
+            val resp = client.newCall(request).execute()
+            val html = resp.body?.string() ?: return null
+            resp.close()
+            fun scrape(label: String): String {
+                val r = Regex("""<span[^>]*>\s*<b[^>]*>\s*$label\s*</b[^>]*>.*?<span[^>]*>([^<]+)</span>""",
+                    setOf(RegexOption.DOT_MATCHES_ALL, RegexOption.IGNORE_CASE))
+                return r.find(html)?.groupValues?.get(1)?.trim() ?: ""
+            }
+            val nameRegex = Regex("""<h5 class="mb-1 text-dark fw-semibold">\s*([^<]+)\s*</h5>""")
+            val fullName = nameRegex.find(html)?.groupValues?.get(1)?.trim() ?: return null
+            MibPersonalProfile(
+                fullName = fullName,
+                username = scrape("Username:"),
+                email = scrape("Email:"),
+                mobile = scrape("Mobile no:"),
+                enrolled = scrape("Enrolled:")
+            )
+        } catch (_: Exception) { null }
+    }
+}

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

@@ -68,6 +68,7 @@ class MibTransferClient {
             .withWvHeaders(session)
             .build()
         return client.newCall(request).execute().use { response ->
+            if (response.code == 419) throw SessionExpiredException()
             val bodyStr = response.body?.string() ?: ""
             val json = try { JSONObject(bodyStr) } catch (_: Exception) { null }
             if (json == null || !json.optBoolean("success")) {

app/src/main/java/sh/sar/basedbank/api/models/BankModels.kt

@@ -0,0 +1,72 @@
+package sh.sar.basedbank.api.models
+
+/**
+ * Unified account model used across all banks (MIB, BML, Fahipay, ...).
+ * The [bank] field identifies which bank owns this account.
+ */
+data class BankAccount(
+    val bank: String,             // "MIB", "BML", "FAHIPAY" — set by the login flow
+    val profileName: String,
+    val profileType: String,
+    val cifType: String = "",     // MIB: human-readable profile category (e.g. "Individual", "Sole Propr"); empty for other banks
+    val accountNumber: String,
+    val accountBriefName: String,
+    val currencyName: String,
+    val accountTypeName: String,
+    val availableBalance: String,
+    val currentBalance: String,
+    val blockedAmount: String,
+    val mvrBalance: String,
+    val statusDesc: String,
+    val profileImageHash: String?,
+    val loginTag: String = "",
+    val profileId: String = "",   // profile ID used by the bank; empty if not applicable
+    val internalId: String = ""   // bank-internal UUID or ID; empty if not applicable
+)
+
+/**
+ * Unified contact/beneficiary model used across all banks.
+ * Each bank may interpret fields differently; see per-bank notes below.
+ */
+data class BankContact(
+    val benefNo: String,
+    val benefName: String,
+    val benefNickName: String,
+    val benefAccount: String,
+    val benefType: String,        // MIB: L=Local, I=Internal, S=Swift; BML: "I"; Fahipay: "FAHIPAY"
+    val bankColor: String,
+    val benefBankName: String,
+    val bankCode: String,
+    val benefStatus: String,
+    val transferCyDesc: String,
+    val customerImgHash: String?,
+    val benefCategoryId: String,  // MIB: numeric category ID or "0"; BML: "BML"; Fahipay: "FAHIPAY"
+    val profileId: String = ""    // owning profile ID; empty where not applicable
+)
+
+/**
+ * Contact category (group) used across MIB and Fahipay.
+ */
+data class BankContactCategory(
+    val id: String,
+    val categoryName: String,
+    val numBenef: Int
+)
+
+/**
+ * Unified transaction model used across all banks.
+ * [source] identifies the originating bank/account type.
+ */
+data class BankTransaction(
+    val id: String,
+    val date: String,                   // "YYYY-MM-DD HH:mm:ss" (MIB/BML normalised) or ISO8601
+    val description: String,
+    val amount: Double,                 // negative = debit, positive = credit
+    val currency: String,
+    val counterpartyName: String?,
+    val reference: String?,
+    val accountNumber: String,
+    val accountDisplayName: String,
+    val source: String,                 // "MIB", "BML", "BML_CARD", "FAHIPAY"
+    val iconUrl: String? = null         // merchant icon URL (Fahipay only)
+)

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

@@ -9,8 +9,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
-import sh.sar.basedbank.api.mib.Transaction
+import sh.sar.basedbank.api.models.BankTransaction
 import sh.sar.basedbank.util.AccountHistoryDisplay
 import sh.sar.basedbank.databinding.ItemAccountHistoryHeaderBinding
 import sh.sar.basedbank.databinding.ItemDateHeaderBinding
@@ -21,13 +21,13 @@ import java.util.Date
 import java.util.Locale
 
 class AccountHistoryAdapter(
-    private val account: MibAccount,
+    private val account: BankAccount,
     private val display: AccountHistoryDisplay
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     private sealed class Item {
         data class DateHeader(val label: String) : Item()
-        data class Trx(val transaction: Transaction) : Item()
+        data class Trx(val transaction: BankTransaction) : Item()
     }
 
     private val displayItems = mutableListOf<Item>()
@@ -36,7 +36,18 @@ class AccountHistoryAdapter(
     private val iconUrlCache = mutableMapOf<String, Bitmap>()
     var onImageNeeded: ((counterpartyName: String) -> Unit)? = null
     var onIconUrlNeeded: ((url: String) -> Unit)? = null
-    var onTransferClick: ((MibAccount) -> Unit)? = null
+    var onTransferClick: ((BankAccount) -> Unit)? = null
+    private var hideAmounts: Boolean = false
+
+    fun setHideAmounts(hide: Boolean) {
+        if (hideAmounts == hide) return
+        hideAmounts = hide
+        notifyItemChanged(0) // refresh header card
+        // refresh all transaction rows
+        for (i in displayItems.indices) {
+            if (displayItems[i] is Item.Trx) notifyItemChanged(i + 1)
+        }
+    }
 
     fun updateImage(counterpartyName: String, bitmap: Bitmap) {
         imageCache[counterpartyName] = bitmap
@@ -73,7 +84,7 @@ class AccountHistoryAdapter(
      * Display the given (already sorted + filtered) list with date group headers.
      * Silently resets the loading footer so notifyDataSetChanged covers everything.
      */
-    fun setTransactions(transactions: List<Transaction>) {
+    fun setTransactions(transactions: List<BankTransaction>) {
         _showLoadingFooter = false
         displayItems.clear()
         lastInsertedDateKey = ""
@@ -94,7 +105,7 @@ class AccountHistoryAdapter(
      * Appends [newTransactions] (assumed to be older than all existing items) using incremental
      * notifications, so the RecyclerView doesn't reset scroll position.
      */
-    fun appendTransactions(newTransactions: List<Transaction>) {
+    fun appendTransactions(newTransactions: List<BankTransaction>) {
         if (newTransactions.isEmpty()) return
         if (_showLoadingFooter) {
             val pos = itemCount - 1
@@ -154,10 +165,10 @@ class AccountHistoryAdapter(
             b.tvHeaderAccountNumber.text = d.number
             b.tvHeaderPillBank.text      = d.bankPill
             b.tvHeaderPillType.text      = d.typeLabel
-            b.tvHeaderAvailable.text     = d.availableBalance
+            b.tvHeaderAvailable.text     = if (hideAmounts) maskAmount(d.availableBalance) else d.availableBalance
-            b.tvHeaderBalance.text       = d.workingBalance
+            b.tvHeaderBalance.text       = if (hideAmounts) maskAmount(d.workingBalance) else d.workingBalance
             if (d.blockedBalance != null) {
-                b.tvHeaderBlocked.text       = d.blockedBalance
+                b.tvHeaderBlocked.text       = if (hideAmounts) maskAmount(d.blockedBalance) else d.blockedBalance
                 b.llHeaderBlocked.visibility = View.VISIBLE
             } else {
                 b.llHeaderBlocked.visibility = View.GONE
@@ -173,7 +184,7 @@ class AccountHistoryAdapter(
 
     inner class TransactionVH(private val b: ItemTransactionBinding) :
         RecyclerView.ViewHolder(b.root) {
-        fun bind(trx: Transaction) {
+        fun bind(trx: BankTransaction) {
             val isCredit = trx.amount >= 0
             val color = sourceColor(trx.source)
             val name = trx.counterpartyName ?: trx.description
@@ -211,17 +222,22 @@ class AccountHistoryAdapter(
 
             b.tvDate.text = formatTime(trx.date)
 
-            val sign = if (isCredit) "+" else "-"
+            if (hideAmounts) {
-            val absAmt = "%.2f".format(kotlin.math.abs(trx.amount))
+                b.tvAmount.text = "${trx.currency} ••••••"
-            b.tvAmount.text = "$sign ${trx.currency} $absAmt"
+                b.tvAmount.setTextColor(Color.parseColor("#888888"))
-            b.tvAmount.setTextColor(
+            } else {
-                if (isCredit) Color.parseColor("#4CAF50") else Color.parseColor("#FF7043")
+                val sign = if (isCredit) "+" else "-"
-            )
+                val absAmt = "%.2f".format(kotlin.math.abs(trx.amount))
+                b.tvAmount.text = "$sign ${trx.currency} $absAmt"
+                b.tvAmount.setTextColor(
+                    if (isCredit) Color.parseColor("#4CAF50") else Color.parseColor("#FF7043")
+                )
+            }
 
             b.root.setOnClickListener { showDetail(trx) }
         }
 
-        private fun showDetail(trx: Transaction) {
+        private fun showDetail(trx: BankTransaction) {
             val ctx = b.root.context
             val title = trx.counterpartyName?.takeIf { it.isNotBlank() } ?: trx.description
             val details = buildString {
@@ -282,6 +298,11 @@ class AccountHistoryAdapter(
             return FULL_DATE_FMT.format(date)
         }
 
+        fun maskAmount(formatted: String): String {
+            val currency = formatted.substringBefore(' ', formatted)
+            return "$currency ••••••"
+        }
+
         fun sourceColor(source: String) = when (source) {
             "MIB" -> "#FE860E"
             "BML", "BML_CARD" -> "#0066A1"

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

@@ -22,9 +22,9 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import sh.sar.basedbank.BasedBankApp
 import sh.sar.basedbank.R
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.api.mib.MibContactsClient
-import sh.sar.basedbank.api.mib.Transaction
+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
@@ -39,10 +39,10 @@ class AccountHistoryFragment : Fragment() {
     private val viewModel: HomeViewModel by activityViewModels()
 
     private lateinit var adapter: AccountHistoryAdapter
-    private lateinit var account: MibAccount
+    private lateinit var account: BankAccount
     private lateinit var fetcher: HistoryFetcher
 
-    private val allTransactions = mutableListOf<Transaction>()
+    private val allTransactions = mutableListOf<BankTransaction>()
     private var searchQuery = ""
     private var firstPageDone = false
     private val pendingImageNames = mutableSetOf<String>()
@@ -53,7 +53,7 @@ class AccountHistoryFragment : Fragment() {
     companion object {
         private const val ARG_ACCOUNT_NUMBER = "account_number"
 
-        fun newInstance(account: MibAccount) = AccountHistoryFragment().apply {
+        fun newInstance(account: BankAccount) = AccountHistoryFragment().apply {
             arguments = Bundle().apply {
                 putString(ARG_ACCOUNT_NUMBER, account.accountNumber)
             }
@@ -77,6 +77,8 @@ class AccountHistoryFragment : Fragment() {
         adapter.onTransferClick = { acc ->
             (activity as? HomeActivity)?.navigateTo(R.id.nav_transfer, TransferFragment.newInstanceFrom(acc))
         }
+        adapter.setHideAmounts(viewModel.hideAmounts.value ?: false)
+        viewModel.hideAmounts.observe(viewLifecycleOwner) { adapter.setHideAmounts(it) }
         binding.recyclerView.layoutManager = LinearLayoutManager(requireContext())
         binding.recyclerView.adapter = adapter
 
@@ -116,6 +118,14 @@ class AccountHistoryFragment : Fragment() {
         }
         (activity as? HomeActivity)?.setRefreshing(true)
         loadNextPage()
+
+        binding.swipeRefresh.setOnRefreshListener {
+            if (isLoading) {
+                binding.swipeRefresh.isRefreshing = false
+            } else {
+                resetAndReload()
+            }
+        }
     }
 
     override fun onResume() {
@@ -133,6 +143,17 @@ class AccountHistoryFragment : Fragment() {
         binding.emptyView.visibility = if (filtered.isEmpty() && !isLoading) View.VISIBLE else View.GONE
     }
 
+    private fun resetAndReload() {
+        allTransactions.clear()
+        pendingImageNames.clear()
+        pendingIconUrls.clear()
+        firstPageDone = false
+        fetcher = HistoryFetcher(account)
+        adapter.setTransactions(emptyList())
+        binding.emptyView.visibility = View.GONE
+        loadNextPage()
+    }
+
     private fun loadNextPage() {
         if (isLoading || !fetcher.hasMore()) return
         isLoading = true
@@ -151,6 +172,7 @@ class AccountHistoryFragment : Fragment() {
             if (!firstPageDone) {
                 firstPageDone = true
                 (activity as? HomeActivity)?.setRefreshing(false)
+                binding.swipeRefresh.isRefreshing = false
             }
 
             if (transactions.isNotEmpty()) {

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

@@ -8,7 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.recyclerview.widget.RecyclerView
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.databinding.ItemAccountBinding
 import sh.sar.basedbank.databinding.ItemCardBinding
 import sh.sar.basedbank.databinding.ItemDateHeaderBinding
@@ -16,32 +16,39 @@ import sh.sar.basedbank.util.AccountListDisplay
 import sh.sar.basedbank.util.AccountListParser
 
 class AccountsAdapter(
-    accounts: List<MibAccount>,
+    accounts: List<BankAccount>,
-    private val onAccountClick: (MibAccount) -> Unit = {}
+    private val onAccountClick: (BankAccount) -> Unit = {}
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-    var onTransferClick: ((MibAccount) -> Unit)? = null
+    var onTransferClick: ((BankAccount) -> Unit)? = null
+    private var hideAmounts: Boolean = false
 
     private sealed class Item {
         data class SectionTitle(val label: String) : Item()
-        data class Account(val account: MibAccount, val display: AccountListDisplay) : Item()
+        data class Account(val account: BankAccount, val display: AccountListDisplay) : Item()
-        data class Card(val account: MibAccount, val display: AccountListDisplay) : Item()
+        data class Card(val account: BankAccount, val display: AccountListDisplay) : Item()
     }
 
     private val items: MutableList<Item> = buildItems(accounts).toMutableList()
 
-    fun updateAccounts(accounts: List<MibAccount>) {
+    fun updateAccounts(accounts: List<BankAccount>) {
         items.clear()
         items.addAll(buildItems(accounts))
         notifyDataSetChanged()
     }
 
-    private fun buildItems(accounts: List<MibAccount>): List<Item> = buildList {
+    fun setHideAmounts(hide: Boolean) {
+        if (hideAmounts == hide) return
+        hideAmounts = hide
+        notifyDataSetChanged()
+    }
+
+    private fun buildItems(accounts: List<BankAccount>): List<Item> = buildList {
         val displayed = accounts.mapNotNull { acc -> AccountListParser.from(acc)?.let { acc to it } }
         val nonCards  = displayed.filter { !it.second.isCard }
         val cards     = displayed.filter { it.second.isCard }
 
-        val groups = LinkedHashMap<String, MutableList<Pair<MibAccount, AccountListDisplay>>>()
+        val groups = LinkedHashMap<String, MutableList<Pair<BankAccount, AccountListDisplay>>>()
         for ((acc, display) in nonCards) {
             val title = sectionTitle(acc)
             groups.getOrPut(title) { mutableListOf() }.add(acc to display)
@@ -57,7 +64,7 @@ class AccountsAdapter(
         }
     }
 
-    private fun sectionTitle(account: MibAccount): String {
+    private fun sectionTitle(account: BankAccount): String {
         val bankName = when (account.bank) {
             "BML"     -> "Bank of Maldives"
             "FAHIPAY" -> "Fahipay"
@@ -105,11 +112,11 @@ class AccountsAdapter(
 
     private inner class AccountViewHolder(private val binding: ItemAccountBinding) :
         RecyclerView.ViewHolder(binding.root) {
-        fun bind(account: MibAccount, display: AccountListDisplay) {
+        fun bind(account: BankAccount, display: AccountListDisplay) {
             binding.tvAccountName.text   = display.name
             binding.tvAccountNumber.text = display.number
             binding.tvAccountType.text   = display.typeLabel
-            binding.tvBalance.text       = display.balance
+            binding.tvBalance.text       = if (hideAmounts) maskAmount(display.balance) else display.balance
             binding.btnTransfer.setOnClickListener { onTransferClick?.invoke(account) }
             binding.root.setOnClickListener { onAccountClick(account) }
             binding.root.setOnLongClickListener {
@@ -121,13 +128,13 @@ class AccountsAdapter(
 
     private inner class CardViewHolder(private val binding: ItemCardBinding) :
         RecyclerView.ViewHolder(binding.root) {
-        fun bind(account: MibAccount, display: AccountListDisplay) {
+        fun bind(account: BankAccount, display: AccountListDisplay) {
             binding.ivCardBrand.setImageResource(display.cardBrandIcon)
             binding.tvCardName.text    = display.name
             binding.tvCardNumber.text  = display.number
             binding.tvCardProduct.text = display.typeLabel
             binding.layoutCardBalance.visibility = View.VISIBLE
-            binding.tvCardBalance.text = display.balance
+            binding.tvCardBalance.text = if (hideAmounts) maskAmount(display.balance) else display.balance
             if (display.statusLabel != null) {
                 binding.tvCardStatus.text       = display.statusLabel
                 binding.tvCardStatus.visibility = View.VISIBLE
@@ -146,6 +153,11 @@ class AccountsAdapter(
         private const val TYPE_ACCOUNT = 1
         private const val TYPE_CARD    = 2
 
+        fun maskAmount(formatted: String): String {
+            val currency = formatted.substringBefore(' ', formatted)
+            return "$currency ••••••"
+        }
+
         private fun copyToClipboard(context: Context, accountNumber: String) {
             val cm = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
             cm.setPrimaryClip(ClipData.newPlainText("Account Number", accountNumber))

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

@@ -44,6 +44,12 @@ class AccountsFragment : Fragment() {
         }
 
         viewModel.accounts.observe(viewLifecycleOwner) { adapter.updateAccounts(it) }
+        viewModel.hideAmounts.observe(viewLifecycleOwner) { adapter.setHideAmounts(it) }
+
+        binding.swipeRefresh.setOnRefreshListener {
+            (activity as? HomeActivity)?.triggerRefresh()
+            binding.swipeRefresh.isRefreshing = false
+        }
     }
 
     override fun onResume() {

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

@@ -30,8 +30,9 @@ import kotlinx.coroutines.withContext
 import sh.sar.basedbank.BasedBankApp
 import sh.sar.basedbank.R
 import sh.sar.basedbank.api.bml.BmlAccountValidation
-import sh.sar.basedbank.api.bml.BmlLoginFlow
+import sh.sar.basedbank.api.bml.BmlContactsClient
-import sh.sar.basedbank.api.mib.MibBeneficiaryCategory
+import sh.sar.basedbank.api.bml.BmlValidateClient
+import sh.sar.basedbank.api.models.BankContactCategory
 import sh.sar.basedbank.api.mib.MibContactsClient
 import sh.sar.basedbank.api.mib.MibProfile
 import sh.sar.basedbank.api.mib.MibTransferClient
@@ -64,7 +65,7 @@ class AddContactSheetFragment : BottomSheetDialogFragment() {
 
     private var selectedImageBase64: String = ""
     private var selectedCategoryId: String = "0"
-    private var categories: List<MibBeneficiaryCategory> = emptyList()
+    private var categories: List<BankContactCategory> = emptyList()
 
     private val imagePicker = registerForActivityResult(ActivityResultContracts.GetContent()) { uri: Uri? ->
         uri ?: return@registerForActivityResult
@@ -98,10 +99,13 @@ class AddContactSheetFragment : BottomSheetDialogFragment() {
             }
         }
         val store = CredentialStore(requireContext())
-        for ((loginId, _) in app.bmlSessions) {
+        for ((loginId, profiles) in app.bmlProfilesMap) {
-            val ownerName = store.loadBmlUserProfile(loginId)?.fullName?.takeIf { it.isNotBlank() } ?: loginId
+            val fullName = store.loadBmlUserProfile(loginId)?.fullName?.takeIf { it.isNotBlank() }
-            val profileName = app.bmlAccounts.firstOrNull { it.loginTag == "bml_$loginId" }?.profileName ?: ""
+            for (profile in profiles) {
-            list.add(DestinationOption("BML · $ownerName", isBml = true, bmlLoginId = loginId, subtitle = profileName))
+                if (app.bmlSessions.containsKey(profile.profileId)) {
+                    list.add(DestinationOption("BML · ${fullName ?: profile.name}", isBml = true, bmlLoginId = profile.profileId, subtitle = profile.name))
+                }
+            }
         }
         return list
     }
@@ -241,14 +245,12 @@ class AddContactSheetFragment : BottomSheetDialogFragment() {
     private fun lookupForBml(input: String): BmlAccountValidation? {
         val loginId = selectedDest?.bmlLoginId ?: return null
         val bmlSess = app.bmlSessions[loginId] ?: return null
-        val bmlFlow = BmlLoginFlow()
-
         // 1) Try BML validate
-        val validated = try { bmlFlow.validateAccount(bmlSess, input) } catch (_: Exception) { null }
+        val validated = try { BmlValidateClient().validateAccount(bmlSess, input) } catch (_: Exception) { null }
         if (validated != null) return validated
 
         // 2) Try BML MIB verify
-        val mibVerified = try { bmlFlow.verifyMibAccount(bmlSess, input) } catch (_: Exception) { null }
+        val mibVerified = try { BmlValidateClient().verifyMibAccount(bmlSess, input) } catch (_: Exception) { null }
         if (mibVerified != null) return mibVerified
 
         // 3) Fall back to MIB IPS lookup (for USD MIB accounts not reachable via BML)
@@ -292,7 +294,7 @@ class AddContactSheetFragment : BottomSheetDialogFragment() {
 
         // MIB lookup failed (e.g. BML USD account) — fall back to BML validate
         val bmlSess = app.anyBmlSession() ?: return null
-        return try { BmlLoginFlow().validateAccount(bmlSess, input) } catch (_: Exception) { null }
+        return try { BmlValidateClient().validateAccount(bmlSess, input) } catch (_: Exception) { null }
     }
 
     private fun showLookupResult(validation: BmlAccountValidation, input: String) {
@@ -418,15 +420,14 @@ class AddContactSheetFragment : BottomSheetDialogFragment() {
         val loginId = selectedDest?.bmlLoginId ?: return false
         val bmlSess = app.bmlSessions[loginId] ?: return false
         val lookup = bmlLookup ?: return false
-        val bmlFlow = BmlLoginFlow()
         val account = lookup.account
         return when {
             account.matches(Regex("^7\\d{12}$")) ->
                 // BML account → IAT
-                bmlFlow.saveContact(bmlSess, "IAT", account, alias)
+                BmlContactsClient().saveContact(bmlSess, "IAT", account, alias)
             account.matches(Regex("^9\\d{16}$")) ->
                 // MIB internal → DOT; swift is BML's internal UUID for MIB bank
-                bmlFlow.saveContact(bmlSess, "DOT", account, alias,
+                BmlContactsClient().saveContact(bmlSess, "DOT", account, alias,
                     currency = lookup.currency, name = lookup.name, swift = MIB_SWIFT_ON_BML)
             else -> false
         }
@@ -486,7 +487,7 @@ class AddContactSheetFragment : BottomSheetDialogFragment() {
                 if (dest.isBml) {
                     val loginId = dest.bmlLoginId ?: return@launch
                     val bmlSess = app.bmlSessions[loginId] ?: return@launch
-                    val fresh = BmlLoginFlow().fetchContacts(bmlSess, loginId)
+                    val fresh = BmlContactsClient().fetchContacts(bmlSess, loginId)
                     val existing = viewModel.contacts.value ?: emptyList()
                     val merged = existing.filter { it.benefCategoryId != "BML" } + fresh
                     viewModel.contacts.postValue(merged)

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

@@ -0,0 +1,116 @@
+package sh.sar.basedbank.ui.home
+
+import android.content.Context
+import android.os.Bundle
+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.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import sh.sar.basedbank.R
+import sh.sar.basedbank.api.mib.MibCard
+import sh.sar.basedbank.databinding.FragmentCardSettingsBinding
+
+class CardSettingsFragment : Fragment() {
+
+    private var _binding: FragmentCardSettingsBinding? = null
+    private val binding get() = _binding!!
+    private val viewModel: HomeViewModel by activityViewModels()
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        _binding = FragmentCardSettingsBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        val adapter = CardSettingsAdapter(emptyList(), requireContext())
+        binding.recyclerView.layoutManager = LinearLayoutManager(requireContext())
+        binding.recyclerView.adapter = adapter
+
+        val bottomPaddingBase = (16 * resources.displayMetrics.density).toInt()
+        ViewCompat.setOnApplyWindowInsetsListener(binding.recyclerView) { v, insets ->
+            val isBottomNav = requireContext().getSharedPreferences("prefs", Context.MODE_PRIVATE).getBoolean("bottom_nav", false)
+            val navBar = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            val extraBottom = if (isBottomNav) 0 else navBar.bottom
+            v.setPadding(v.paddingLeft, v.paddingTop, v.paddingRight, bottomPaddingBase + extraBottom)
+            insets
+        }
+
+        binding.swipeRefresh.setOnRefreshListener {
+            (activity as? HomeActivity)?.triggerRefreshCards()
+        }
+
+        viewModel.mibCards.observe(viewLifecycleOwner) { cards ->
+            if (cards == null) return@observe
+            adapter.update(cards)
+            binding.loadingView.visibility = View.GONE
+            binding.swipeRefresh.isRefreshing = false
+            binding.emptyView.visibility = if (cards.isEmpty()) View.VISIBLE else View.GONE
+            binding.recyclerView.visibility = if (cards.isEmpty()) View.GONE else View.VISIBLE
+        }
+
+        if (viewModel.mibCards.value == null) {
+            binding.loadingView.visibility = View.VISIBLE
+            (activity as? HomeActivity)?.triggerRefreshCards()
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        requireActivity().title = getString(R.string.nav_card_settings)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    private inner class CardSettingsAdapter(
+        private var cards: List<MibCard>,
+        private val context: Context
+    ) : RecyclerView.Adapter<CardSettingsAdapter.VH>() {
+
+        fun update(newCards: List<MibCard>) {
+            cards = newCards
+            notifyDataSetChanged()
+        }
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH =
+            VH(LayoutInflater.from(context).inflate(R.layout.item_card_settings_entry, parent, false))
+
+        override fun onBindViewHolder(holder: VH, position: Int) = holder.bind(cards[position])
+        override fun getItemCount() = cards.size
+
+        inner class VH(view: View) : RecyclerView.ViewHolder(view) {
+            private val ivCardImage: ImageView = view.findViewById(R.id.ivCardImage)
+            private val tvCardOwner: TextView = view.findViewById(R.id.tvCardOwner)
+            private val tvCardNumber: TextView = view.findViewById(R.id.tvCardNumber)
+            private val tvCardType: TextView = view.findViewById(R.id.tvCardType)
+            private val btnChangePin: View = view.findViewById(R.id.btnChangePin)
+            private val btnFreeze: View = view.findViewById(R.id.btnFreeze)
+            private val btnBlock: View = view.findViewById(R.id.btnBlock)
+
+            fun bind(card: MibCard) {
+                tvCardOwner.text = card.cardHolderName
+                tvCardNumber.text = PayWithCardFragment.formatMasked(card.maskedCardNumber)
+                tvCardType.text = card.cardTypeDesc
+                val assetPath = PayWithCardFragment.cardImageAsset(card)
+                if (assetPath != null) PayWithCardFragment.loadCardImage(ivCardImage, assetPath)
+                else ivCardImage.setImageDrawable(null)
+                val wip = View.OnClickListener {
+                    Toast.makeText(context, R.string.work_in_progress, Toast.LENGTH_SHORT).show()
+                }
+                btnChangePin.setOnClickListener(wip)
+                btnFreeze.setOnClickListener(wip)
+                btnBlock.setOnClickListener(wip)
+            }
+        }
+    }
+}

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

@@ -23,7 +23,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import sh.sar.basedbank.BasedBankApp
 import sh.sar.basedbank.R
-import sh.sar.basedbank.api.mib.MibBeneficiaryCategory
+import sh.sar.basedbank.api.models.BankContactCategory
 import sh.sar.basedbank.api.mib.MibContactsClient
 import sh.sar.basedbank.databinding.FragmentContactsBinding
 import sh.sar.basedbank.util.ContactDisplay
@@ -48,6 +48,7 @@ class ContactsFragment : Fragment() {
     private var currentSearch: String = ""
     private var mediator: TabLayoutMediator? = null
     private lateinit var pagerAdapter: ContactsPagerAdapter
+    private var contactsRefreshing = false
 
     private data class TabPage(val categoryId: String?, val label: String)
 
@@ -134,6 +135,11 @@ class ContactsFragment : Fragment() {
 
         (activity as? HomeActivity)?.loadAllContacts()
 
+        binding.swipeRefresh.setOnRefreshListener {
+            contactsRefreshing = true
+            (activity as? HomeActivity)?.loadAllContacts()
+        }
+
         viewModel.contactCategories.observe(viewLifecycleOwner) { cats ->
             rebuildPager(cats)
         }
@@ -143,6 +149,10 @@ class ContactsFragment : Fragment() {
             pagerAdapter.updateContacts(allContacts)
             binding.emptyView.visibility = if (contacts.isEmpty()) View.VISIBLE else View.GONE
             binding.loadingView.visibility = View.GONE
+            if (contactsRefreshing) {
+                contactsRefreshing = false
+                binding.swipeRefresh.isRefreshing = false
+            }
         }
     }
 
@@ -153,7 +163,7 @@ class ContactsFragment : Fragment() {
         }.also { it.attach() }
     }
 
-    private fun rebuildPager(cats: List<MibBeneficiaryCategory>) {
+    private fun rebuildPager(cats: List<BankContactCategory>) {
         val pages = buildList {
             add(TabPage(null, getString(R.string.contacts_tab_all)))
             cats.forEach { add(TabPage(it.id, it.categoryName)) }

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

@@ -5,15 +5,23 @@ import android.os.Bundle
 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.core.content.ContextCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.LinearSnapHelper
+import androidx.recyclerview.widget.RecyclerView
 import sh.sar.basedbank.R
 import sh.sar.basedbank.api.bml.BmlForeignLimit
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
+import sh.sar.basedbank.api.mib.MibCard
 import sh.sar.basedbank.api.mib.MibFinanceDeal
+import kotlin.math.abs
 import sh.sar.basedbank.databinding.FragmentDashboardBinding
 import sh.sar.basedbank.databinding.ItemForeignLimitBinding
 
@@ -30,8 +38,30 @@ class DashboardFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         viewModel.accounts.observe(viewLifecycleOwner) { updateBalances(it) }
-        viewModel.financing.observe(viewLifecycleOwner) { updatePendingFinances(it) }
+        viewModel.financing.observe(viewLifecycleOwner) { updatePendingFinances() }
+        viewModel.bmlLoanDetails.observe(viewLifecycleOwner) { updatePendingFinances() }
         viewModel.bmlLimits.observe(viewLifecycleOwner) { updateForeignLimits(it) }
+        viewModel.hideAmounts.observe(viewLifecycleOwner) {
+            updateBalances(viewModel.accounts.value ?: emptyList())
+            updatePendingFinances()
+            updateForeignLimits(viewModel.bmlLimits.value ?: emptyList())
+        }
+
+        binding.swipeRefresh.setOnRefreshListener {
+            (activity as? HomeActivity)?.triggerRefresh()
+            binding.swipeRefresh.isRefreshing = false
+        }
+
+        val cardAdapter = DashboardCardAdapter()
+        binding.rvCards.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
+        binding.rvCards.adapter = cardAdapter
+        LinearSnapHelper().attachToRecyclerView(binding.rvCards)
+
+        viewModel.mibCards.observe(viewLifecycleOwner) { cards ->
+            if (cards.isNullOrEmpty()) return@observe
+            cardAdapter.update(cards)
+            binding.sectionCards.visibility = View.VISIBLE
+        }
 
         val bottomPaddingBase = (16 * resources.displayMetrics.density).toInt()
         ViewCompat.setOnApplyWindowInsetsListener(binding.buttonBar) { v, insets ->
@@ -63,48 +93,185 @@ class DashboardFragment : Fragment() {
         }
     }
 
-    private fun updateBalances(accounts: List<MibAccount>) {
+    private fun updateBalances(accounts: List<BankAccount>) {
-        val mvrTotal = accounts
+        val hide = viewModel.hideAmounts.value ?: false
+
+        val nonCreditAccounts = accounts.filter { it.profileType != "BML_CREDIT" && it.profileType != "BML_LOAN" }
+        val creditAccounts = accounts.filter { it.profileType == "BML_CREDIT" }
+
+        if (hide) {
+            binding.tvMvrBalance.text = "MVR ••••••"
+            binding.tvUsdBalance.text = "USD ••••••"
+            if (creditAccounts.isNotEmpty()) {
+                binding.rowCreditCards.visibility = View.VISIBLE
+                val hasMvrCredit = creditAccounts.any { it.currencyName.equals("MVR", ignoreCase = true) }
+                val hasUsdCredit = creditAccounts.any { it.currencyName.equals("USD", ignoreCase = true) }
+                binding.cardMvrCredit.visibility = if (hasMvrCredit) View.VISIBLE else View.GONE
+                binding.cardUsdCredit.visibility = if (hasUsdCredit) View.VISIBLE else View.GONE
+                binding.tvMvrCredit.text = "MVR ••••••"
+                binding.tvUsdCredit.text = "USD ••••••"
+            } else {
+                binding.rowCreditCards.visibility = View.GONE
+            }
+            return
+        }
+
+        val mvrTotal = nonCreditAccounts
             .filter { it.currencyName.equals("MVR", ignoreCase = true) }
             .sumOf { it.availableBalance.replace(",", "").toDoubleOrNull() ?: 0.0 }
-        val usdTotal = accounts
+        val usdTotal = nonCreditAccounts
             .filter { it.currencyName.equals("USD", ignoreCase = true) }
             .sumOf { it.availableBalance.replace(",", "").toDoubleOrNull() ?: 0.0 }
 
         binding.tvMvrBalance.text = "MVR %,.2f".format(mvrTotal)
         binding.tvUsdBalance.text = "USD %,.2f".format(usdTotal)
+
+        val mvrCredit = creditAccounts
+            .filter { it.currencyName.equals("MVR", ignoreCase = true) }
+            .sumOf { it.availableBalance.replace(",", "").toDoubleOrNull() ?: 0.0 }
+        val usdCredit = creditAccounts
+            .filter { it.currencyName.equals("USD", ignoreCase = true) }
+            .sumOf { it.availableBalance.replace(",", "").toDoubleOrNull() ?: 0.0 }
+
+        if (creditAccounts.isNotEmpty()) {
+            binding.rowCreditCards.visibility = View.VISIBLE
+            binding.cardMvrCredit.visibility = if (mvrCredit > 0) View.VISIBLE else View.GONE
+            binding.cardUsdCredit.visibility = if (usdCredit > 0) View.VISIBLE else View.GONE
+            binding.tvMvrCredit.text = "MVR %,.2f".format(mvrCredit)
+            binding.tvUsdCredit.text = "USD %,.2f".format(usdCredit)
+        } else {
+            binding.rowCreditCards.visibility = View.GONE
+        }
     }
 
+    private val expandedLimits = mutableSetOf<Int>()
+
     private fun updateForeignLimits(entries: List<HomeViewModel.BmlLimitsData>) {
+        val hide = viewModel.hideAmounts.value ?: false
         binding.containerForeignLimits.removeAllViews()
+        var cardIndex = 0
         for (entry in entries) {
             for (limit in entry.limits) {
+                val idx = cardIndex++
                 val card = ItemForeignLimitBinding.inflate(layoutInflater, binding.containerForeignLimits, false)
-                card.tvLimitUserName.text = entry.userName.ifBlank { "BML" }
+                bindLimitCard(card, entry.userName, limit, hide, idx in expandedLimits)
-                card.tvLimitType.text = limit.type
+                card.root.setOnClickListener {
-                card.tvLimitGeneral.text = "USD %,.0f / %,.0f".format(limit.generalRemaining, limit.generalCap)
+                    if (idx in expandedLimits) expandedLimits.remove(idx) else expandedLimits.add(idx)
-                card.tvLimitMedical.text = "USD %,.0f".format(limit.medicalRemaining)
+                    updateForeignLimits(entries)
-                card.tvLimitAtm.text = if (!limit.isAtmEnabled)
+                }
-                    "USD %,.0f / %,.0f · Disabled".format(limit.atmRemaining, limit.atmLimit)
-                else
-                    "USD %,.0f / %,.0f".format(limit.atmRemaining, limit.atmLimit)
-                card.tvLimitEcom.text = "USD %,.0f / %,.0f".format(limit.ecomRemaining, limit.ecomLimit)
-                card.tvLimitPos.text = if (!limit.isPosEnabled)
-                    "USD %,.0f / %,.0f · Disabled".format(limit.posRemaining, limit.posLimit)
-                else
-                    "USD %,.0f / %,.0f".format(limit.posRemaining, limit.posLimit)
                 binding.containerForeignLimits.addView(card.root)
             }
         }
     }
 
-    private fun updatePendingFinances(deals: List<MibFinanceDeal>) {
+    private fun bindLimitCard(
-        val total = deals.sumOf { it.outstandingAmount }
+        card: ItemForeignLimitBinding,
-        binding.tvPendingFinances.text = "MVR %,.2f".format(total)
+        userName: String,
+        limit: BmlForeignLimit,
+        hide: Boolean,
+        expanded: Boolean
+    ) {
+        card.tvLimitUserName.text = userName.ifBlank { "BML" }
+        card.tvLimitType.text = limit.type
+
+        // ECOM (always visible)
+        card.tvLimitEcom.text = if (hide) "USD ••••••"
+            else "USD %,.2f / %,.0f".format(limit.ecomRemaining, limit.ecomLimit)
+        card.progressEcom.progress = if (hide || limit.ecomLimit <= 0) 0
+            else ((limit.ecomRemaining / limit.ecomLimit) * 100).toInt().coerceIn(0, 100)
+
+        // General (always visible)
+        card.tvLimitGeneral.text = if (hide) "USD ••••••"
+            else "USD %,.2f / %,.0f".format(limit.generalRemaining, limit.generalCap)
+        card.progressGeneral.progress = if (hide || limit.generalCap <= 0) 0
+            else ((limit.generalRemaining / limit.generalCap) * 100).toInt().coerceIn(0, 100)
+
+        // Expanded section
+        val detailsVisible = if (expanded) View.VISIBLE else View.GONE
+        card.dividerLimitDetails.visibility = detailsVisible
+        card.detailsGroup.visibility = detailsVisible
+
+        if (expanded) {
+            // ATM
+            if (!limit.isAtmEnabled) card.tvAtmLabel.append(" (Disabled)")
+            card.tvLimitAtm.text = if (hide) "USD ••••••"
+                else "USD %,.2f / %,.0f".format(limit.atmRemaining, limit.atmLimit)
+            card.progressAtm.progress = if (hide || limit.atmLimit <= 0) 0
+                else ((limit.atmRemaining / limit.atmLimit) * 100).toInt().coerceIn(0, 100)
+
+            // POS
+            if (!limit.isPosEnabled) card.tvPosLabel.append(" (Disabled)")
+            card.tvLimitPos.text = if (hide) "USD ••••••"
+                else "USD %,.2f / %,.0f".format(limit.posRemaining, limit.posLimit)
+            card.progressPos.progress = if (hide || limit.posLimit <= 0) 0
+                else ((limit.posRemaining / limit.posLimit) * 100).toInt().coerceIn(0, 100)
+
+            // Medical
+            card.tvLimitMedical.text = if (hide) "USD ••••••"
+                else "USD %,.2f / %,.0f".format(limit.medicalRemaining, limit.totalLimit)
+            card.progressMedical.progress = if (hide || limit.totalLimit <= 0) 0
+                else ((limit.medicalRemaining / limit.totalLimit) * 100).toInt().coerceIn(0, 100)
+        }
+    }
+
+    private fun updatePendingFinances() {
+        val hide = viewModel.hideAmounts.value ?: false
+        val mibTotal = (viewModel.financing.value ?: emptyList()).sumOf { it.outstandingAmount }
+        val bmlLoanDetails = viewModel.bmlLoanDetails.value ?: emptyMap()
+        val bmlTotal = bmlLoanDetails.values.sumOf { abs(it.outstandingAmt) }
+        val total = mibTotal + bmlTotal
+        binding.tvPendingFinances.text = if (hide) "MVR ••••••" else "MVR %,.2f".format(total)
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
     }
+
+    private inner class DashboardCardAdapter : RecyclerView.Adapter<DashboardCardAdapter.VH>() {
+        private var cards: List<MibCard> = emptyList()
+
+        fun update(newCards: List<MibCard>) {
+            cards = newCards
+            notifyDataSetChanged()
+        }
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH {
+            val view = LayoutInflater.from(parent.context)
+                .inflate(R.layout.item_card_dashboard, parent, false)
+            return VH(view)
+        }
+
+        override fun onBindViewHolder(holder: VH, position: Int) = holder.bind(cards[position])
+        override fun getItemCount() = cards.size
+
+        inner class VH(view: View) : RecyclerView.ViewHolder(view) {
+            private val ivCardImage: ImageView = view.findViewById(R.id.ivCardImage)
+            private val tvCardOwner: TextView = view.findViewById(R.id.tvCardOwner)
+            private val tvCardNumber: TextView = view.findViewById(R.id.tvCardNumber)
+            private val btnPayQr: View = view.findViewById(R.id.btnPayQr)
+            private val btnPayNfc: View = view.findViewById(R.id.btnPayNfc)
+
+            fun bind(card: MibCard) {
+                tvCardOwner.text = card.cardHolderName
+                tvCardNumber.text = PayWithCardFragment.formatMasked(card.maskedCardNumber)
+                val assetPath = PayWithCardFragment.cardImageAsset(card)
+                if (assetPath != null) PayWithCardFragment.loadCardImage(ivCardImage, assetPath)
+                else ivCardImage.setImageDrawable(null)
+                btnPayQr.setOnClickListener {
+                    Toast.makeText(requireContext(), R.string.work_in_progress, Toast.LENGTH_SHORT).show()
+                }
+                val nfcAdapter = android.nfc.NfcAdapter.getDefaultAdapter(requireContext())
+                val nfcSupported = nfcAdapter != null
+                btnPayNfc.isEnabled = nfcSupported
+                if (nfcSupported) {
+                    btnPayNfc.setOnClickListener {
+                        Toast.makeText(requireContext(), R.string.work_in_progress, Toast.LENGTH_SHORT).show()
+                    }
+                } else {
+                    btnPayNfc.setOnClickListener(null)
+                }
+            }
+        }
+    }
 }

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

@@ -5,92 +5,139 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import sh.sar.basedbank.R
+import sh.sar.basedbank.api.bml.BmlLoanDetail
+import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.api.mib.MibFinanceDeal
 import sh.sar.basedbank.api.mib.MibFinancingClient
+import sh.sar.basedbank.databinding.ItemBmlLoanBinding
 import sh.sar.basedbank.databinding.ItemFinanceDealBinding
 import java.text.NumberFormat
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
+import kotlin.math.abs
+import kotlin.math.ceil
 
-class FinancingAdapter(private var deals: List<MibFinanceDeal>) :
+class FinancingAdapter(mibDeals: List<MibFinanceDeal>) :
-    RecyclerView.Adapter<FinancingAdapter.ViewHolder>() {
+    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    private sealed class Item {
+        data class Mib(val deal: MibFinanceDeal) : Item()
+        data class Bml(val account: BankAccount, val detail: BmlLoanDetail?) : Item()
+    }
+
+    private var items: List<Item> = mibDeals.map { Item.Mib(it) }
+    private var hideAmounts: Boolean = false
 
     private val expandedPositions = mutableSetOf<Int>()
     private val amountFmt = NumberFormat.getNumberInstance(Locale.US).apply {
         minimumFractionDigits = 2
         maximumFractionDigits = 2
     }
-    private val inputDateFmt = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US)
+    private val mibDateFmt = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US)
+    private val isoDateFmt = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.US)
     private val outputDateFmt = SimpleDateFormat("d MMM yyyy", Locale.US)
 
-    fun updateDeals(newDeals: List<MibFinanceDeal>) {
+    fun setHideAmounts(hide: Boolean) {
-        deals = newDeals
+        if (hideAmounts == hide) return
-        expandedPositions.clear()
+        hideAmounts = hide
         notifyDataSetChanged()
     }
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+    fun update(mibDeals: List<MibFinanceDeal>, bmlLoans: List<Pair<BankAccount, BmlLoanDetail?>>) {
-        val binding = ItemFinanceDealBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        expandedPositions.clear()
-        return ViewHolder(binding)
+        items = mibDeals.map { Item.Mib(it) } + bmlLoans.map { (acc, detail) -> Item.Bml(acc, detail) }
+        notifyDataSetChanged()
     }
 
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+    // Legacy compatibility — used on initial empty construction
-        holder.bind(deals[position], position in expandedPositions)
+    fun updateDeals(newDeals: List<MibFinanceDeal>) {
-        holder.binding.root.setOnClickListener {
+        expandedPositions.clear()
+        val bmlItems = items.filterIsInstance<Item.Bml>()
+        items = newDeals.map { Item.Mib(it) } + bmlItems
+        notifyDataSetChanged()
+    }
+
+    fun updateBmlLoans(loans: List<Pair<BankAccount, BmlLoanDetail?>>) {
+        expandedPositions.clear()
+        val mibItems = items.filterIsInstance<Item.Mib>()
+        items = mibItems + loans.map { (acc, detail) -> Item.Bml(acc, detail) }
+        notifyDataSetChanged()
+    }
+
+    override fun getItemViewType(position: Int) = when (items[position]) {
+        is Item.Mib -> TYPE_MIB
+        is Item.Bml -> TYPE_BML
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        return when (viewType) {
+            TYPE_BML -> BmlViewHolder(ItemBmlLoanBinding.inflate(inflater, parent, false))
+            else     -> MibViewHolder(ItemFinanceDealBinding.inflate(inflater, parent, false))
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        val expanded = position in expandedPositions
+        when (val item = items[position]) {
+            is Item.Mib -> (holder as MibViewHolder).bind(item.deal, expanded)
+            is Item.Bml -> (holder as BmlViewHolder).bind(item.account, item.detail, expanded)
+        }
+        holder.itemView.setOnClickListener {
             val pos = holder.bindingAdapterPosition
             if (pos in expandedPositions) expandedPositions.remove(pos) else expandedPositions.add(pos)
             notifyItemChanged(pos)
         }
     }
 
-    override fun getItemCount() = deals.size
+    override fun getItemCount() = items.size
 
-    inner class ViewHolder(val binding: ItemFinanceDealBinding) :
+    // ── MIB ViewHolder ────────────────────────────────────────────────────────
+
+    inner class MibViewHolder(val binding: ItemFinanceDealBinding) :
         RecyclerView.ViewHolder(binding.root) {
 
         fun bind(deal: MibFinanceDeal, expanded: Boolean) {
             val ctx = binding.root.context
             val currency = deal.currency
+            val hide = hideAmounts
 
             binding.tvProductName.text = deal.productDesc
             binding.tvDealNo.text = ctx.getString(R.string.financing_deal_no_fmt, deal.dealNo)
             binding.tvStatus.text = deal.statusDesc
-            binding.tvTotal.text = "$currency ${amountFmt.format(deal.dealAmount)}"
+            binding.tvTotal.text = if (hide) "$currency ••••••" else "$currency ${amountFmt.format(deal.dealAmount)}"
-            binding.tvPaid.text = "$currency ${amountFmt.format(deal.paidAmount)}"
+            binding.tvPaid.text = if (hide) "$currency ••••••" else "$currency ${amountFmt.format(deal.paidAmount)}"
-            binding.tvUnpaid.text = "$currency ${amountFmt.format(deal.outstandingAmount)}"
+            binding.tvUnpaid.text = if (hide) "$currency ••••••" else "$currency ${amountFmt.format(deal.outstandingAmount)}"
 
-            // Progress bar
             val progress = if (deal.dealAmount > 0)
                 ((deal.paidAmount / deal.dealAmount) * 100).toInt().coerceIn(0, 100)
             else 0
-            binding.progressBar.progress = progress
+            binding.progressBar.progress = if (hide) 0 else progress
 
-            // Completion estimate
+            binding.tvCompletion.text = mibCompletionText(deal, ctx)
-            binding.tvCompletion.text = completionText(deal, ctx)
 
-            // Expanded details
             val detailsVisible = if (expanded) View.VISIBLE else View.GONE
             binding.dividerDetails.visibility = detailsVisible
             binding.detailsGroup.visibility = detailsVisible
 
             if (expanded) {
-                binding.tvDealDate.text = formatDate(deal.dealDate)
+                binding.tvDealDate.text = formatMibDate(deal.dealDate)
-                binding.tvInstallment.text = "$currency ${amountFmt.format(deal.installmentAmount)}"
+                binding.tvInstallment.text = if (hide) "$currency ••••••" else "$currency ${amountFmt.format(deal.installmentAmount)}"
                 binding.tvNumInstallments.text = deal.noOfInstallments.toString()
-                binding.tvLastPaidDate.text = formatDate(deal.lastPaidDate)
+                binding.tvLastPaidDate.text = formatMibDate(deal.lastPaidDate)
-                binding.tvLastPayAmount.text = "$currency ${amountFmt.format(deal.lastPayAmount)}"
+                binding.tvLastPayAmount.text = if (hide) "$currency ••••••" else "$currency ${amountFmt.format(deal.lastPayAmount)}"
 
                 if (deal.overdueAmount > 0) {
                     binding.rowOverdue.visibility = View.VISIBLE
-                    binding.tvOverdue.text = "$currency ${amountFmt.format(deal.overdueAmount)}"
+                    binding.tvOverdue.text = if (hide) "$currency ••••••" else "$currency ${amountFmt.format(deal.overdueAmount)}"
                 } else {
                     binding.rowOverdue.visibility = View.GONE
                 }
             }
         }
 
-        private fun completionText(deal: MibFinanceDeal, ctx: android.content.Context): String {
+        private fun mibCompletionText(deal: MibFinanceDeal, ctx: android.content.Context): String {
             if (deal.outstandingAmount <= 0.0) return ctx.getString(R.string.financing_completion_done)
             val remaining = MibFinancingClient.remainingMonths(deal)
             if (remaining <= 0) return ctx.getString(R.string.financing_completion_done)
@@ -100,12 +147,84 @@ class FinancingAdapter(private var deals: List<MibFinanceDeal>) :
             return ctx.getString(R.string.financing_completion_fmt, month)
         }
 
-        private fun formatDate(raw: String): String {
+        private fun formatMibDate(raw: String): String {
             return try {
-                outputDateFmt.format(inputDateFmt.parse(raw)!!)
+                outputDateFmt.format(mibDateFmt.parse(raw)!!)
-            } catch (_: Exception) {
+            } catch (_: Exception) { raw.take(10) }
-                raw.take(10)
-            }
         }
     }
+
+    // ── BML ViewHolder ────────────────────────────────────────────────────────
+
+    inner class BmlViewHolder(val binding: ItemBmlLoanBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+
+        fun bind(account: BankAccount, detail: BmlLoanDetail?, expanded: Boolean) {
+            val ctx = binding.root.context
+            val currency = account.currencyName
+            val hide = hideAmounts
+
+            binding.tvLoanProduct.text = account.accountTypeName
+                .trim().lowercase().split(" ")
+                .joinToString(" ") { it.replaceFirstChar { c -> c.uppercaseChar() } }
+            binding.tvLoanAccount.text = account.accountNumber
+            binding.tvLoanStatus.text = detail?.loanStatus?.ifBlank { account.statusDesc } ?: account.statusDesc
+
+            val loanAmt  = detail?.loanAmount ?: 0.0
+            val outstanding = if (detail != null) abs(detail.outstandingAmt) else account.availableBalance.toDoubleOrNull() ?: 0.0
+            val paid     = (loanAmt - outstanding).coerceAtLeast(0.0)
+
+            binding.tvLoanTotal.text = if (hide) "$currency ••••••" else "$currency ${amountFmt.format(loanAmt)}"
+            binding.tvLoanPaid.text = if (hide) "$currency ••••••" else "$currency ${amountFmt.format(paid)}"
+            binding.tvLoanOutstanding.text = if (hide) "$currency ••••••" else "$currency ${amountFmt.format(outstanding)}"
+
+            val progress = if (loanAmt > 0) ((paid / loanAmt) * 100).toInt().coerceIn(0, 100) else 0
+            binding.loanProgressBar.progress = if (hide) 0 else progress
+
+            binding.tvLoanCompletion.text = bmlCompletionText(detail, ctx)
+
+            val detailsVisible = if (expanded) View.VISIBLE else View.GONE
+            binding.loanDividerDetails.visibility = detailsVisible
+            binding.loanDetailsGroup.visibility = detailsVisible
+
+            if (expanded && detail != null) {
+                binding.tvLoanRepayment.text = if (hide) "$currency ••••••" else "$currency ${amountFmt.format(detail.repayAmount)}"
+                binding.tvLoanIntRate.text = ctx.getString(R.string.loan_rate_fmt, detail.intRate)
+                binding.tvLoanStartDate.text = formatIsoDate(detail.startDate)
+                binding.tvLoanEndDate.text = formatIsoDate(detail.endDate)
+
+                if (detail.overdueAmount > 0) {
+                    binding.loanRowOverdue.visibility = View.VISIBLE
+                    binding.tvLoanOverdue.text = if (hide) "$currency ••••••"
+                        else "$currency ${amountFmt.format(detail.overdueAmount)} (${detail.noOfRepayOverdue})"
+                } else {
+                    binding.loanRowOverdue.visibility = View.GONE
+                }
+            }
+        }
+
+        private fun bmlCompletionText(detail: BmlLoanDetail?, ctx: android.content.Context): String {
+            if (detail == null) return ""
+            val outstanding = abs(detail.outstandingAmt)
+            if (outstanding <= 0.0 || detail.repayAmount <= 0.0)
+                return ctx.getString(R.string.financing_completion_done)
+            val remaining = ceil(outstanding / detail.repayAmount).toInt()
+            if (remaining <= 0) return ctx.getString(R.string.financing_completion_done)
+            val cal = Calendar.getInstance()
+            cal.add(Calendar.MONTH, remaining)
+            val month = SimpleDateFormat("MMMM yyyy", Locale.getDefault()).format(cal.time)
+            return ctx.getString(R.string.financing_completion_fmt, month)
+        }
+
+        private fun formatIsoDate(raw: String): String {
+            return try {
+                outputDateFmt.format(isoDateFmt.parse(raw)!!)
+            } catch (_: Exception) { raw.take(10) }
+        }
+    }
+
+    companion object {
+        private const val TYPE_MIB = 0
+        private const val TYPE_BML = 1
+    }
 }

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

@@ -10,6 +10,9 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import sh.sar.basedbank.R
+import sh.sar.basedbank.api.bml.BmlLoanDetail
+import sh.sar.basedbank.api.mib.MibFinanceDeal
+import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.databinding.FragmentFinancingBinding
 
 class FinancingFragment : Fragment() {
@@ -18,6 +21,10 @@ class FinancingFragment : Fragment() {
     private val binding get() = _binding!!
     private val viewModel: HomeViewModel by activityViewModels()
     private lateinit var adapter: FinancingAdapter
+    private var financingRefreshing = false
+
+    private var latestMibDeals: List<MibFinanceDeal> = emptyList()
+    private var latestBmlLoanDetails: Map<String, BmlLoanDetail> = emptyMap()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         _binding = FragmentFinancingBinding.inflate(inflater, container, false)
@@ -38,11 +45,38 @@ class FinancingFragment : Fragment() {
             insets
         }
 
+        binding.swipeRefresh.setOnRefreshListener {
+            financingRefreshing = true
+            (activity as? HomeActivity)?.triggerRefreshFinancing()
+        }
+
+        viewModel.accounts.observe(viewLifecycleOwner) { rebuildAdapter() }
         viewModel.financing.observe(viewLifecycleOwner) { deals ->
-            adapter.updateDeals(deals)
+            latestMibDeals = deals
-            binding.recyclerView.visibility = if (deals.isEmpty()) View.GONE else View.VISIBLE
+            rebuildAdapter()
-            binding.emptyView.visibility = if (deals.isEmpty()) View.VISIBLE else View.GONE
+        }
-            binding.loadingView.visibility = View.GONE
+        viewModel.bmlLoanDetails.observe(viewLifecycleOwner) { details ->
+            latestBmlLoanDetails = details
+            rebuildAdapter()
+        }
+        viewModel.hideAmounts.observe(viewLifecycleOwner) { adapter.setHideAmounts(it) }
+    }
+
+    private fun rebuildAdapter() {
+        val accounts = viewModel.accounts.value ?: emptyList()
+        val loanAccounts = accounts.filter { it.profileType == "BML_LOAN" }
+        val bmlLoans: List<Pair<BankAccount, BmlLoanDetail?>> =
+            loanAccounts.map { acc -> acc to latestBmlLoanDetails[acc.internalId] }
+
+        adapter.update(latestMibDeals, bmlLoans)
+
+        val isEmpty = latestMibDeals.isEmpty() && bmlLoans.isEmpty()
+        binding.recyclerView.visibility = if (isEmpty) View.GONE else View.VISIBLE
+        binding.emptyView.visibility = if (isEmpty) View.VISIBLE else View.GONE
+        binding.loadingView.visibility = View.GONE
+        if (financingRefreshing) {
+            financingRefreshing = false
+            binding.swipeRefresh.isRefreshing = false
         }
     }
 

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

@@ -14,10 +14,15 @@ import android.widget.Toast
 import sh.sar.basedbank.ui.home.NavCustomization
 import androidx.appcompat.app.AlertDialog
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
 import androidx.appcompat.app.ActionBarDrawerToggle
+import androidx.core.view.GravityCompat
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.Lifecycle
@@ -33,19 +38,24 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import sh.sar.basedbank.BasedBankApp
 import sh.sar.basedbank.R
 import sh.sar.basedbank.api.bml.AuthExpiredException
-import sh.sar.basedbank.api.bml.BmlActivationResult
+import sh.sar.basedbank.api.bml.BmlAccountClient
-import sh.sar.basedbank.api.bml.BmlLoginFlow
+import sh.sar.basedbank.api.bml.BmlContactsClient
+import sh.sar.basedbank.api.bml.BmlForeignLimitsClient
+import sh.sar.basedbank.api.bml.BmlLoanDetail
 import sh.sar.basedbank.api.bml.BmlProfile
 import sh.sar.basedbank.api.bml.BmlSession
+import sh.sar.basedbank.api.fahipay.FahipayAccountClient
+import sh.sar.basedbank.api.fahipay.FahipayContactsClient
 import sh.sar.basedbank.api.fahipay.FahipayLoginFlow
 import sh.sar.basedbank.api.fahipay.FahipaySession
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.api.mib.MibLoginFlow
 import sh.sar.basedbank.databinding.ActivityHomeBinding
 import sh.sar.basedbank.ui.login.LoginActivity
-import sh.sar.basedbank.api.mib.MibBeneficiary
+import sh.sar.basedbank.api.models.BankContact
-import sh.sar.basedbank.api.mib.MibBeneficiaryCategory
+import sh.sar.basedbank.api.models.BankContactCategory
 import sh.sar.basedbank.api.mib.MibContactsClient
+import sh.sar.basedbank.api.mib.MibCardsClient
 import sh.sar.basedbank.api.mib.MibFinancingClient
 import sh.sar.basedbank.api.mib.MibProfile
 import sh.sar.basedbank.api.mib.MibSession
@@ -53,6 +63,7 @@ import sh.sar.basedbank.api.mib.MibFinanceDeal
 import sh.sar.basedbank.util.AccountCache
 import sh.sar.basedbank.util.ContactsCache
 import sh.sar.basedbank.util.CredentialStore
+import sh.sar.basedbank.util.CardsCache
 import sh.sar.basedbank.util.FinancingCache
 import sh.sar.basedbank.util.ForeignLimitsCache
 
@@ -63,6 +74,10 @@ class HomeActivity : AppCompatActivity() {
     private lateinit var toggle: ActionBarDrawerToggle
     private var suppressBottomNavCallback = false
 
+    private var backPressedOnce = false
+    private val backPressHandler = Handler(Looper.getMainLooper())
+    private val resetBackPress = Runnable { backPressedOnce = false }
+
     private val autolockHandler = Handler(Looper.getMainLooper())
     private var warningDialog: AlertDialog? = null
     private var countdownTimer: CountDownTimer? = null
@@ -110,6 +125,12 @@ class HomeActivity : AppCompatActivity() {
         binding.drawerLayout.addDrawerListener(toggle)
         toggle.syncState()
 
+        ViewCompat.setOnApplyWindowInsetsListener(binding.navigationView) { v, insets ->
+            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.updatePadding(top = bars.top, bottom = bars.bottom)
+            insets
+        }
+
         binding.bottomNavigation.setOnItemSelectedListener { item ->
             if (suppressBottomNavCallback) return@setOnItemSelectedListener true
             val frag = when (item.itemId) {
@@ -124,6 +145,8 @@ class HomeActivity : AppCompatActivity() {
                 R.id.nav_finances         -> FinancingFragment()
                 R.id.nav_otp              -> OtpFragment()
                 R.id.nav_settings         -> SettingsFragment()
+                R.id.nav_pay_with_card    -> PayWithCardFragment()
+                R.id.nav_card_settings    -> CardSettingsFragment()
                 else -> null
             }
             if (frag != null) show(frag)
@@ -155,8 +178,12 @@ class HomeActivity : AppCompatActivity() {
                 byLoginId.forEach { (loginId, accs) -> AccountCache.saveFahipay(this, loginId, accs) }
             }
 
+            val cachedCards = CardsCache.load(this)
+            if (cachedCards.isNotEmpty()) viewModel.mibCards.value = cachedCards
             val cachedFinancing = FinancingCache.load(this)
             if (cachedFinancing.isNotEmpty()) viewModel.financing.value = cachedFinancing
+            val cachedBmlLoans = FinancingCache.loadBmlLoans(this)
+            if (cachedBmlLoans.isNotEmpty()) viewModel.bmlLoanDetails.value = cachedBmlLoans
             val cachedLimits = ForeignLimitsCache.load(this)
             if (cachedLimits.isNotEmpty()) viewModel.bmlLimits.value = cachedLimits
 
@@ -165,6 +192,8 @@ class HomeActivity : AppCompatActivity() {
                 refreshFinancing(loginId, session, profiles.filterVisibleProfiles(loginId))
             }
             for ((_, session) in app.bmlSessions) refreshBmlLimits(session)
+            refreshBmlLoanDetails()
+            triggerRefreshCards()
         } else {
             // Came from lock screen — show caches immediately, refresh everything in background
             val store = CredentialStore(this)
@@ -173,20 +202,62 @@ class HomeActivity : AppCompatActivity() {
             val cachedFahipay = AccountCache.loadFahipay(this, store.getFahipayLoginIds())
             val merged = cachedMib + cachedBml + cachedFahipay
             if (merged.isNotEmpty()) viewModel.accounts.value = merged
+            val cachedCards = CardsCache.load(this)
+            if (cachedCards.isNotEmpty()) viewModel.mibCards.value = cachedCards
             val cachedFinancing = FinancingCache.load(this)
             if (cachedFinancing.isNotEmpty()) viewModel.financing.value = cachedFinancing
+            val cachedBmlLoans = FinancingCache.loadBmlLoans(this)
+            if (cachedBmlLoans.isNotEmpty()) viewModel.bmlLoanDetails.value = cachedBmlLoans
             val cachedLimits = ForeignLimitsCache.load(this)
             if (cachedLimits.isNotEmpty()) viewModel.bmlLimits.value = cachedLimits
 
             autoRefresh(store)
         }
 
+        viewModel.hideAmounts.value = getSharedPreferences("prefs", MODE_PRIVATE).getBoolean("hide_amounts", false)
+
         // Show dashboard on first create
         if (savedInstanceState == null) {
             show(DashboardFragment())
             binding.navigationView.setCheckedItem(R.id.nav_dashboard)
         }
 
+        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                // Close drawer if open (drawer-nav mode)
+                if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
+                    binding.drawerLayout.closeDrawers()
+                    return
+                }
+                // Pop fragment back stack if there's anything on it (e.g. showWithBackStack)
+                if (supportFragmentManager.backStackEntryCount > 0) {
+                    supportFragmentManager.popBackStack()
+                    return
+                }
+                // 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())
+                        return
+                    }
+                    binding.bottomNavigation.selectedItemId = R.id.nav_dashboard
+                    return
+                }
+                // At top level — require double-tap to exit
+                if (backPressedOnce) {
+                    backPressHandler.removeCallbacks(resetBackPress)
+                    finish()
+                } else {
+                    backPressedOnce = true
+                    Toast.makeText(this@HomeActivity, R.string.press_back_to_exit, Toast.LENGTH_SHORT).show()
+                    backPressHandler.postDelayed(resetBackPress, 2000)
+                }
+            }
+        })
+
         // Keep all MIB sessions alive every 25 seconds while the app is in the foreground
         lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.STARTED) {
@@ -286,6 +357,8 @@ fun applyNavLabelVisibility() {
             R.id.nav_finances         -> FinancingFragment()
             R.id.nav_otp              -> OtpFragment()
             R.id.nav_settings         -> SettingsFragment()
+            R.id.nav_pay_with_card    -> PayWithCardFragment()
+            R.id.nav_card_settings    -> CardSettingsFragment()
             else -> { Toast.makeText(this, R.string.work_in_progress, Toast.LENGTH_SHORT).show(); return }
         }
         show(dest)
@@ -309,6 +382,19 @@ fun applyNavLabelVisibility() {
         }
     }
 
+    fun triggerRefresh() {
+        autoRefresh(CredentialStore(this))
+    }
+
+    fun triggerRefreshFinancing() {
+        val app = application as BasedBankApp
+        for ((loginId, session) in app.mibSessions) {
+            val profiles = app.mibProfilesMap[loginId] ?: emptyList()
+            refreshFinancing(loginId, session, profiles.filterVisibleProfiles(loginId))
+        }
+        refreshBmlLoanDetails()
+    }
+
     fun setRefreshing(visible: Boolean) {
         binding.refreshIndicator.visibility = if (visible) View.VISIBLE else View.GONE
     }
@@ -322,11 +408,12 @@ fun applyNavLabelVisibility() {
 
     override fun onResume() {
         super.onResume()
-        // Returning from LockActivity — skip the elapsed check and reset state.
+        // Returning from LockActivity — refresh sessions since they may have expired.
         if (isLocked) {
             isLocked = false
             pauseTime = 0L
             resetAutolockTimer()
+            autoRefresh(CredentialStore(this))
             return
         }
         // If we were away long enough to have hit the autolock timeout (e.g. while
@@ -339,6 +426,9 @@ fun applyNavLabelVisibility() {
                 lock()
                 return
             }
+            if (elapsed > 45_000L) {
+                autoRefresh(CredentialStore(this))
+            }
         }
         resetAutolockTimer()
     }
@@ -402,12 +492,34 @@ 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
+        val hidden = viewModel.hideAmounts.value ?: false
+        eyeItem?.setIcon(if (hidden) R.drawable.ic_visibility_off else R.drawable.ic_visibility)
         return true
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == R.id.action_lock) {
-            lock()
+            val avd = getDrawable(R.drawable.avd_lock) as? android.graphics.drawable.AnimatedVectorDrawable
+            if (avd != null) {
+                item.icon = avd
+                avd.start()
+                Handler(Looper.getMainLooper()).postDelayed({ lock() }, 200)
+            } else {
+                lock()
+            }
+            return true
+        }
+        if (item.itemId == R.id.action_hide_amounts) {
+            val newHidden = !(viewModel.hideAmounts.value ?: false)
+            viewModel.hideAmounts.value = newHidden
+            getSharedPreferences("prefs", MODE_PRIVATE).edit().putBoolean("hide_amounts", newHidden).apply()
+            val avd = getDrawable(if (newHidden) R.drawable.avd_hide_amounts else R.drawable.avd_show_amounts)
+                    as? android.graphics.drawable.AnimatedVectorDrawable
+            item.icon = avd
+            avd?.start()
             return true
         }
         return super.onOptionsItemSelected(item)
@@ -461,86 +573,81 @@ fun applyNavLabelVisibility() {
             }
 
             // One async job per BML login, all run in parallel
-            val bmlJobs = bmlLoginIds.mapNotNull { loginId ->
+            val bmlJobs = bmlLoginIds.map { loginId ->
-                val creds = store.loadBmlCredentials(loginId) ?: return@mapNotNull null
                 loginId to async(Dispatchers.IO) {
                     val loginTag = "bml_$loginId"
                     val app = application as BasedBankApp
                     val savedProfiles = store.loadBmlProfiles(loginId)
-                    val allAccounts = mutableListOf<MibAccount>()
+                    val allAccounts = mutableListOf<BankAccount>()
-                    var anyExpired = savedProfiles.isEmpty()
 
-                    // Try each saved profile's cached session
+                    if (savedProfiles.isNotEmpty()) app.bmlProfilesMap[loginId] = savedProfiles
+
+                    val bmlClient = BmlAccountClient()
                     for (profile in savedProfiles) {
                         val saved = store.loadBmlProfileSession(profile.profileId)
-                        if (saved != null) {
+                        val refreshToken = store.loadBmlProfileRefreshToken(profile.profileId)
-                            try {
+                        if (saved == null) {
-                                val session = BmlSession(saved.first, saved.second)
+                            allAccounts += AccountCache.loadBml(this@HomeActivity, loginId)
-                                val accounts = BmlLoginFlow().fetchAccounts(session, loginTag, profile.name, profile.profileId)
+                                .filter { it.profileId == profile.profileId }
-                                app.bmlSessions[profile.profileId] = session
+                            continue
-                                allAccounts += accounts
+                        }
-                            } catch (_: AuthExpiredException) { anyExpired = true
+                        val expiresAt = store.loadBmlProfileExpiresAt(profile.profileId)
-                            } catch (_: Exception) { anyExpired = true }
+                        val tokenKnownExpired = expiresAt > 0L && System.currentTimeMillis() >= expiresAt
-                        } else {
+
-                            anyExpired = true
+                        suspend fun fetchWithSession(session: BmlSession) {
+                            bmlClient.checkProfile(session)
+                            val accounts = bmlClient.fetchAccounts(session, loginTag, profile.name, profile.profileId)
+                            app.bmlSessions[profile.profileId] = session
+                            allAccounts += accounts
+                        }
+
+                        suspend fun tryRefresh() {
+                            if (refreshToken == null) throw Exception("No refresh token")
+                            val oldSession = BmlSession(saved.first, saved.second, refreshToken)
+                            val newSession = app.bmlFlowFor(loginId).refreshSession(oldSession)
+                            store.saveBmlProfileSession(profile.profileId, newSession.accessToken, newSession.deviceId)
+                            if (newSession.refreshToken.isNotBlank())
+                                store.saveBmlProfileRefreshToken(profile.profileId, newSession.refreshToken)
+                            if (newSession.expiresAt > 0)
+                                store.saveBmlProfileExpiresAt(profile.profileId, newSession.expiresAt)
+                            fetchWithSession(newSession)
+                        }
+
+                        try {
+                            if (tokenKnownExpired) {
+                                tryRefresh()
+                            } else {
+                                try {
+                                    fetchWithSession(BmlSession(saved.first, saved.second))
+                                } catch (_: AuthExpiredException) {
+                                    tryRefresh()
+                                }
+                            }
+                        } catch (_: Exception) {
+                            allAccounts += AccountCache.loadBml(this@HomeActivity, loginId)
+                                .filter { it.profileId == profile.profileId }
                         }
                     }
 
-                    // Also try legacy single-profile session token (pre-multi-profile installs)
+                    // Legacy single-profile session (pre-multi-profile installs)
                     if (savedProfiles.isEmpty()) {
                         val legacyToken = store.loadBmlSession(loginId)
                         if (legacyToken != null) {
                             try {
                                 val session = BmlSession(legacyToken.first, legacyToken.second)
-                                val accounts = BmlLoginFlow().fetchAccounts(session, loginTag)
+                                val accounts = BmlAccountClient().fetchAccounts(session, loginTag)
                                 app.bmlSessions[loginId] = session
                                 allAccounts += accounts
-                                anyExpired = false
+                            } catch (_: Exception) {
-                            } catch (_: AuthExpiredException) { anyExpired = true
-                            } catch (_: Exception) { anyExpired = true }
-                        }
-                    }
-
-                    if (anyExpired || allAccounts.isEmpty()) {
-                        // Re-authenticate to refresh personal profile sessions
-                        try {
-                            val flow = app.bmlFlowFor(loginId)
-                            val profiles = flow.login(creds.username, creds.password, creds.otpSeed)
-                            store.saveBmlProfiles(loginId, profiles)
-                            app.bmlProfilesMap[loginId] = profiles
-
-                            for (profile in profiles) {
-                                if (profile.profileType == "business") {
-                                    // Can't activate business profiles without user OTP — use cached
-                                    val cached = AccountCache.loadBml(this@HomeActivity, loginId)
-                                        .filter { it.profileId == profile.profileId }
-                                    if (allAccounts.none { it.profileId == profile.profileId })
-                                        allAccounts += cached
-                                    continue
-                                }
-                                try {
-                                    val result = flow.activateProfile(profile, loginTag)
-                                    if (result is BmlActivationResult.Success) {
-                                        store.saveBmlProfileSession(profile.profileId, result.session.accessToken, result.session.deviceId)
-                                        app.bmlSessions[profile.profileId] = result.session
-                                        allAccounts.removeAll { it.profileId == profile.profileId }
-                                        allAccounts += result.accounts
-                                    }
-                                } catch (_: Exception) {
-                                    if (allAccounts.none { it.profileId == profile.profileId }) {
-                                        allAccounts += AccountCache.loadBml(this@HomeActivity, loginId)
-                                            .filter { it.profileId == profile.profileId }
-                                    }
-                                }
-                            }
-                        } catch (_: Exception) {
-                            if (allAccounts.isEmpty())
                                 allAccounts += AccountCache.loadBml(this@HomeActivity, loginId)
+                            }
+                        } else {
+                            allAccounts += AccountCache.loadBml(this@HomeActivity, loginId)
                         }
                     }
 
                     if (allAccounts.isNotEmpty()) AccountCache.saveBml(this@HomeActivity, loginId, allAccounts)
-                    allAccounts as List<MibAccount>
+                    allAccounts as List<BankAccount>
                 }
             }
 
@@ -556,10 +663,9 @@ fun applyNavLabelVisibility() {
                     if (savedSession != null) {
                         try {
                             val session = FahipaySession(savedSession.first, savedSession.second)
-                            fahipayFlow.setSessionCookie(session.sessionCookie)
+                            val balance = FahipayAccountClient().fetchBalance(session)
-                            val balance = fahipayFlow.fetchBalance(session)
+                            val profile = FahipayAccountClient().fetchProfile(session)
-                            val profile = fahipayFlow.fetchProfile(session)
+                            val accounts = listOf(FahipayAccountClient().buildAccount(profile, balance, loginTag))
-                            val accounts = listOf(fahipayFlow.buildAccount(profile, balance, loginTag))
                             val app = application as BasedBankApp
                             app.fahipaySessions[loginId] = session
                             AccountCache.saveFahipay(this@HomeActivity, loginId, accounts)
@@ -576,9 +682,9 @@ fun applyNavLabelVisibility() {
                         val cookieValue = fahipayFlow.getSessionCookieValue() ?: ""
                         val session = FahipaySession(authId, cookieValue)
                         store.saveFahipaySession(loginId, authId, cookieValue)
-                        val profile = fahipayFlow.fetchProfile(session)
+                        val profile = FahipayAccountClient().fetchProfile(session)
-                        val balance = fahipayFlow.fetchBalance(session)
+                        val balance = FahipayAccountClient().fetchBalance(session)
-                        val accounts = listOf(fahipayFlow.buildAccount(profile, balance, loginTag))
+                        val accounts = listOf(FahipayAccountClient().buildAccount(profile, balance, loginTag))
                         val app = application as BasedBankApp
                         app.fahipaySessions[loginId] = session
                         AccountCache.saveFahipay(this@HomeActivity, loginId, accounts)
@@ -607,11 +713,16 @@ fun applyNavLabelVisibility() {
                 val profiles = app.mibProfilesMap[loginId] ?: emptyList()
                 refreshFinancing(loginId, session, profiles.filterVisibleProfiles(loginId))
             }
+            refreshBmlLoanDetails()
+            for ((loginId, session) in app.mibSessions) {
+                val profiles = app.mibProfilesMap[loginId] ?: emptyList()
+                refreshMibCards(loginId, session, profiles)
+            }
         }
     }
 
     /** Filters accounts whose profileId the user has hidden in settings. */
-    private fun List<MibAccount>.filterVisibleAccounts(): List<MibAccount> {
+    private fun List<BankAccount>.filterVisibleAccounts(): List<BankAccount> {
         val store = CredentialStore(this@HomeActivity)
         return filter { acc ->
             when (acc.bank) {
@@ -644,11 +755,10 @@ fun applyNavLabelVisibility() {
     }
 
     private fun refreshBmlLimits(session: BmlSession) {
-        val bmlFlow = BmlLoginFlow()
         lifecycleScope.launch {
             try {
                 val (userName, limits) = withContext(Dispatchers.IO) {
-                    Pair(bmlFlow.fetchUserInfo(session)?.fullName ?: "", bmlFlow.fetchForeignLimits(session))
+                    Pair(BmlAccountClient().fetchUserInfo(session)?.fullName ?: "", BmlForeignLimitsClient().fetchForeignLimits(session))
                 }
                 val existing = viewModel.bmlLimits.value?.toMutableList() ?: mutableListOf()
                 val idx = existing.indexOfFirst { it.userName == userName }
@@ -668,7 +778,7 @@ fun applyNavLabelVisibility() {
                 val allBmlContacts = withContext(Dispatchers.IO) {
                     store.getBmlLoginIds().flatMap { loginId ->
                         val session = app.anyBmlSessionFor(loginId) ?: return@flatMap emptyList()
-                        val contacts = BmlLoginFlow().fetchContacts(session, loginId)
+                        val contacts = BmlContactsClient().fetchContacts(session, loginId)
                         if (contacts.isNotEmpty()) ContactsCache.saveBml(this@HomeActivity, loginId, contacts)
                         contacts
                     }
@@ -711,13 +821,11 @@ fun applyNavLabelVisibility() {
         lifecycleScope.launch {
             try {
                 val groups = withContext(Dispatchers.IO) {
-                    val flow = FahipayLoginFlow()
+                    FahipayContactsClient().fetchContacts(session)
-                    flow.setSessionCookie(session.sessionCookie)
-                    flow.fetchContacts(session)
                 }
                 if (groups.isEmpty()) return@launch
                 val contacts = groups.flatMap { it.contacts }
-                val categories = groups.map { MibBeneficiaryCategory(it.categoryId, it.label, it.contacts.size) }
+                val categories = groups.map { BankContactCategory(it.categoryId, it.label, it.contacts.size) }
                 ContactsCache.saveFahipay(this@HomeActivity, contacts, categories)
                 val mibContacts = ContactsCache.loadContacts(this@HomeActivity)
                 val bmlLoginIds = sh.sar.basedbank.util.CredentialStore(this@HomeActivity).getBmlLoginIds()
@@ -730,11 +838,11 @@ fun applyNavLabelVisibility() {
     }
 
     private fun mergeContacts(
-        mib: List<MibBeneficiary>,
+        mib: List<BankContact>,
-        bml: List<MibBeneficiary>
+        bml: List<BankContact>
-    ): List<MibBeneficiary> {
+    ): List<BankContact> {
         val seen = mutableSetOf<String>()
-        val result = mutableListOf<MibBeneficiary>()
+        val result = mutableListOf<BankContact>()
         for (c in mib) if (seen.add(c.benefNo)) result.add(c)
         for (c in bml) if (seen.add(c.benefNo)) result.add(c)
         return result
@@ -749,8 +857,8 @@ fun applyNavLabelVisibility() {
                 val (allContacts, allCategories) = withContext(Dispatchers.IO) {
                     val seenContacts = mutableSetOf<String>()
                     val seenCategories = mutableSetOf<String>()
-                    val contacts = mutableListOf<MibBeneficiary>()
+                    val contacts = mutableListOf<BankContact>()
-                    val categories = mutableListOf<MibBeneficiaryCategory>()
+                    val categories = mutableListOf<BankContactCategory>()
                     for (profile in profiles) {
                         try {
                             flow.switchProfile(session, profile)
@@ -778,7 +886,7 @@ fun applyNavLabelVisibility() {
         }
     }
 
-    fun refreshBalances(src: MibAccount) {
+    fun refreshBalances(src: BankAccount) {
         val app = application as BasedBankApp
         lifecycleScope.launch {
             val current = viewModel.accounts.value ?: emptyList()
@@ -786,12 +894,10 @@ fun applyNavLabelVisibility() {
                 val fresh = withContext(Dispatchers.IO) {
                     val sess = app.fahipaySessionFor(src) ?: return@withContext null
                     try {
-                        val flow = FahipayLoginFlow()
+                        val balance = FahipayAccountClient().fetchBalance(sess)
-                        flow.setSessionCookie(sess.sessionCookie)
+                        val profile = FahipayAccountClient().fetchProfile(sess)
-                        val balance = flow.fetchBalance(sess)
-                        val profile = flow.fetchProfile(sess)
                         val loginTag = "fahipay_${profile.profileId}"
-                        val accounts = listOf(flow.buildAccount(profile, balance, loginTag))
+                        val accounts = listOf(FahipayAccountClient().buildAccount(profile, balance, loginTag))
                         val loginId = src.loginTag.removePrefix("fahipay_")
                         AccountCache.saveFahipay(this@HomeActivity, loginId, accounts)
                         app.fahipayAccounts = app.fahipayAccounts.filter { it.loginTag != src.loginTag } + accounts
@@ -805,7 +911,7 @@ fun applyNavLabelVisibility() {
                 val fresh = withContext(Dispatchers.IO) {
                     val sess = app.bmlSessionFor(src) ?: return@withContext null
                     try {
-                        val accounts = BmlLoginFlow().fetchAccounts(sess, src.loginTag)
+                        val accounts = BmlAccountClient().fetchAccounts(sess, src.loginTag)
                         AccountCache.saveBml(this@HomeActivity, loginId, accounts)
                         val otherBml = app.bmlAccounts.filter { it.loginTag != src.loginTag }
                         app.bmlAccounts = otherBml + accounts
@@ -849,6 +955,70 @@ fun applyNavLabelVisibility() {
         }
     }
 
+    private fun refreshBmlLoanDetails() {
+        val app = application as BasedBankApp
+        val loanAccounts = app.bmlAccounts.filter { it.profileType == "BML_LOAN" }
+        if (loanAccounts.isEmpty()) return
+        lifecycleScope.launch {
+            try {
+                val details = withContext(Dispatchers.IO) {
+                    val map = mutableMapOf<String, BmlLoanDetail>()
+                    for (acc in loanAccounts) {
+                        val session = app.bmlSessionFor(acc) ?: continue
+                        try {
+                            val detail = BmlAccountClient().fetchLoanDetail(session, acc.internalId)
+                            if (detail != null) map[acc.internalId] = detail
+                        } catch (_: Exception) { /* keep existing */ }
+                    }
+                    map
+                }
+                if (details.isNotEmpty()) {
+                    val merged = (viewModel.bmlLoanDetails.value ?: emptyMap()) + details
+                    FinancingCache.saveBmlLoans(this@HomeActivity, merged)
+                    viewModel.bmlLoanDetails.postValue(merged)
+                }
+            } catch (_: Exception) { /* keep cached data */ }
+        }
+    }
+
+    fun triggerRefreshCards() {
+        val app = application as BasedBankApp
+        for ((loginId, session) in app.mibSessions) {
+            val profiles = app.mibProfilesMap[loginId] ?: emptyList()
+            refreshMibCards(loginId, session, profiles)
+        }
+    }
+
+    private fun refreshMibCards(loginId: String, session: MibSession, profiles: List<MibProfile>) {
+        if (profiles.isEmpty()) return
+        val flow = (application as BasedBankApp).mibFlowFor(loginId)
+        val client = MibCardsClient()
+        lifecycleScope.launch {
+            try {
+                val cards = withContext(Dispatchers.IO) {
+                    val result = mutableListOf<sh.sar.basedbank.api.mib.MibCard>()
+                    val seen = mutableSetOf<String>()
+                    for (profile in profiles) {
+                        try {
+                            flow.switchProfile(session, profile)
+                            for (card in client.fetchCards(session, "mib_$loginId")) {
+                                if (seen.add(card.cardId)) result += card
+                            }
+                        } catch (_: Exception) { }
+                    }
+                    result
+                }
+                if (cards.isNotEmpty()) {
+                    val existing = viewModel.mibCards.value?.toMutableList() ?: mutableListOf()
+                    existing.removeAll { it.loginTag == "mib_$loginId" }
+                    existing += cards
+                    viewModel.mibCards.postValue(existing)
+                    CardsCache.save(this@HomeActivity, existing)
+                }
+            } catch (_: Exception) { }
+        }
+    }
+
     private fun refreshFinancing(loginId: String, session: MibSession, profiles: List<MibProfile>) {
         if (profiles.isEmpty()) return
         val flow = (application as BasedBankApp).mibFlowFor(loginId)

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

@@ -3,17 +3,25 @@ package sh.sar.basedbank.ui.home
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import sh.sar.basedbank.api.bml.BmlForeignLimit
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.bml.BmlLoanDetail
-import sh.sar.basedbank.api.mib.MibBeneficiary
+import sh.sar.basedbank.api.models.BankAccount
-import sh.sar.basedbank.api.mib.MibBeneficiaryCategory
+import sh.sar.basedbank.api.models.BankContact
+import sh.sar.basedbank.api.models.BankContactCategory
+import sh.sar.basedbank.api.mib.MibCard
 import sh.sar.basedbank.api.mib.MibFinanceDeal
 
 class HomeViewModel : ViewModel() {
-    val accounts = MutableLiveData<List<MibAccount>>(emptyList())
+    val accounts = MutableLiveData<List<BankAccount>>(emptyList())
     val financing = MutableLiveData<List<MibFinanceDeal>>(emptyList())
-    val contacts = MutableLiveData<List<MibBeneficiary>>(emptyList())
+    /** BML loan details keyed by account internalId. */
-    val contactCategories = MutableLiveData<List<MibBeneficiaryCategory>>(emptyList())
+    val bmlLoanDetails = MutableLiveData<Map<String, BmlLoanDetail>>(emptyMap())
+    val contacts = MutableLiveData<List<BankContact>>(emptyList())
+    val contactCategories = MutableLiveData<List<BankContactCategory>>(emptyList())
 
     data class BmlLimitsData(val userName: String, val limits: List<BmlForeignLimit>)
     val bmlLimits = MutableLiveData<List<BmlLimitsData>>(emptyList())
+
+    val mibCards = MutableLiveData<List<MibCard>?>(null)
+
+    val hideAmounts = MutableLiveData<Boolean>(false)
 }

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

@@ -25,6 +25,7 @@ class MoreFragment : Fragment() {
             val row = inflater.inflate(R.layout.item_more_nav, list, false)
             row.findViewById<ImageView>(R.id.ivIcon).setImageResource(item.iconRes)
             row.findViewById<TextView>(R.id.tvLabel).setText(item.titleRes)
+            row.findViewById<TextView>(R.id.tvDescription).setText(item.descriptionRes)
             row.setOnClickListener { (requireActivity() as HomeActivity).navigateTo(item.id) }
             list.addView(row)
         }

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

@@ -10,21 +10,23 @@ object NavCustomization {
     data class NavItemDef(
         val id: Int,
         @DrawableRes val iconRes: Int,
-        @StringRes val titleRes: Int
+        @StringRes val titleRes: Int,
+        @StringRes val descriptionRes: Int
     )
 
     /** All items that can occupy either a bottom nav slot or the "More" screen. */
     val ALL_SWAPPABLE = listOf(
-        NavItemDef(R.id.nav_accounts,         R.drawable.ic_nav_accounts,         R.string.nav_accounts),
+        NavItemDef(R.id.nav_accounts,         R.drawable.ic_nav_accounts,         R.string.nav_accounts,         R.string.nav_desc_accounts),
-        NavItemDef(R.id.nav_contacts,         R.drawable.ic_contacts,             R.string.nav_contacts),
+        NavItemDef(R.id.nav_contacts,         R.drawable.ic_contacts,             R.string.nav_contacts,         R.string.nav_desc_contacts),
-        NavItemDef(R.id.nav_transfer,         R.drawable.ic_send,                 R.string.transfer),
+        NavItemDef(R.id.nav_transfer,         R.drawable.ic_send,                 R.string.transfer,             R.string.nav_desc_transfer),
-        NavItemDef(R.id.nav_pay_mv_qr,        R.drawable.ic_qr_scan,              R.string.pay_mv_qr),
+        NavItemDef(R.id.nav_pay_mv_qr,        R.drawable.ic_qr_scan,              R.string.pay_mv_qr,            R.string.nav_desc_pay_mv_qr),
-        NavItemDef(R.id.nav_activities,       R.drawable.ic_nav_activities,       R.string.nav_activities),
+        NavItemDef(R.id.nav_activities,       R.drawable.ic_nav_activities,       R.string.nav_activities,       R.string.nav_desc_activities),
-        NavItemDef(R.id.nav_transfer_history, R.drawable.ic_nav_transfer_history, R.string.nav_transfer_history),
+        NavItemDef(R.id.nav_transfer_history, R.drawable.ic_nav_transfer_history, R.string.nav_transfer_history, R.string.nav_desc_transfer_history),
-        NavItemDef(R.id.nav_finances,         R.drawable.ic_nav_finances,         R.string.nav_finances),
+        NavItemDef(R.id.nav_finances,         R.drawable.ic_nav_finances,         R.string.nav_finances,         R.string.nav_desc_finances),
-        NavItemDef(R.id.nav_card_settings,    R.drawable.ic_nav_card,             R.string.nav_card_settings),
+        NavItemDef(R.id.nav_pay_with_card,    R.drawable.ic_nav_card,             R.string.nav_pay_with_card,    R.string.nav_desc_pay_with_card),
-        NavItemDef(R.id.nav_otp,              R.drawable.ic_nav_otp,              R.string.nav_otp),
+        NavItemDef(R.id.nav_card_settings,    R.drawable.ic_nav_card,             R.string.nav_card_settings,    R.string.nav_desc_card_settings),
-        NavItemDef(R.id.nav_settings,         R.drawable.ic_nav_settings,         R.string.nav_settings),
+        NavItemDef(R.id.nav_otp,              R.drawable.ic_nav_otp,              R.string.nav_otp,              R.string.nav_desc_otp),
+        NavItemDef(R.id.nav_settings,         R.drawable.ic_nav_settings,         R.string.nav_settings,         R.string.nav_desc_settings),
     )
 
     fun getSlots(prefs: SharedPreferences): List<Int> = listOf(

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

@@ -14,7 +14,8 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import sh.sar.basedbank.BasedBankApp
-import sh.sar.basedbank.api.bml.BmlLoginFlow
+import sh.sar.basedbank.api.bml.BmlAccountClient
+import sh.sar.basedbank.api.mib.MibProfileClient
 import sh.sar.basedbank.api.mib.MibLoginFlow
 import sh.sar.basedbank.databinding.FragmentOtpBinding
 import sh.sar.basedbank.databinding.ItemOtpCardBinding
@@ -94,7 +95,7 @@ class OtpFragment : Fragment() {
                     val session = app.mibSessions[loginId] ?: continue
                     val flow = app.mibFlowFor(loginId)
                     val profile = withContext(Dispatchers.IO) {
-                        try { flow.fetchPersonalProfile(session) } catch (_: Exception) { null }
+                        try { MibProfileClient().fetchPersonalProfile(session) } catch (_: Exception) { null }
                     }
                     if (profile != null) {
                         store.saveMibUserProfile(loginId, CredentialStore.MibUserProfile(
@@ -114,7 +115,7 @@ class OtpFragment : Fragment() {
                 if (store.loadBmlUserProfile(loginId)?.fullName.isNullOrBlank()) {
                     val session = app.bmlSessions[loginId] ?: continue
                     val info = withContext(Dispatchers.IO) {
-                        try { BmlLoginFlow().fetchUserInfo(session) } catch (_: Exception) { null }
+                        try { BmlAccountClient().fetchUserInfo(session) } catch (_: Exception) { null }
                     }
                     if (info != null) {
                         store.saveBmlUserProfile(loginId, CredentialStore.BmlUserProfile(

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

@@ -16,6 +16,9 @@ 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
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
@@ -30,7 +33,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import sh.sar.basedbank.R
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.databinding.FragmentPayMvQrBinding
 import sh.sar.basedbank.databinding.ItemAccountDropdownBinding
 import sh.sar.basedbank.util.PaymvQrParser
@@ -43,7 +46,7 @@ class PayMvQrFragment : Fragment() {
     private val binding get() = _binding!!
     private val viewModel: HomeViewModel by activityViewModels()
 
-    private var selectedAccount: MibAccount? = null
+    private var selectedAccount: BankAccount? = null
     private var generatedBitmap: Bitmap? = null
     private var generateJob: Job? = null
 
@@ -72,6 +75,14 @@ class PayMvQrFragment : Fragment() {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        val basePaddingBottom = view.paddingBottom
+        ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
+            val bottomNav = activity?.findViewById<View>(R.id.bottomNavigation)
+            val navBarBottom = if (bottomNav?.visibility == View.VISIBLE) 0
+                               else insets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom
+            v.updatePadding(bottom = basePaddingBottom + navBarBottom)
+            insets
+        }
         setupDropdown()
         binding.etAmount.addTextChangedListener { scheduleGenerate() }
         binding.btnShare.isEnabled = false
@@ -86,7 +97,7 @@ class PayMvQrFragment : Fragment() {
     private fun setupDropdown() {
         viewModel.accounts.observe(viewLifecycleOwner) { accounts ->
             val eligible = accounts.filter {
-                it.profileType != "BML_PREPAID" && it.profileType != "BML_CREDIT"
+                it.profileType != "BML_PREPAID" && it.profileType != "BML_CREDIT" && it.profileType != "BML_LOAN"
             }
             val adapter = QrAccountAdapter(requireContext(), eligible)
             binding.actvAccount.setAdapter(adapter)
@@ -177,7 +188,7 @@ class PayMvQrFragment : Fragment() {
 
     private fun renderQrCard(
         ctx: Context,
-        account: MibAccount,
+        account: BankAccount,
         qrPayload: String,
         amountStr: String?
     ): Bitmap {
@@ -369,10 +380,10 @@ class PayMvQrFragment : Fragment() {
 
     private inner class QrAccountAdapter(
         private val context: Context,
-        private val accounts: List<MibAccount>
+        private val accounts: List<BankAccount>
     ) : BaseAdapter(), Filterable {
 
-        fun getAccount(position: Int): MibAccount? = accounts.getOrNull(position)
+        fun getAccount(position: Int): BankAccount? = accounts.getOrNull(position)
 
         override fun getCount() = accounts.size
         override fun getItem(position: Int) = accounts.getOrNull(position)
@@ -402,7 +413,7 @@ class PayMvQrFragment : Fragment() {
                 FilterResults().apply { values = accounts; count = accounts.size }
             override fun publishResults(c: CharSequence?, r: FilterResults?) = notifyDataSetChanged()
             override fun convertResultToString(r: Any?) =
-                (r as? MibAccount)?.let {
+                (r as? BankAccount)?.let {
                     val prefix = if (it.bank == "BML" && it.profileName.isNotBlank()) "${it.profileName} · " else ""
                     "$prefix${it.accountBriefName}"
                 } ?: ""

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

@@ -0,0 +1,152 @@
+package sh.sar.basedbank.ui.home
+
+import android.content.Context
+import android.graphics.BitmapFactory
+import android.os.Bundle
+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.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import sh.sar.basedbank.R
+import sh.sar.basedbank.api.mib.MibCard
+import sh.sar.basedbank.databinding.FragmentPayWithCardBinding
+import sh.sar.basedbank.util.CardsCache
+
+class PayWithCardFragment : Fragment() {
+
+    private var _binding: FragmentPayWithCardBinding? = null
+    private val binding get() = _binding!!
+    private val viewModel: HomeViewModel by activityViewModels()
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        _binding = FragmentPayWithCardBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        val adapter = CardWalletAdapter(emptyList(), requireContext())
+        binding.recyclerView.layoutManager = LinearLayoutManager(requireContext())
+        binding.recyclerView.adapter = adapter
+
+        val bottomPaddingBase = (16 * resources.displayMetrics.density).toInt()
+        ViewCompat.setOnApplyWindowInsetsListener(binding.recyclerView) { v, insets ->
+            val isBottomNav = requireContext().getSharedPreferences("prefs", Context.MODE_PRIVATE).getBoolean("bottom_nav", false)
+            val navBar = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            val extraBottom = if (isBottomNav) 0 else navBar.bottom
+            v.setPadding(v.paddingLeft, v.paddingTop, v.paddingRight, bottomPaddingBase + extraBottom)
+            insets
+        }
+
+        binding.swipeRefresh.setOnRefreshListener {
+            (activity as? HomeActivity)?.triggerRefreshCards()
+        }
+
+        viewModel.mibCards.observe(viewLifecycleOwner) { cards ->
+            if (cards == null) return@observe
+            adapter.update(cards)
+            binding.loadingView.visibility = View.GONE
+            binding.swipeRefresh.isRefreshing = false
+            binding.emptyView.visibility = if (cards.isEmpty()) View.VISIBLE else View.GONE
+            binding.recyclerView.visibility = if (cards.isEmpty()) View.GONE else View.VISIBLE
+        }
+
+        val cached = CardsCache.load(requireContext())
+        if (cached.isNotEmpty()) {
+            viewModel.mibCards.value = cached
+        } else {
+            binding.loadingView.visibility = View.VISIBLE
+        }
+        (activity as? HomeActivity)?.triggerRefreshCards()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        requireActivity().title = getString(R.string.nav_pay_with_card)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    private inner class CardWalletAdapter(
+        private var cards: List<MibCard>,
+        private val context: Context
+    ) : RecyclerView.Adapter<CardWalletAdapter.VH>() {
+
+        fun update(newCards: List<MibCard>) {
+            cards = newCards
+            notifyDataSetChanged()
+        }
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH =
+            VH(LayoutInflater.from(context).inflate(R.layout.item_card_wallet, parent, false))
+
+        override fun onBindViewHolder(holder: VH, position: Int) = holder.bind(cards[position])
+        override fun getItemCount() = cards.size
+
+        inner class VH(view: View) : RecyclerView.ViewHolder(view) {
+            private val ivCardImage: ImageView = view.findViewById(R.id.ivCardImage)
+            private val tvCardOwner: TextView = view.findViewById(R.id.tvCardOwner)
+            private val tvCardNumber: TextView = view.findViewById(R.id.tvCardNumber)
+            private val tvCardType: TextView = view.findViewById(R.id.tvCardType)
+            private val btnPayQr: View = view.findViewById(R.id.btnPayQr)
+            private val btnPayNfc: View = view.findViewById(R.id.btnPayNfc)
+
+            fun bind(card: MibCard) {
+                tvCardOwner.text = card.cardHolderName
+                tvCardNumber.text = formatMasked(card.maskedCardNumber)
+                tvCardType.text = card.cardTypeDesc
+                val assetPath = cardImageAsset(card)
+                if (assetPath != null) loadCardImage(ivCardImage, assetPath)
+                else ivCardImage.setImageDrawable(null)
+                btnPayQr.setOnClickListener {
+                    Toast.makeText(context, R.string.work_in_progress, Toast.LENGTH_SHORT).show()
+                }
+                val nfcAdapter = android.nfc.NfcAdapter.getDefaultAdapter(context)
+                val nfcSupported = nfcAdapter != null
+                btnPayNfc.isEnabled = nfcSupported
+                if (nfcSupported) {
+                    btnPayNfc.setOnClickListener {
+                        Toast.makeText(context, R.string.work_in_progress, Toast.LENGTH_SHORT).show()
+                    }
+                } else {
+                    btnPayNfc.setOnClickListener(null)
+                }
+            }
+        }
+    }
+
+    companion object {
+        fun cardImageAsset(card: MibCard): String? = when (card.cardType) {
+            "53" -> "cards/mib/visa_black_platinum.jpg"
+            "57" -> "cards/mib/visa_blue_everyday.jpg"
+            "70" -> "cards/mib/visa_business.jpg"
+            else -> null
+        }
+
+        fun loadCardImage(imageView: ImageView, assetPath: String) {
+            try {
+                val bitmap = imageView.context.assets.open(assetPath).use {
+                    BitmapFactory.decodeStream(it)
+                }
+                imageView.setImageBitmap(bitmap)
+            } catch (_: Exception) {
+                imageView.setImageDrawable(null)
+            }
+        }
+
+        fun formatMasked(masked: String): String {
+            if (masked.length < 4) return masked
+            return "\u2022\u2022\u2022\u2022 ${masked.takeLast(4)}"
+        }
+    }
+}

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

@@ -17,14 +17,15 @@ class SettingsFragment : Fragment() {
     private data class SettingsItem(
         @DrawableRes val icon: Int,
         @StringRes val title: Int,
+        @StringRes val description: Int,
         val dest: () -> Fragment
     )
 
     private val items = listOf(
-        SettingsItem(R.drawable.ic_contacts,            R.string.settings_logins)           { SettingsLoginsFragment() },
+        SettingsItem(R.drawable.ic_contacts,            R.string.settings_logins,          R.string.settings_desc_logins)           { SettingsLoginsFragment() },
-        SettingsItem(R.drawable.ic_settings_appearance, R.string.settings_appearance)        { SettingsAppearanceFragment() },
+        SettingsItem(R.drawable.ic_settings_appearance, R.string.settings_appearance,       R.string.settings_desc_appearance)       { SettingsAppearanceFragment() },
-        SettingsItem(R.drawable.ic_lock,                R.string.settings_privacy_security)  { SettingsSecurityFragment() },
+        SettingsItem(R.drawable.ic_lock,                R.string.settings_privacy_security, R.string.settings_desc_privacy_security) { SettingsSecurityFragment() },
-        SettingsItem(R.drawable.ic_settings_storage,    R.string.settings_storage)           { SettingsStorageFragment() },
+        SettingsItem(R.drawable.ic_settings_storage,    R.string.settings_storage,          R.string.settings_desc_storage)          { SettingsStorageFragment() },
     )
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =
@@ -37,6 +38,7 @@ class SettingsFragment : Fragment() {
             val row = inflater.inflate(R.layout.item_more_nav, list, false)
             row.findViewById<ImageView>(R.id.ivIcon).setImageResource(item.icon)
             row.findViewById<TextView>(R.id.tvLabel).setText(item.title)
+            row.findViewById<TextView>(R.id.tvDescription).setText(item.description)
             row.setOnClickListener {
                 (requireActivity() as HomeActivity).showWithBackStack(item.dest())
             }

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

@@ -11,6 +11,7 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.materialswitch.MaterialSwitch
 import sh.sar.basedbank.BasedBankApp
@@ -27,11 +28,21 @@ import sh.sar.basedbank.util.CredentialStore
 import sh.sar.basedbank.util.FinancingCache
 import sh.sar.basedbank.util.ForeignLimitsCache
 import sh.sar.basedbank.util.RecentsCache
+import androidx.lifecycle.lifecycleScope
+import kotlin.coroutines.resume
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withContext
+import sh.sar.basedbank.api.bml.BmlActivationResult
+import sh.sar.basedbank.api.bml.BmlLoginFlow
+import sh.sar.basedbank.api.bml.BmlOtpChannel
 
 class SettingsLoginsFragment : Fragment() {
 
     private var _binding: FragmentSettingsLoginsBinding? = null
     private val binding get() = _binding!!
+    private val viewModel: HomeViewModel by activityViewModels()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         _binding = FragmentSettingsLoginsBinding.inflate(inflater, container, false)
@@ -89,13 +100,15 @@ class SettingsLoginsFragment : Fragment() {
             val profile = store.loadFahipayUserProfile(loginId)
             val displayName = profile?.fullName?.takeIf { it.isNotBlank() } ?: getString(R.string.fahipay_name)
             addLoginRow(container, R.drawable.fahipay_logo, displayName) {
+                val hide = viewModel.hideAmounts.value ?: false
+                val masked = "••••••"
                 showLoginDetails(
                     title = getString(R.string.fahipay_name),
                     details = buildString {
                         if (!profile?.fullName.isNullOrBlank()) appendLine("${getString(R.string.login_detail_name)}: ${profile!!.fullName}")
-                        if (!profile?.email.isNullOrBlank()) appendLine("${getString(R.string.login_detail_email)}: ${profile!!.email}")
+                        if (!profile?.email.isNullOrBlank()) appendLine("${getString(R.string.login_detail_email)}: ${if (hide) masked else profile!!.email}")
-                        if (!profile?.mobile.isNullOrBlank()) appendLine("${getString(R.string.login_detail_mobile)}: ${profile!!.mobile}")
+                        if (!profile?.mobile.isNullOrBlank()) appendLine("${getString(R.string.login_detail_mobile)}: ${if (hide) masked else profile!!.mobile}")
-                        if (!profile?.nid.isNullOrBlank()) appendLine("${getString(R.string.login_detail_id_card)}: ${profile!!.nid}")
+                        if (!profile?.nid.isNullOrBlank()) appendLine("${getString(R.string.login_detail_id_card)}: ${if (hide) masked else profile!!.nid}")
                     }.trim(),
                     onLogout = { confirmLogout(getString(R.string.fahipay_name)) { logoutFahipay(store, loginId) } }
                 )
@@ -258,8 +271,16 @@ class SettingsLoginsFragment : Fragment() {
     ) {
         val ctx = requireContext()
         val dp = ctx.resources.displayMetrics.density
-        val originalHidden = store.getHiddenBmlProfileIds(loginId)
+        val hidden = store.getHiddenBmlProfileIds(loginId).toMutableSet()
-        val hidden = originalHidden.toMutableSet()
+        // Business profiles with no saved session were skipped during login — ensure they start hidden
+        val needsActivation = bmlProfiles
+            .filter { it.profileType == "business" && store.loadBmlProfileSession(it.profileId) == null }
+            .map { it.profileId }
+            .toMutableSet()
+        for (id in needsActivation) {
+            if (hidden.add(id)) store.setHiddenBmlProfileIds(loginId, hidden)
+        }
+        val originalHidden = hidden.toSet()
 
         val scroll = android.widget.ScrollView(ctx)
         val container = LinearLayout(ctx).apply {
@@ -269,12 +290,14 @@ class SettingsLoginsFragment : Fragment() {
         }
         scroll.addView(container)
 
+        val hide = viewModel.hideAmounts.value ?: false
+        val masked = "••••••"
         listOfNotNull(
             profile?.fullName?.takeIf { it.isNotBlank() }?.let { "${getString(R.string.login_detail_name)}: $it" },
-            profile?.email?.takeIf { it.isNotBlank() }?.let { "${getString(R.string.login_detail_email)}: $it" },
+            profile?.email?.takeIf { it.isNotBlank() }?.let { "${getString(R.string.login_detail_email)}: ${if (hide) masked else it}" },
-            profile?.mobile?.takeIf { it.isNotBlank() }?.let { "${getString(R.string.login_detail_mobile)}: $it" },
+            profile?.mobile?.takeIf { it.isNotBlank() }?.let { "${getString(R.string.login_detail_mobile)}: ${if (hide) masked else it}" },
-            profile?.customerId?.takeIf { it.isNotBlank() }?.let { "${getString(R.string.login_detail_customer_id)}: $it" },
+            profile?.customerId?.takeIf { it.isNotBlank() }?.let { "${getString(R.string.login_detail_customer_id)}: ${if (hide) masked else it}" },
-            profile?.idCard?.takeIf { it.isNotBlank() }?.let { "${getString(R.string.login_detail_id_card)}: $it" }
+            profile?.idCard?.takeIf { it.isNotBlank() }?.let { "${getString(R.string.login_detail_id_card)}: ${if (hide) masked else it}" }
         ).forEach { line ->
             container.addView(TextView(ctx).apply {
                 text = line
@@ -357,8 +380,19 @@ class SettingsLoginsFragment : Fragment() {
 
         toggleRows.forEach { (p, toggle) ->
             toggle.setOnCheckedChangeListener { _, checked ->
-                if (checked) hidden.remove(p.profileId) else hidden.add(p.profileId)
+                if (checked && p.profileId in needsActivation) {
-                updateToggleStates(saveBtn)
+                    toggle.isChecked = false  // revert — enabling requires OTP
+                    viewLifecycleOwner.lifecycleScope.launch {
+                        val success = activateBmlBusinessProfile(store, loginId, p)
+                        if (success) {
+                            needsActivation.remove(p.profileId)
+                            toggle.isChecked = true  // listener re-fires, removes from hidden
+                        }
+                    }
+                } else {
+                    if (checked) hidden.remove(p.profileId) else hidden.add(p.profileId)
+                    updateToggleStates(saveBtn)
+                }
             }
         }
 
@@ -366,7 +400,217 @@ class SettingsLoginsFragment : Fragment() {
             store.setHiddenBmlProfileIds(loginId, hidden)
             clearAllCaches(ctx)
             dialog.dismiss()
-            (activity as? HomeActivity)?.applyProfileVisibility()
+            (activity as? HomeActivity)?.relogin()
+        }
+    }
+
+    private suspend fun activateBmlBusinessProfile(
+        store: CredentialStore,
+        loginId: String,
+        profile: BmlProfile
+    ): Boolean {
+        val creds = store.loadBmlCredentials(loginId) ?: run {
+            showSimpleError("Credentials not found — please log out and log in again")
+            return false
+        }
+        val progressDialog = MaterialAlertDialogBuilder(requireContext())
+            .setMessage("Connecting to BML\u2026")
+            .setCancelable(false)
+            .show()
+        val flow = BmlLoginFlow()
+        val loginTag = "bml_$loginId"
+        val activationResult = try {
+            withContext(Dispatchers.IO) {
+                flow.login(creds.username, creds.password, creds.otpSeed)
+                flow.activateProfile(profile, loginTag)
+            }
+        } catch (e: Exception) {
+            progressDialog.dismiss()
+            showSimpleError(e.message ?: "Authentication failed")
+            return false
+        }
+        progressDialog.dismiss()
+        return when (activationResult) {
+            is BmlActivationResult.Success -> {
+                store.saveBmlProfileSession(profile.profileId, activationResult.session.accessToken, activationResult.session.deviceId)
+                if (activationResult.session.refreshToken.isNotBlank())
+                    store.saveBmlProfileRefreshToken(profile.profileId, activationResult.session.refreshToken)
+                if (activationResult.session.expiresAt > 0)
+                    store.saveBmlProfileExpiresAt(profile.profileId, activationResult.session.expiresAt)
+                true
+            }
+            is BmlActivationResult.NeedsBusinessOtp ->
+                continueBmlBusinessOtpFlow(store, loginId, profile, flow, loginTag, activationResult.channels)
+        }
+    }
+
+    private suspend fun continueBmlBusinessOtpFlow(
+        store: CredentialStore,
+        loginId: String,
+        profile: BmlProfile,
+        flow: BmlLoginFlow,
+        loginTag: String,
+        channels: List<BmlOtpChannel>
+    ): Boolean {
+        val selectedChannel = showBmlChannelSelectionDialog(profile.name, channels) ?: return false
+        val channelObj = channels.first { it.channel == selectedChannel }
+        val sendProgress = MaterialAlertDialogBuilder(requireContext())
+            .setMessage("Sending OTP\u2026")
+            .setCancelable(false)
+            .show()
+        try {
+            withContext(Dispatchers.IO) { flow.requestBusinessOtp(selectedChannel) }
+        } catch (e: Exception) {
+            sendProgress.dismiss()
+            showSimpleError(e.message ?: "Failed to send OTP")
+            return false
+        }
+        sendProgress.dismiss()
+        var otpError: String? = null
+        while (true) {
+            val code = showBmlOtpInputDialog(profile.name, channelObj, otpError) ?: return false
+            val verifyProgress = MaterialAlertDialogBuilder(requireContext())
+                .setMessage("Verifying\u2026")
+                .setCancelable(false)
+                .show()
+            try {
+                val (session, _) = withContext(Dispatchers.IO) {
+                    flow.submitBusinessOtp(selectedChannel, code, profile, loginTag)
+                }
+                verifyProgress.dismiss()
+                store.saveBmlProfileSession(profile.profileId, session.accessToken, session.deviceId)
+                if (session.refreshToken.isNotBlank())
+                    store.saveBmlProfileRefreshToken(profile.profileId, session.refreshToken)
+                if (session.expiresAt > 0)
+                    store.saveBmlProfileExpiresAt(profile.profileId, session.expiresAt)
+                return true
+            } catch (e: Exception) {
+                verifyProgress.dismiss()
+                if (e.message?.contains("Invalid OTP") == true) {
+                    otpError = e.message
+                } else {
+                    showSimpleError(e.message ?: "Verification failed")
+                    return false
+                }
+            }
+        }
+    }
+
+    private fun showSimpleError(message: String) {
+        MaterialAlertDialogBuilder(requireContext())
+            .setMessage(message)
+            .setPositiveButton(R.string.close, null)
+            .show()
+    }
+
+    private suspend fun showBmlChannelSelectionDialog(profileName: String, channels: List<BmlOtpChannel>): String? =
+        suspendCancellableCoroutine { cont ->
+            val ctx = requireContext()
+            val dp = ctx.resources.displayMetrics.density
+
+            val list = LinearLayout(ctx).apply {
+                orientation = LinearLayout.VERTICAL
+                val vp = (8 * dp).toInt()
+                setPadding(0, vp, 0, vp)
+            }
+
+            for (channel in channels) {
+                val iconRes = when (channel.channel) {
+                    "Email"    -> R.drawable.ic_channel_email
+                    "Mobile"   -> R.drawable.ic_channel_sms
+                    "WhatsApp" -> R.drawable.ic_channel_whatsapp
+                    else       -> R.drawable.ic_channel_sms
+                }
+                val iconSize = (24 * dp).toInt()
+
+                val iconView = ImageView(ctx).apply {
+                    setImageResource(iconRes)
+                }
+
+                val textCol = LinearLayout(ctx).apply {
+                    orientation = LinearLayout.VERTICAL
+                    gravity = Gravity.CENTER_VERTICAL
+                    layoutParams = LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f).apply {
+                        marginStart = (12 * dp).toInt()
+                    }
+                }
+                textCol.addView(TextView(ctx).apply {
+                    text = channel.description
+                    setTextAppearance(com.google.android.material.R.style.TextAppearance_Material3_BodyLarge)
+                })
+                textCol.addView(TextView(ctx).apply {
+                    text = channel.masked
+                    setTextAppearance(com.google.android.material.R.style.TextAppearance_Material3_BodySmall)
+                    alpha = 0.6f
+                })
+
+                val row = LinearLayout(ctx).apply {
+                    orientation = LinearLayout.HORIZONTAL
+                    gravity = Gravity.CENTER_VERTICAL
+                    val ta = ctx.obtainStyledAttributes(intArrayOf(android.R.attr.selectableItemBackground))
+                    background = ta.getDrawable(0); ta.recycle()
+                    isClickable = true; isFocusable = true
+                    val hp = (24 * dp).toInt(); val vp = (12 * dp).toInt()
+                    setPadding(hp, vp, hp, vp)
+                }
+                row.addView(iconView, LinearLayout.LayoutParams(iconSize, iconSize))
+                row.addView(textCol)
+                list.addView(row)
+            }
+
+            val d = MaterialAlertDialogBuilder(ctx)
+                .setTitle("Send verification code")
+                .setView(list)
+                .setNegativeButton(R.string.cancel) { _, _ -> if (cont.isActive) cont.resume(null) }
+                .setCancelable(false)
+                .show()
+            d.setOnCancelListener { if (cont.isActive) cont.resume(null) }
+
+            // Wire up row clicks after dialog is created so we can dismiss it first
+            val rows = list.run { (0 until childCount).map { getChildAt(it) } }
+            rows.forEachIndexed { i, row ->
+                row.setOnClickListener {
+                    d.dismiss()
+                    if (cont.isActive) cont.resume(channels[i].channel)
+                }
+            }
+        }
+
+    private suspend fun showBmlOtpInputDialog(
+        profileName: String,
+        channel: BmlOtpChannel,
+        errorMsg: String? = null
+    ): String? = suspendCancellableCoroutine { cont ->
+        val ctx = requireContext()
+        val dp = ctx.resources.displayMetrics.density
+        val input = android.widget.EditText(ctx).apply {
+            hint = "Enter OTP"
+            inputType = android.text.InputType.TYPE_CLASS_NUMBER
+            filters = arrayOf(android.text.InputFilter.LengthFilter(6))
+            setPadding((24 * dp).toInt(), (8 * dp).toInt(), (24 * dp).toInt(), (8 * dp).toInt())
+        }
+        val msg = buildString {
+            append(getString(R.string.bml_business_otp_sent, channel.description))
+            append(" (${channel.masked})")
+            if (errorMsg != null) append("\n\n$errorMsg")
+        }
+        val d = MaterialAlertDialogBuilder(ctx)
+            .setTitle("Enter verification code")
+            .setMessage(msg)
+            .setView(input)
+            .setPositiveButton(R.string.verify, null)
+            .setNegativeButton(R.string.cancel) { _, _ -> if (cont.isActive) cont.resume(null) }
+            .setCancelable(false)
+            .show()
+        d.setOnCancelListener { if (cont.isActive) cont.resume(null) }
+        d.getButton(android.app.AlertDialog.BUTTON_POSITIVE).setOnClickListener {
+            val code = input.text.toString().trim()
+            if (code.length != 6) {
+                input.error = "Enter 6 digits"
+            } else {
+                d.dismiss()
+                if (cont.isActive) cont.resume(code)
+            }
         }
     }
 

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

@@ -31,6 +31,15 @@ class SettingsSecurityFragment : Fragment() {
             )
         }
 
+        // Auto unlock on correct PIN (only for pin method)
+        if (prefs.getString("security_method", null) == "pin") {
+            binding.rowAutoUnlockPin.visibility = View.VISIBLE
+            binding.switchAutoUnlockPin.isChecked = prefs.getBoolean("auto_unlock_pin", false)
+            binding.switchAutoUnlockPin.setOnCheckedChangeListener { _, isChecked ->
+                prefs.edit().putBoolean("auto_unlock_pin", isChecked).apply()
+            }
+        }
+
         // Biometrics
         val canUseBiometrics = BiometricManager.from(requireContext())
             .canAuthenticate(BiometricManager.Authenticators.BIOMETRIC_WEAK) == BiometricManager.BIOMETRIC_SUCCESS
@@ -60,7 +69,6 @@ class SettingsSecurityFragment : Fragment() {
 
         // Auto-lock
         binding.autolockToggle.check(when (prefs.getLong("autolock_timeout", 60_000L)) {
-            0L       -> R.id.btnAutolockOff
             30_000L  -> R.id.btnAutolock30s
             180_000L -> R.id.btnAutolock3m
             300_000L -> R.id.btnAutolock5m
@@ -69,7 +77,6 @@ class SettingsSecurityFragment : Fragment() {
         binding.autolockToggle.addOnButtonCheckedListener { _, checkedId, isChecked ->
             if (!isChecked) return@addOnButtonCheckedListener
             val timeout = when (checkedId) {
-                R.id.btnAutolockOff -> 0L
                 R.id.btnAutolock30s -> 30_000L
                 R.id.btnAutolock3m  -> 180_000L
                 R.id.btnAutolock5m  -> 300_000L
@@ -79,6 +86,17 @@ 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/TransactionAdapter.kt

@@ -9,17 +9,17 @@ import android.view.ViewGroup
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import sh.sar.basedbank.api.mib.Transaction
+import sh.sar.basedbank.api.models.BankTransaction
 import sh.sar.basedbank.databinding.ItemDateHeaderBinding
 import sh.sar.basedbank.databinding.ItemLoadingFooterBinding
 import sh.sar.basedbank.databinding.ItemTransactionBinding
 
-/** Adapter for Transaction History — date-grouped, shows account name in secondary line. */
+/** Adapter for BankTransaction History — date-grouped, shows account name in secondary line. */
 class TransactionAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     private sealed class Item {
         data class DateHeader(val label: String) : Item()
-        data class Trx(val transaction: Transaction) : Item()
+        data class Trx(val transaction: BankTransaction) : Item()
     }
 
     private val displayItems = mutableListOf<Item>()
@@ -27,6 +27,13 @@ class TransactionAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     private val iconUrlCache = mutableMapOf<String, Bitmap>()
     var onImageNeeded: ((counterpartyName: String) -> Unit)? = null
     var onIconUrlNeeded: ((url: String) -> Unit)? = null
+    private var hideAmounts: Boolean = false
+
+    fun setHideAmounts(hide: Boolean) {
+        if (hideAmounts == hide) return
+        hideAmounts = hide
+        notifyDataSetChanged()
+    }
 
     fun updateImage(counterpartyName: String, bitmap: Bitmap) {
         imageCache[counterpartyName] = bitmap
@@ -60,7 +67,7 @@ class TransactionAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
         }
 
     /** Replace the full sorted transaction list and rebuild date groups. */
-    fun setTransactions(transactions: List<Transaction>) {
+    fun setTransactions(transactions: List<BankTransaction>) {
         _showLoadingFooter = false
         displayItems.clear()
         var lastDateKey = ""
@@ -107,7 +114,7 @@ class TransactionAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     inner class TransactionVH(private val b: ItemTransactionBinding) :
         RecyclerView.ViewHolder(b.root) {
-        fun bind(trx: Transaction) {
+        fun bind(trx: BankTransaction) {
             val isCredit = trx.amount >= 0
             val color = AccountHistoryAdapter.sourceColor(trx.source)
             val name = trx.counterpartyName ?: trx.description
@@ -134,23 +141,28 @@ class TransactionAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
             }
             b.tvDescription.text = trx.description
 
-            // Show account name in secondary line for Transaction History
+            // Show account name in secondary line for BankTransaction History
             b.tvCounterparty.text = trx.accountDisplayName
             b.tvCounterparty.visibility = View.VISIBLE
 
             b.tvDate.text = AccountHistoryAdapter.formatTime(trx.date)
 
-            val sign = if (isCredit) "+" else "-"
+            if (hideAmounts) {
-            val absAmt = "%.2f".format(kotlin.math.abs(trx.amount))
+                b.tvAmount.text = "${trx.currency} ••••••"
-            b.tvAmount.text = "$sign ${trx.currency} $absAmt"
+                b.tvAmount.setTextColor(Color.parseColor("#888888"))
-            b.tvAmount.setTextColor(
+            } else {
-                if (isCredit) Color.parseColor("#4CAF50") else Color.parseColor("#FF7043")
+                val sign = if (isCredit) "+" else "-"
-            )
+                val absAmt = "%.2f".format(kotlin.math.abs(trx.amount))
+                b.tvAmount.text = "$sign ${trx.currency} $absAmt"
+                b.tvAmount.setTextColor(
+                    if (isCredit) Color.parseColor("#4CAF50") else Color.parseColor("#FF7043")
+                )
+            }
 
             b.root.setOnClickListener { showDetail(trx) }
         }
 
-        private fun showDetail(trx: Transaction) {
+        private fun showDetail(trx: BankTransaction) {
             val ctx = b.root.context
             val title = trx.counterpartyName?.takeIf { it.isNotBlank() } ?: trx.description
             val details = buildString {

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

@@ -15,6 +15,8 @@ import android.widget.BaseAdapter
 import android.widget.Filter
 import android.widget.Filterable
 import android.graphics.Typeface
+import android.view.Gravity
+import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
@@ -36,12 +38,15 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import sh.sar.basedbank.BasedBankApp
 import sh.sar.basedbank.R
-import sh.sar.basedbank.api.bml.BmlLoginFlow
+import sh.sar.basedbank.api.bml.BmlAccountClient
+import sh.sar.basedbank.api.bml.BmlOtpChannel
+import sh.sar.basedbank.api.bml.BmlTransferClient
+import sh.sar.basedbank.api.bml.BmlTransferResult
+import sh.sar.basedbank.api.bml.BmlValidateClient
 import sh.sar.basedbank.api.dhiraagu.DhiraaguClient
 import sh.sar.basedbank.api.fahipay.OoredooClient
-import sh.sar.basedbank.api.bml.BmlTransferResult
+import sh.sar.basedbank.api.models.BankAccount
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankContact
-import sh.sar.basedbank.api.mib.MibBeneficiary
 import sh.sar.basedbank.api.mib.MibContactsClient
 import sh.sar.basedbank.api.mib.MibIpsAccountInfo
 import sh.sar.basedbank.api.mib.MibLookupException
@@ -65,11 +70,11 @@ class TransferFragment : Fragment() {
     private val binding get() = _binding!!
     private val viewModel: HomeViewModel by activityViewModels()
 
-    private var selectedAccount: MibAccount? = null
+    private var selectedAccount: BankAccount? = null
     private val session get() = selectedAccount
         ?.let { (requireActivity().application as BasedBankApp).mibSessionFor(it) }
         ?: (requireActivity().application as BasedBankApp).anyMibSession()
-    private fun bmlSessionFor(account: MibAccount?) =
+    private fun bmlSessionFor(account: BankAccount?) =
         account?.let { (requireActivity().application as BasedBankApp).bmlSessionFor(it) }
             ?: (requireActivity().application as BasedBankApp).anyBmlSession()
 
@@ -82,6 +87,28 @@ class TransferFragment : Fragment() {
     // Values: "FAHIPAY_TRANSFER", "RAASTAS", "OOREDOO_BILL"
     private var selectedFahipayService: String? = null
 
+    // BML business profile OTP flow state
+    private enum class BmlOtpState { NONE, SELECTING_CHANNEL, AWAITING_OTP }
+    private var bmlOtpState = BmlOtpState.NONE
+    private var bmlOtpChannel: String? = null
+
+    private data class PendingBmlTransfer(
+        val src: BankAccount,
+        val debitAccount: String,
+        val creditAccount: String,
+        val amount: Double,
+        val amountStr: String,
+        val remarks: String,
+        val transferType: String,
+        val currency: String,
+        val bank: String?,
+        val destDisplay: String,
+        val destAccount: String,
+        val toBank: String,
+        val toAvatar: Bitmap?
+    )
+    private var pendingBmlTransfer: PendingBmlTransfer? = 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
@@ -105,7 +132,7 @@ class TransferFragment : Fragment() {
         private const val ARG_AMOUNT_PREFILL = "amount_prefill"
         private const val ARG_REMARKS_PREFILL = "remarks_prefill"
 
-        fun newInstanceFrom(account: MibAccount) = TransferFragment().apply {
+        fun newInstanceFrom(account: BankAccount) = TransferFragment().apply {
             arguments = Bundle().apply { putString(ARG_FROM_ACCOUNT, account.accountNumber) }
         }
 
@@ -170,7 +197,10 @@ class TransferFragment : Fragment() {
         }
 
         binding.btnTransfer.isEnabled = false
-        binding.btnTransfer.setOnClickListener { initiateTransfer() }
+        binding.btnTransfer.setOnClickListener {
+            if (bmlOtpState == BmlOtpState.AWAITING_OTP) verifyBmlOtp()
+            else initiateTransfer()
+        }
 
         binding.etAmount.addTextChangedListener { updateTransferButton() }
 
@@ -239,7 +269,7 @@ class TransferFragment : Fragment() {
         }
     }
 
-    private fun showFromCard(account: MibAccount) {
+    private fun showFromCard(account: BankAccount) {
         val colorHex = when (account.bank) {
             "BML"     -> "#0066A1"
             "FAHIPAY" -> "#15BEA7"
@@ -284,7 +314,7 @@ class TransferFragment : Fragment() {
         }
     }
 
-    private fun updateAmountPrefix(account: MibAccount) {
+    private fun updateAmountPrefix(account: BankAccount) {
         binding.tilAmount.prefixText = if (account.currencyName == "USD") "USD " else "MVR "
     }
 
@@ -369,10 +399,9 @@ class TransferFragment : Fragment() {
             val info = withContext(Dispatchers.IO) {
                 if (isBmlSource && bmlSess != null) {
                     val inputType = AccountInputParser.detect(accountNumber)
-                    val bmlFlow = BmlLoginFlow()
                     val bmlResult = try {
-                        if (inputType == AccountInputParser.InputType.MIB_ACCOUNT) bmlFlow.verifyMibAccount(bmlSess, accountNumber)
+                        if (inputType == AccountInputParser.InputType.MIB_ACCOUNT) BmlValidateClient().verifyMibAccount(bmlSess, accountNumber)
-                        else bmlFlow.validateAccount(bmlSess, accountNumber)
+                        else BmlValidateClient().validateAccount(bmlSess, accountNumber)
                     } catch (_: Exception) { null }
                     if (bmlResult != null) {
                         val bankId = when (bmlResult.trnType) {
@@ -393,7 +422,7 @@ class TransferFragment : Fragment() {
                         catch (e: MibLookupException) { errorMsg = e.message; null }
                         catch (_: Exception) { errorMsg = getString(R.string.transfer_account_not_found); null }
                     } else {
-                        val bmlResult = try { BmlLoginFlow().validateAccount(bmlSess!!, accountNumber) } catch (_: Exception) { null }
+                        val bmlResult = try { BmlValidateClient().validateAccount(bmlSess!!, accountNumber) } catch (_: Exception) { null }
                         if (bmlResult != null) {
                             val bankId = when (bmlResult.trnType) {
                                 "IAT" -> "MALBMVMV"
@@ -602,6 +631,7 @@ class TransferFragment : Fragment() {
         val remarks = binding.etRemarks.text?.toString()?.trim() ?: ""
 
         val isSrcBml = src.bank == "BML"
+        val isBmlBusiness = isSrcBml && isBusinessProfile(src) // to test on personal accounts: use `isSrcBml`
         val isSrcCard = src.profileType == "BML_PREPAID" || src.profileType == "BML_CREDIT"
         val isDestMib = AccountInputParser.detect(resolvedAccountNumber) == AccountInputParser.InputType.MIB_ACCOUNT
         val currency = src.currencyName.ifBlank { "MVR" }
@@ -636,26 +666,34 @@ class TransferFragment : Fragment() {
         val mainMsg = "Send $currency $amountStr to $destDisplay?\n\nFrom: ${src.accountBriefName} · ${src.accountNumber}"
 
         val doTransfer: () -> Unit = {
-            binding.btnTransfer.isEnabled = false
+            if (isBmlBusiness) {
-            (activity as? HomeActivity)?.setRefreshing(true)
+                // Business profile: async OTP channel selection flow
-            viewLifecycleOwner.lifecycleScope.launch {
+                startBmlBusinessOtpFlow(
-                val (ok, msg, receipt) = withContext(Dispatchers.IO) {
+                    src, resolvedAccountNumber, destDisplay, amount, amountStr, remarks,
-                    if (!isSrcBml) {
+                    isSrcCard, isDestMib, currency, allAccounts, allContacts, capturedToAvatar
-                        doMibTransfer(src, resolvedAccountNumber, resolvedRecipientName, destDisplay, amountStr, remarks, bankNameCapture)
+                )
-                    } else {
+            } else {
-                        doBmlTransfer(src, resolvedAccountNumber, destDisplay, amount, amountStr, remarks, isSrcCard, isDestMib, currency, allAccounts, allContacts)
+                binding.btnTransfer.isEnabled = false
+                (activity as? HomeActivity)?.setRefreshing(true)
+                viewLifecycleOwner.lifecycleScope.launch {
+                    val (ok, msg, receipt) = withContext(Dispatchers.IO) {
+                        if (!isSrcBml) {
+                            doMibTransfer(src, resolvedAccountNumber, resolvedRecipientName, destDisplay, amountStr, remarks, bankNameCapture)
+                        } else {
+                            doBmlTransfer(src, resolvedAccountNumber, destDisplay, amount, amountStr, remarks, isSrcCard, isDestMib, currency, allAccounts, allContacts)
+                        }
+                    }
+                    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()
+                        activity.showWithBackStack(TransferReceiptFragment.newInstance(receipt, capturedToAvatar))
+                    } else if (!ok) {
+                        Toast.makeText(requireContext(), msg, Toast.LENGTH_LONG).show()
                     }
-                }
-                binding.btnTransfer.isEnabled = true
-                (activity as? HomeActivity)?.setRefreshing(false)
-                if (ok && receipt != null) {
-                    ReceiptStore.save(requireContext(), receipt)
-                    clearForm()
-                    val activity = requireActivity() as HomeActivity
-                    activity.refreshBalances(src)
-                    activity.showWithBackStack(TransferReceiptFragment.newInstance(receipt, capturedToAvatar))
-                } else if (!ok) {
-                    Toast.makeText(requireContext(), msg, Toast.LENGTH_LONG).show()
                 }
             }
         }
@@ -731,7 +769,7 @@ class TransferFragment : Fragment() {
     }
 
     private fun doMibTransfer(
-        src: MibAccount,
+        src: BankAccount,
         destAccount: String,
         destName: String,
         destDisplay: String,
@@ -790,7 +828,7 @@ class TransferFragment : Fragment() {
                     mibReferenceNo = result.trxId,
                     mibTransactionDate = result.date
                 )
-                Triple(true, "Transaction ID: ${result.trxId}\n${result.date}", receipt)
+                Triple(true, "BankTransaction ID: ${result.trxId}\n${result.date}", receipt)
             } else {
                 Triple(false, result.errorMessage.ifBlank { "Transfer failed" }, null)
             }
@@ -800,7 +838,7 @@ class TransferFragment : Fragment() {
     }
 
     private fun doBmlTransfer(
-        src: MibAccount,
+        src: BankAccount,
         destAccount: String,
         destDisplay: String,
         amount: Double,
@@ -809,8 +847,8 @@ class TransferFragment : Fragment() {
         isSrcCard: Boolean,
         isDestMib: Boolean,
         currency: String,
-        allAccounts: List<MibAccount>,
+        allAccounts: List<BankAccount>,
-        allContacts: List<MibBeneficiary>
+        allContacts: List<BankContact>
     ): Triple<Boolean, String, TransferReceiptData?> {
         val loginId = src.loginTag.removePrefix("bml_")
         val sess = bmlSessionFor(src) ?: return Triple(false, getString(R.string.transfer_session_unavailable), null)
@@ -845,10 +883,9 @@ class TransferFragment : Fragment() {
         }
         val toBank = bank ?: if (isDestMib) "MIB" else "BML"
 
-        val bmlFlow = BmlLoginFlow()
         // Step 1: initiate
         val initiated = try {
-            bmlFlow.initiateTransfer(sess, debitAccount, creditAccount, amount, transferType, currency, bank)
+            BmlTransferClient().initiateTransfer(sess, debitAccount, creditAccount, amount, transferType, currency, bank)
         } catch (e: Exception) { return Triple(false, e.message ?: "Initiation failed", null) }
 
         if (!initiated) return Triple(false, "Failed to initiate transfer — check your session", null)
@@ -858,7 +895,7 @@ class TransferFragment : Fragment() {
             ?.let { Totp.generate(it) } ?: otp
 
         return try {
-            val result = bmlFlow.confirmTransfer(sess, debitAccount, creditAccount, amount, transferType, currency, confirmOtp, remarks, bank)
+            val result = BmlTransferClient().confirmTransfer(sess, debitAccount, creditAccount, amount, transferType, currency, confirmOtp, remarks, bank)
             if (result.success) {
                 val receipt = TransferReceiptData(
                     bank = "BML",
@@ -885,12 +922,303 @@ class TransferFragment : Fragment() {
         }
     }
 
+    // ── BML business profile OTP flow ─────────────────────────────────────────
+
+    private fun isBusinessProfile(account: BankAccount): Boolean {
+        val app = requireActivity().application as BasedBankApp
+        val loginId = account.loginTag.removePrefix("bml_")
+        val profiles = app.bmlProfilesMap[loginId] ?: return false
+        return profiles.firstOrNull { it.profileId == account.profileId }?.profileType == "business"
+    }
+
+    private fun startBmlBusinessOtpFlow(
+        src: BankAccount,
+        destAccount: String,
+        destDisplay: String,
+        amount: Double,
+        amountStr: String,
+        remarks: String,
+        isSrcCard: Boolean,
+        isDestMib: Boolean,
+        currency: String,
+        allAccounts: List<BankAccount>,
+        allContacts: List<BankContact>,
+        toAvatar: Bitmap?
+    ) {
+        val debitAccount = src.internalId.ifBlank {
+            Toast.makeText(requireContext(), getString(R.string.transfer_missing_internal_id), Toast.LENGTH_SHORT).show()
+            return
+        }
+        val isDestMyCard = allAccounts.any {
+            (it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT") && it.accountNumber == destAccount
+        }
+        val (transferType, creditAccount, bank) = when {
+            isSrcCard -> {
+                val destBml = allAccounts.firstOrNull { it.accountNumber == destAccount && it.profileType == "BML" }
+                Triple("CAD", destBml?.internalId?.ifBlank { destAccount } ?: destAccount, null as String?)
+            }
+            isDestMyCard -> {
+                val card = allAccounts.first {
+                    (it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT") && it.accountNumber == destAccount
+                }
+                Triple("CPA", card.internalId.ifBlank { destAccount }, null as String?)
+            }
+            isDestMib && currency == "MVR" -> Triple("DOT", destAccount, "MIB")
+            isDestMib -> {
+                val contact = allContacts.firstOrNull { it.benefCategoryId == "BML" && it.benefAccount == destAccount }
+                if (contact == null) {
+                    Toast.makeText(requireContext(), "BML contact not found for this account", Toast.LENGTH_SHORT).show()
+                    return
+                }
+                Triple("DOT", contact.benefNo.removePrefix("bml_"), null as String?)
+            }
+            else -> Triple("IAT", destAccount, null as String?)
+        }
+        val toBank = bank ?: if (isDestMib) "MIB" else "BML"
+
+        pendingBmlTransfer = PendingBmlTransfer(
+            src          = src,
+            debitAccount  = debitAccount,
+            creditAccount = creditAccount,
+            amount        = amount,
+            amountStr     = amountStr,
+            remarks       = remarks,
+            transferType  = transferType,
+            currency      = currency,
+            bank          = bank,
+            destDisplay   = destDisplay,
+            destAccount   = destAccount,
+            toBank        = toBank,
+            toAvatar      = toAvatar
+        )
+
+        bmlOtpState = BmlOtpState.SELECTING_CHANNEL
+        binding.btnTransfer.isEnabled = false
+        (activity as? HomeActivity)?.setRefreshing(true)
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            val sess = bmlSessionFor(src)
+            val channels = if (sess != null) {
+                withContext(Dispatchers.IO) {
+                    try { BmlAccountClient().fetchTransferChannels(sess) }
+                    catch (_: Exception) { emptyList() }
+                }
+            } else emptyList<BmlOtpChannel>()
+
+            (activity as? HomeActivity)?.setRefreshing(false)
+
+            if (channels.isEmpty()) {
+                Toast.makeText(requireContext(), "Could not load OTP channels", Toast.LENGTH_SHORT).show()
+                resetBmlOtpState()
+                updateTransferButton()
+                return@launch
+            }
+
+            showBmlChannelSelection(channels)
+        }
+    }
+
+    private fun showBmlChannelSelection(channels: List<BmlOtpChannel>) {
+        val ctx = requireContext()
+        val dp = ctx.resources.displayMetrics.density
+        binding.containerBmlChannels.removeAllViews()
+
+        for (channel in channels) {
+            val iconRes = when (channel.channel) {
+                "email"  -> R.drawable.ic_channel_email
+                "mobile" -> R.drawable.ic_channel_sms
+                else     -> R.drawable.ic_channel_sms
+            }
+            val iconSize = (24 * dp).toInt()
+
+            val textCol = LinearLayout(ctx).apply {
+                orientation = LinearLayout.VERTICAL
+                gravity = Gravity.CENTER_VERTICAL
+                layoutParams = LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f).apply {
+                    marginStart = (12 * dp).toInt()
+                }
+            }
+            textCol.addView(TextView(ctx).apply {
+                text = channel.description
+                setTextAppearance(com.google.android.material.R.style.TextAppearance_Material3_BodyLarge)
+            })
+            textCol.addView(TextView(ctx).apply {
+                text = channel.masked
+                setTextAppearance(com.google.android.material.R.style.TextAppearance_Material3_BodySmall)
+                alpha = 0.6f
+            })
+
+            val row = LinearLayout(ctx).apply {
+                orientation = LinearLayout.HORIZONTAL
+                gravity = Gravity.CENTER_VERTICAL
+                val ta = ctx.obtainStyledAttributes(intArrayOf(android.R.attr.selectableItemBackground))
+                background = ta.getDrawable(0); ta.recycle()
+                isClickable = true; isFocusable = true
+                val hp = (16 * dp).toInt(); val vp = (12 * dp).toInt()
+                setPadding(hp, vp, hp, vp)
+            }
+            row.addView(ImageView(ctx).apply { setImageResource(iconRes) },
+                LinearLayout.LayoutParams(iconSize, iconSize))
+            row.addView(textCol)
+            row.setOnClickListener { selectBmlOtpChannel(channel) }
+            binding.containerBmlChannels.addView(row)
+        }
+
+        disableTransferFields()
+        binding.layoutBmlChannelSelection.visibility = View.VISIBLE
+    }
+
+    private fun selectBmlOtpChannel(channel: BmlOtpChannel) {
+        bmlOtpChannel = channel.channel
+        binding.layoutBmlChannelSelection.visibility = View.GONE
+
+        val pending = pendingBmlTransfer ?: return
+        val sess = bmlSessionFor(pending.src) ?: run {
+            Toast.makeText(requireContext(), getString(R.string.transfer_session_unavailable), Toast.LENGTH_SHORT).show()
+            resetBmlOtpState()
+            updateTransferButton()
+            return
+        }
+
+        binding.btnTransfer.isEnabled = false
+        (activity as? HomeActivity)?.setRefreshing(true)
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            val initiated = withContext(Dispatchers.IO) {
+                try {
+                    BmlTransferClient().initiateTransfer(
+                        sess, pending.debitAccount, pending.creditAccount,
+                        pending.amount, pending.transferType, pending.currency,
+                        pending.bank, channel.channel
+                    )
+                } catch (_: Exception) { false }
+            }
+            (activity as? HomeActivity)?.setRefreshing(false)
+
+            if (!initiated) {
+                Toast.makeText(requireContext(), "Failed to initiate transfer — check your session", Toast.LENGTH_SHORT).show()
+                resetBmlOtpState()
+                updateTransferButton()
+                return@launch
+            }
+
+            bmlOtpState = BmlOtpState.AWAITING_OTP
+            binding.tvBmlOtpSentVia.text = "OTP code sent via: ${channel.description} (${channel.masked})"
+            binding.tvBmlOtpSentVia.visibility = View.VISIBLE
+            binding.tilBmlOtp.visibility = View.VISIBLE
+            binding.etBmlOtp.requestFocus()
+            binding.btnTransfer.text = getString(R.string.transfer_verify_payment)
+            binding.btnTransfer.isEnabled = true
+        }
+    }
+
+    private fun verifyBmlOtp() {
+        val otp = binding.etBmlOtp.text?.toString()?.trim() ?: ""
+        if (otp.isEmpty()) {
+            binding.tilBmlOtp.error = "Enter the verification code"
+            return
+        }
+        binding.tilBmlOtp.error = null
+        val pending = pendingBmlTransfer ?: return
+        val channel = bmlOtpChannel ?: return
+        val sess = bmlSessionFor(pending.src) ?: run {
+            Toast.makeText(requireContext(), getString(R.string.transfer_session_unavailable), Toast.LENGTH_SHORT).show()
+            return
+        }
+
+        binding.btnTransfer.isEnabled = false
+        (activity as? HomeActivity)?.setRefreshing(true)
+
+        val capturedToAvatar = pending.toAvatar
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            val (ok, msg, receipt) = withContext(Dispatchers.IO) {
+                try {
+                    val result = BmlTransferClient().confirmTransfer(
+                        sess, pending.debitAccount, pending.creditAccount,
+                        pending.amount, pending.transferType, pending.currency,
+                        otp, pending.remarks, pending.bank, channel
+                    )
+                    if (result.success) {
+                        val r = TransferReceiptData(
+                            bank         = "BML",
+                            amount       = "%.2f".format(pending.amount),
+                            currency     = pending.currency,
+                            fromLabel    = pending.src.accountBriefName,
+                            fromColorHex = "#0066A1",
+                            toLabel      = pending.destDisplay.ifBlank { pending.destAccount },
+                            toAccount    = pending.destAccount,
+                            toBank       = pending.toBank,
+                            remarks      = pending.remarks,
+                            bmlFromName  = pending.src.accountBriefName,
+                            bmlReference = result.reference,
+                            bmlTimestamp = result.timestamp,
+                            bmlMessage   = result.message
+                        )
+                        Triple(true, "", r)
+                    } else {
+                        Triple(false, result.errorMessage.ifBlank { "Transfer failed" }, null as TransferReceiptData?)
+                    }
+                } catch (e: Exception) {
+                    Triple(false, e.message ?: "Transfer failed", null as TransferReceiptData?)
+                }
+            }
+            (activity as? HomeActivity)?.setRefreshing(false)
+
+            if (ok && receipt != null) {
+                ReceiptStore.save(requireContext(), receipt)
+                resetBmlOtpState()
+                clearForm()
+                val activity = requireActivity() as HomeActivity
+                activity.triggerRefresh()
+                activity.showWithBackStack(TransferReceiptFragment.newInstance(receipt, capturedToAvatar))
+            } else {
+                binding.btnTransfer.isEnabled = true
+                binding.tilBmlOtp.error = msg
+            }
+        }
+    }
+
+    private fun disableTransferFields() {
+        binding.tilAmount.isEnabled = false
+        binding.tilRemarks.isEnabled = false
+        binding.cardFromInfo.alpha = 0.5f
+        binding.btnClearFromInfo.isEnabled = false
+        binding.cardToInfo.alpha = 0.5f
+        binding.btnClearToInfo.isEnabled = false
+    }
+
+    private fun enableTransferFields() {
+        binding.tilAmount.isEnabled = true
+        binding.tilRemarks.isEnabled = true
+        binding.cardFromInfo.alpha = 1f
+        binding.btnClearFromInfo.isEnabled = true
+        binding.cardToInfo.alpha = 1f
+        binding.btnClearToInfo.isEnabled = true
+    }
+
+    private fun resetBmlOtpState() {
+        bmlOtpState = BmlOtpState.NONE
+        bmlOtpChannel = null
+        pendingBmlTransfer = null
+        val b = _binding ?: return
+        b.layoutBmlChannelSelection.visibility = View.GONE
+        b.tvBmlOtpSentVia.visibility = View.GONE
+        b.tilBmlOtp.visibility = View.GONE
+        b.etBmlOtp.setText("")
+        b.tilBmlOtp.error = null
+        enableTransferFields()
+        b.btnTransfer.text = getString(R.string.transfer)
+    }
+
     private fun updateTransferButton() {
+        if (bmlOtpState != BmlOtpState.NONE) return
         val amount = binding.etAmount.text?.toString()?.trim()?.toDoubleOrNull() ?: 0.0
         binding.btnTransfer.isEnabled = selectedAccount != null && resolvedAccountNumber.isNotBlank() && amount > 0
     }
 
     private fun clearForm() {
+        resetBmlOtpState()
         selectedAccount = null
         binding.actvFrom.setText("", false)
         binding.cardFromInfo.visibility = View.GONE
@@ -1000,16 +1328,16 @@ class TransferFragment : Fragment() {
         _binding = null
     }
 
-    private fun MibAccount.toDisplayString() = "$accountBriefName · $accountNumber"
+    private fun BankAccount.toDisplayString() = "$accountBriefName · $accountNumber"
 
-    // items: String = section header, MibAccount = selectable row
+    // items: String = section header, BankAccount = selectable row
     private inner class AccountDropdownAdapter(
         private val context: Context,
-        accounts: List<MibAccount>
+        accounts: List<BankAccount>
     ) : BaseAdapter(), Filterable {
 
         private val items: List<Any> = buildList {
-            val regular = accounts.filter { it.profileType != "BML_PREPAID" && it.profileType != "BML_CREDIT" }
+            val regular = accounts.filter { it.profileType != "BML_PREPAID" && it.profileType != "BML_CREDIT" && it.profileType != "BML_LOAN" }
             val cards = accounts.filter { it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT" }
             addAll(regular)
             if (cards.isNotEmpty()) {
@@ -1018,7 +1346,7 @@ class TransferFragment : Fragment() {
             }
         }
 
-        fun getAccount(position: Int): MibAccount? = (items.getOrNull(position) as? MibAccount)
+        fun getAccount(position: Int): BankAccount? = (items.getOrNull(position) as? BankAccount)
             ?.takeUnless { (it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT") && !it.statusDesc.equals("Active", ignoreCase = true) }
 
         override fun getCount() = items.size
@@ -1043,7 +1371,7 @@ class TransferFragment : Fragment() {
                 b.tvHeader.text = item
                 b.root
             } else {
-                val acc = item as MibAccount
+                val acc = item as BankAccount
                 val b = if (convertView?.tag is ItemAccountDropdownBinding) {
                     convertView.tag as ItemAccountDropdownBinding
                 } else {

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

@@ -25,12 +25,12 @@ import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import sh.sar.basedbank.BasedBankApp
 import sh.sar.basedbank.R
-import sh.sar.basedbank.api.bml.BmlLoginFlow
+import sh.sar.basedbank.api.bml.BmlHistoryClient
-import sh.sar.basedbank.api.fahipay.FahipayLoginFlow
+import sh.sar.basedbank.api.fahipay.FahipayHistoryClient
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.api.mib.MibContactsClient
 import sh.sar.basedbank.api.mib.MibHistoryClient
-import sh.sar.basedbank.api.mib.Transaction
+import sh.sar.basedbank.api.models.BankTransaction
 import sh.sar.basedbank.api.mib.TransactionCache
 import sh.sar.basedbank.databinding.FragmentTransferHistoryBinding
 import sh.sar.basedbank.util.ContactImageCache
@@ -48,12 +48,12 @@ class TransferHistoryFragment : Fragment() {
     private lateinit var adapter: TransactionAdapter
 
     // All merged transactions sorted by date desc
-    private val allTransactions = mutableListOf<Transaction>()
+    private val allTransactions = mutableListOf<BankTransaction>()
     private var searchQuery = ""
 
     // Per-account pagination state
     private data class AccountState(
-        val account: MibAccount,
+        val account: BankAccount,
         var mibNextStart: Int = 1,
         var mibTotalCount: Int = -1,
         var bmlNextPage: Int = 1,
@@ -86,6 +86,8 @@ class TransferHistoryFragment : Fragment() {
         adapter = TransactionAdapter()
         adapter.onImageNeeded = { name -> loadContactImage(name) }
         adapter.onIconUrlNeeded = { url -> loadMerchantIcon(url) }
+        adapter.setHideAmounts(viewModel.hideAmounts.value ?: false)
+        viewModel.hideAmounts.observe(viewLifecycleOwner) { adapter.setHideAmounts(it) }
         binding.recyclerView.layoutManager = LinearLayoutManager(requireContext())
         binding.recyclerView.adapter = adapter
 
@@ -136,6 +138,14 @@ class TransferHistoryFragment : Fragment() {
         }
         (activity as? HomeActivity)?.setRefreshing(true)
         loadNextPages()
+
+        binding.swipeRefresh.setOnRefreshListener {
+            if (isLoading) {
+                binding.swipeRefresh.isRefreshing = false
+            } else {
+                resetAndReload()
+            }
+        }
     }
 
     override fun onResume() {
@@ -143,6 +153,19 @@ class TransferHistoryFragment : Fragment() {
         requireActivity().title = getString(R.string.nav_transfer_history)
     }
 
+    private fun resetAndReload() {
+        allTransactions.clear()
+        pendingImageNames.clear()
+        pendingIconUrls.clear()
+        firstBatchDone = false
+        val accounts = accountStates.map { it.account }
+        accountStates.clear()
+        accounts.forEach { accountStates.add(AccountState(it)) }
+        adapter.setTransactions(emptyList())
+        binding.emptyView.visibility = View.GONE
+        loadNextPages()
+    }
+
     private fun loadNextPages() {
         val activeStates = accountStates.filter { it.hasMore() }
         if (isLoading || activeStates.isEmpty()) return
@@ -156,7 +179,7 @@ class TransferHistoryFragment : Fragment() {
 
         lifecycleScope.launch {
             val newTransactions = withContext(Dispatchers.IO) {
-                val results = mutableListOf<Transaction>()
+                val results = mutableListOf<BankTransaction>()
 
                 // BML accounts: fetch in parallel
                 val bmlStates = activeStates.filter { it.account.bank == "BML" }
@@ -170,7 +193,7 @@ class TransferHistoryFragment : Fragment() {
                                     cal.add(Calendar.MONTH, -state.cardMonthOffset)
                                     val month = SimpleDateFormat("yyyyMM", Locale.US).format(cal.time)
                                     state.cardMonthOffset++
-                                    BmlLoginFlow().fetchCardHistory(
+                                    BmlHistoryClient().fetchCardHistory(
                                         session = session,
                                         cardId = state.account.internalId,
                                         accountDisplayName = state.account.accountBriefName,
@@ -180,7 +203,7 @@ class TransferHistoryFragment : Fragment() {
                                 }
                                 else -> {
                                     val session = app.bmlSessionFor(state.account) ?: return@async emptyList()
-                                    val (list, totalPages) = BmlLoginFlow().fetchAccountHistory(
+                                    val (list, totalPages) = BmlHistoryClient().fetchAccountHistory(
                                         session = session,
                                         accountId = state.account.internalId,
                                         accountDisplayName = state.account.accountBriefName,
@@ -192,7 +215,7 @@ class TransferHistoryFragment : Fragment() {
                                     list
                                 }
                             }
-                        } catch (_: Exception) { emptyList<Transaction>() }
+                        } catch (_: Exception) { emptyList<BankTransaction>() }
                     }
                 }.awaitAll().flatten())
 
@@ -201,9 +224,7 @@ class TransferHistoryFragment : Fragment() {
                 for (state in fahipayStates) {
                     val session = app.fahipaySessionFor(state.account) ?: continue
                     try {
-                        val flow = FahipayLoginFlow()
+                        val (list, total) = FahipayHistoryClient().fetchHistory(
-                        flow.setSessionCookie(session.sessionCookie)
-                        val (list, total) = flow.fetchHistory(
                             session = session,
                             accountDisplayName = state.account.accountBriefName,
                             accountNumber = state.account.accountNumber,
@@ -250,6 +271,7 @@ class TransferHistoryFragment : Fragment() {
             if (!firstBatchDone) {
                 firstBatchDone = true
                 (activity as? HomeActivity)?.setRefreshing(false)
+                binding.swipeRefresh.isRefreshing = false
             }
 
             if (newTransactions.isNotEmpty()) {

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

@@ -330,36 +330,48 @@ class TransferReceiptFragment : Fragment() {
     }
 
     private fun showFullScreenReceipt() {
-        captureReceiptBitmap { bitmap ->
+        val ctx = requireContext()
-            if (bitmap == null) return@captureReceiptBitmap
+        val bank = arguments?.getString(ARG_BANK, "MIB") ?: "MIB"
-            val ctx = requireContext()
+        val dialog = Dialog(ctx, android.R.style.Theme_Black_NoTitleBar_Fullscreen)
-            val dialog = Dialog(ctx, android.R.style.Theme_Black_NoTitleBar_Fullscreen)
+
-            val iv = android.widget.ImageView(ctx).apply {
+        val scrollView = android.widget.ScrollView(ctx).apply {
-                setImageBitmap(bitmap)
+            setBackgroundColor(Color.BLACK)
-                scaleType = android.widget.ImageView.ScaleType.FIT_CENTER
+        }
-                setBackgroundColor(Color.BLACK)
+
-            }
+        val cardView = if (bank == "MIB") {
-            iv.setOnClickListener { dialog.dismiss() }
+            val binding = FragmentReceiptMibBinding.inflate(layoutInflater)
-            dialog.setContentView(iv)
+            bindMib(binding)
-            val actWin = requireActivity().window
+            binding.receiptCard
-            val prevColor = actWin.statusBarColor
+        } else {
-            val insetsCtrl = androidx.core.view.WindowInsetsControllerCompat(actWin, actWin.decorView)
+            val binding = FragmentReceiptBmlBinding.inflate(layoutInflater)
-            actWin.statusBarColor = Color.BLACK
+            bindBml(binding)
-            insetsCtrl.isAppearanceLightStatusBars = false
+            binding.receiptCard
-            dialog.setOnDismissListener {
+        }
-                actWin.statusBarColor = prevColor
+        (cardView.parent as? ViewGroup)?.removeView(cardView)
-                val isLight = (resources.configuration.uiMode and
+        cardView.setOnClickListener { dialog.dismiss() }
-                        android.content.res.Configuration.UI_MODE_NIGHT_MASK) ==
+        scrollView.addView(cardView)
-                        android.content.res.Configuration.UI_MODE_NIGHT_NO
+        scrollView.setOnTouchListener { _, _ -> dialog.dismiss(); true }
-                insetsCtrl.isAppearanceLightStatusBars = isLight
+
-            }
+        dialog.setContentView(scrollView)
-            dialog.show()
+
-            dialog.window?.let { win ->
+        val actWin = requireActivity().window
-                androidx.core.view.WindowCompat.setDecorFitsSystemWindows(win, false)
+        val prevColor = actWin.statusBarColor
-                androidx.core.view.WindowInsetsControllerCompat(win, iv).apply {
+        val insetsCtrl = androidx.core.view.WindowInsetsControllerCompat(actWin, actWin.decorView)
-                    hide(androidx.core.view.WindowInsetsCompat.Type.systemBars())
+        actWin.statusBarColor = Color.BLACK
-                    systemBarsBehavior = androidx.core.view.WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+        insetsCtrl.isAppearanceLightStatusBars = false
-                }
+        dialog.setOnDismissListener {
+            actWin.statusBarColor = prevColor
+            val isLight = (resources.configuration.uiMode and
+                    android.content.res.Configuration.UI_MODE_NIGHT_MASK) ==
+                    android.content.res.Configuration.UI_MODE_NIGHT_NO
+            insetsCtrl.isAppearanceLightStatusBars = isLight
+        }
+        dialog.show()
+        dialog.window?.let { win ->
+            androidx.core.view.WindowCompat.setDecorFitsSystemWindows(win, false)
+            androidx.core.view.WindowInsetsControllerCompat(win, scrollView).apply {
+                hide(androidx.core.view.WindowInsetsCompat.Type.systemBars())
+                systemBarsBehavior = androidx.core.view.WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
             }
         }
     }

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

@@ -18,21 +18,20 @@ import kotlinx.coroutines.withContext
 import sh.sar.basedbank.util.Totp
 import sh.sar.basedbank.BasedBankApp
 import sh.sar.basedbank.R
+import sh.sar.basedbank.api.bml.BmlAccountClient
 import sh.sar.basedbank.api.bml.BmlActivationResult
 import sh.sar.basedbank.api.bml.BmlLoginFlow
-import sh.sar.basedbank.api.bml.BmlOtpChannel
+import sh.sar.basedbank.api.fahipay.FahipayAccountClient
-import sh.sar.basedbank.api.bml.BmlProfile
 import sh.sar.basedbank.api.fahipay.FahipayLoginFlow
 import sh.sar.basedbank.api.fahipay.FahipaySession
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.api.mib.MibLoginFlow
+import sh.sar.basedbank.api.mib.MibProfileClient
 import sh.sar.basedbank.util.AccountCache
 import sh.sar.basedbank.util.CredentialStore
 import sh.sar.basedbank.databinding.FragmentCredentialsBinding
 import sh.sar.basedbank.ui.home.HomeActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlin.coroutines.resume
-import kotlinx.coroutines.suspendCancellableCoroutine
 
 class CredentialsFragment : Fragment() {
 
@@ -56,11 +55,7 @@ class CredentialsFragment : Fragment() {
     // BML multi-profile state
     private var bmlFlow: BmlLoginFlow? = null
     private var bmlLoginId: String = ""
-    private var bmlAccumulatedAccounts = mutableListOf<MibAccount>()
+    private var bmlAccumulatedAccounts = mutableListOf<BankAccount>()
-    private var bmlPendingBusinessProfiles = ArrayDeque<Pair<BmlProfile, List<BmlOtpChannel>>>()
-    private var bmlCurrentBusinessProfile: BmlProfile? = null
-    private var bmlSelectedChannel: String? = null
-    private var bmlAwaitingBusinessOtp = false
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         _binding = FragmentCredentialsBinding.inflate(inflater, container, false)
@@ -167,11 +162,7 @@ class CredentialsFragment : Fragment() {
 
     private fun attemptLogin() {
         when (bankType) {
-            "BML" -> {
+            "BML" -> { attemptBmlLogin(); return }
-                if (bmlAwaitingBusinessOtp) submitBmlBusinessOtp()
-                else attemptBmlLogin()
-                return
-            }
             "FAHIPAY" -> { attemptFahipayLogin(); return }
         }
 
@@ -202,7 +193,7 @@ class CredentialsFragment : Fragment() {
                 store.saveMibCredentials(loginId, username, passwordHash, otpSeed)
                 withContext(Dispatchers.IO) {
                     flow.lastSession?.let { s ->
-                        val profile = flow.fetchPersonalProfile(s)
+                        val profile = MibProfileClient().fetchPersonalProfile(s)
                         if (profile != null) store.saveMibUserProfile(
                             loginId,
                             CredentialStore.MibUserProfile(
@@ -254,10 +245,6 @@ class CredentialsFragment : Fragment() {
 
         bmlLoginId = username
         bmlAccumulatedAccounts.clear()
-        bmlPendingBusinessProfiles.clear()
-        bmlCurrentBusinessProfile = null
-        bmlSelectedChannel = null
-        bmlAwaitingBusinessOtp = false
 
         val flow = BmlLoginFlow().also { bmlFlow = it }
         val loginTag = "bml_$username"
@@ -269,24 +256,26 @@ class CredentialsFragment : Fragment() {
                 }
                 if (profiles.isEmpty()) throw Exception("No profiles found for this account")
 
-                // Activate each profile; personal profiles are immediate, business ones need OTP
+                var hasBusinessProfiles = false
                 for (profile in profiles) {
+                    if (profile.profileType == "business") {
+                        hasBusinessProfiles = true
+                        continue  // skip — user can enable in Settings → Logins
+                    }
                     val result = withContext(Dispatchers.IO) { flow.activateProfile(profile, loginTag) }
-                    when (result) {
+                    if (result is BmlActivationResult.Success) {
-                        is BmlActivationResult.Success -> {
+                        bmlAccumulatedAccounts += result.accounts
-                            bmlAccumulatedAccounts += result.accounts
+                        val store = CredentialStore(requireContext())
-                            val store = CredentialStore(requireContext())
+                        store.saveBmlProfileSession(profile.profileId, result.session.accessToken, result.session.deviceId)
-                            store.saveBmlProfileSession(profile.profileId, result.session.accessToken, result.session.deviceId)
+                        if (result.session.refreshToken.isNotBlank())
-                            val app = requireActivity().application as BasedBankApp
+                            store.saveBmlProfileRefreshToken(profile.profileId, result.session.refreshToken)
-                            app.bmlSessions[profile.profileId] = result.session
+                        if (result.session.expiresAt > 0)
-                        }
+                            store.saveBmlProfileExpiresAt(profile.profileId, result.session.expiresAt)
-                        is BmlActivationResult.NeedsBusinessOtp -> {
+                        val app = requireActivity().application as BasedBankApp
-                            bmlPendingBusinessProfiles.addLast(Pair(profile, result.channels))
+                        app.bmlSessions[profile.profileId] = result.session
-                        }
                     }
                 }
 
-                // Save credentials and profile list now (before business OTP prompts)
                 val store = CredentialStore(requireContext())
                 store.saveBmlCredentials(bmlLoginId, username, password, otpSeed)
                 store.saveBmlProfiles(bmlLoginId, profiles)
@@ -297,11 +286,7 @@ class CredentialsFragment : Fragment() {
                 binding.progressBar.visibility = View.GONE
                 binding.btnLogin.isEnabled = true
 
-                if (bmlPendingBusinessProfiles.isNotEmpty()) {
+                finishBmlLogin(hasBusinessProfiles)
-                    processNextBmlBusinessProfile()
-                } else {
-                    finishBmlLogin()
-                }
             } catch (e: Exception) {
                 binding.tvError.text = e.message ?: "Login failed"
                 binding.tvError.visibility = View.VISIBLE
@@ -311,115 +296,7 @@ class CredentialsFragment : Fragment() {
         }
     }
 
-    private suspend fun processNextBmlBusinessProfile() {
+    private suspend fun finishBmlLogin(hasBusinessProfiles: Boolean = false) {
-        val (profile, channels) = bmlPendingBusinessProfiles.removeFirstOrNull()
-            ?: run { finishBmlLogin(); return }
-
-        bmlCurrentBusinessProfile = profile
-
-        // Show channel selection dialog
-        val selectedChannel = showBmlChannelDialog(profile.name, channels) ?: run {
-            // User skipped this profile — move on
-            processNextBmlBusinessProfile()
-            return
-        }
-        bmlSelectedChannel = selectedChannel
-
-        // Request OTP
-        binding.progressBar.visibility = View.VISIBLE
-        binding.btnLogin.isEnabled = false
-        try {
-            withContext(Dispatchers.IO) {
-                bmlFlow!!.requestBusinessOtp(selectedChannel)
-            }
-        } catch (e: Exception) {
-            binding.progressBar.visibility = View.GONE
-            binding.btnLogin.isEnabled = true
-            binding.tvError.text = e.message ?: "Failed to send OTP"
-            binding.tvError.visibility = View.VISIBLE
-            processNextBmlBusinessProfile()
-            return
-        }
-
-        // Show OTP input — disable credential fields (same pattern as Fahipay TOTP step)
-        bmlAwaitingBusinessOtp = true
-        binding.etUsername.isEnabled = false
-        binding.etPassword.isEnabled = false
-        binding.etOtpSeed.isEnabled = false
-        binding.progressBar.visibility = View.GONE
-        binding.tilTotpCode.hint = getString(R.string.bml_business_otp_hint, profile.name)
-        binding.tilTotpCode.helperText = getString(R.string.bml_business_otp_sent, selectedChannel)
-        binding.tilTotpCode.visibility = View.VISIBLE
-        binding.etTotpCode.text?.clear()
-        binding.btnLogin.text = getString(R.string.verify)
-        binding.btnLogin.isEnabled = true
-        binding.tvError.visibility = View.GONE
-    }
-
-    private fun submitBmlBusinessOtp() {
-        val code = binding.etTotpCode.text.toString().trim()
-        if (code.length != 6) {
-            binding.tvError.text = getString(R.string.fahipay_totp_hint)
-            binding.tvError.visibility = View.VISIBLE
-            return
-        }
-
-        binding.tvError.visibility = View.GONE
-        binding.progressBar.visibility = View.VISIBLE
-        binding.btnLogin.isEnabled = false
-
-        val profile = bmlCurrentBusinessProfile ?: return
-        val channel = bmlSelectedChannel ?: return
-        val loginTag = "bml_$bmlLoginId"
-
-        viewLifecycleOwner.lifecycleScope.launch {
-            try {
-                val (session, accounts) = withContext(Dispatchers.IO) {
-                    bmlFlow!!.submitBusinessOtp(channel, code, profile, loginTag)
-                }
-                bmlAccumulatedAccounts += accounts
-                val store = CredentialStore(requireContext())
-                store.saveBmlProfileSession(profile.profileId, session.accessToken, session.deviceId)
-                val app = requireActivity().application as BasedBankApp
-                app.bmlSessions[profile.profileId] = session
-
-                bmlAwaitingBusinessOtp = false
-                binding.tilTotpCode.visibility = View.GONE
-                binding.btnLogin.text = getString(R.string.login)
-
-                binding.progressBar.visibility = View.GONE
-                binding.btnLogin.isEnabled = true
-
-                if (bmlPendingBusinessProfiles.isNotEmpty()) {
-                    processNextBmlBusinessProfile()
-                } else {
-                    finishBmlLogin()
-                }
-            } catch (e: Exception) {
-                binding.tvError.text = e.message ?: "OTP verification failed"
-                binding.tvError.visibility = View.VISIBLE
-                binding.progressBar.visibility = View.GONE
-                binding.btnLogin.isEnabled = true
-            }
-        }
-    }
-
-    private suspend fun showBmlChannelDialog(profileName: String, channels: List<BmlOtpChannel>): String? =
-        suspendCancellableCoroutine { cont ->
-            val options = channels.map { "${it.description} (${it.masked})" }.toTypedArray()
-            val dialog = MaterialAlertDialogBuilder(requireContext())
-                .setTitle(getString(R.string.bml_business_otp_title, profileName))
-                .setItems(options) { _, which ->
-                    if (cont.isActive) cont.resume(channels[which].channel)
-                }
-                .setNegativeButton(R.string.bml_business_otp_skip) { _: android.content.DialogInterface, _: Int ->
-                    if (cont.isActive) cont.resume(null as String?)
-                }
-                .show()
-            dialog.setOnCancelListener { if (cont.isActive) cont.resume(null as String?) }
-        }
-
-    private suspend fun finishBmlLogin() {
         val store = CredentialStore(requireContext())
         val accounts = bmlAccumulatedAccounts.toList()
 
@@ -428,18 +305,55 @@ class CredentialsFragment : Fragment() {
         val anySession = app.anyBmlSessionFor(bmlLoginId)
         if (anySession != null) {
             withContext(Dispatchers.IO) {
-                val info = BmlLoginFlow().fetchUserInfo(anySession)
+                val info = BmlAccountClient().fetchUserInfo(anySession)
-                if (info != null) store.saveBmlUserProfile(
+                if (info != null) {
-                    bmlLoginId,
+                    store.saveBmlUserProfile(
-                    CredentialStore.BmlUserProfile(
+                        bmlLoginId,
-                        fullName = info.fullName,
+                        CredentialStore.BmlUserProfile(
-                        email = info.email,
+                            fullName = info.fullName,
-                        mobile = info.mobile,
+                            email = info.email,
-                        customerId = info.customerId,
+                            mobile = info.mobile,
-                        idCard = info.idCard,
+                            customerId = info.customerId,
-                        birthdate = info.birthdate
+                            idCard = info.idCard,
+                            birthdate = info.birthdate
+                        )
                     )
-                )
+                    // Single-profile accounts used username as a temporary profileId.
+                    // Replace it with the real BML customer ID so multi-login doesn't collide.
+                    val customerId = info.customerId
+                    if (customerId.isNotBlank()) {
+                        val profiles = store.loadBmlProfiles(bmlLoginId)
+                        val autoProfile = profiles.firstOrNull { it.autoActivated }
+                        if (autoProfile != null && autoProfile.profileId != customerId) {
+                            val oldId = autoProfile.profileId
+                            // Re-key session in memory and storage
+                            val session = app.bmlSessions.remove(oldId)
+                            if (session != null) {
+                                app.bmlSessions[customerId] = session
+                                val savedRefresh = store.loadBmlProfileRefreshToken(oldId)
+                                val savedExpiry = store.loadBmlProfileExpiresAt(oldId)
+                                store.clearBmlProfileSession(oldId)
+                                store.saveBmlProfileSession(customerId, session.accessToken, session.deviceId)
+                                if (session.refreshToken.isNotBlank())
+                                    store.saveBmlProfileRefreshToken(customerId, session.refreshToken)
+                                else if (savedRefresh != null)
+                                    store.saveBmlProfileRefreshToken(customerId, savedRefresh)
+                                val expiryToSave = if (session.expiresAt > 0) session.expiresAt else savedExpiry
+                                if (expiryToSave > 0) store.saveBmlProfileExpiresAt(customerId, expiryToSave)
+                            }
+                            // Update stored profile list with the real ID
+                            val updatedProfiles = profiles.map {
+                                if (it.autoActivated) it.copy(profileId = customerId) else it
+                            }
+                            store.saveBmlProfiles(bmlLoginId, updatedProfiles)
+                            app.bmlProfilesMap[bmlLoginId] = updatedProfiles
+                            // Update accounts to use real profileId
+                            bmlAccumulatedAccounts.replaceAll { acc ->
+                                if (acc.profileId == oldId) acc.copy(profileId = customerId) else acc
+                            }
+                        }
+                    }
+                }
             }
         }
 
@@ -447,6 +361,9 @@ class CredentialsFragment : Fragment() {
         app.bmlAccounts = app.bmlAccounts.filter { it.loginTag != "bml_$bmlLoginId" } + accounts
         app.accounts = app.accounts.filter { it.loginTag != "bml_$bmlLoginId" } + accounts
 
+        if (hasBusinessProfiles) {
+            Toast.makeText(requireContext(), "Business profiles can be enabled in Settings → Logins", Toast.LENGTH_LONG).show()
+        }
         val intent = Intent(requireContext(), HomeActivity::class.java)
         intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
         startActivity(intent)
@@ -553,13 +470,13 @@ class CredentialsFragment : Fragment() {
         store: CredentialStore
     ) {
         val (profile, balance) = withContext(Dispatchers.IO) {
-            val p = flow.fetchProfile(session)
+            val p = FahipayAccountClient().fetchProfile(session)
-            val b = flow.fetchBalance(session)
+            val b = FahipayAccountClient().fetchBalance(session)
             Pair(p, b)
         }
         val loginId = profile.profileId
         val loginTag = "fahipay_$loginId"
-        val account = flow.buildAccount(profile, balance, loginTag)
+        val account = FahipayAccountClient().buildAccount(profile, balance, loginTag)
         store.saveFahipayCredentials(loginId, idCard, password)
         store.saveFahipaySession(loginId, session.authId, session.sessionCookie)
         store.saveFahipayUserProfile(

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

@@ -11,19 +11,19 @@ class OnboardingPagerAdapter(activity: FragmentActivity) : FragmentStateAdapter(
         OnboardingSlide(
             titleRes = R.string.onboarding_title_1,
             descRes = R.string.onboarding_desc_1,
-            iconRes = R.drawable.ic_launcher_foreground,
+            iconRes = R.drawable.ic_logo,
             isFirst = true
         ),
         OnboardingSlide(
             titleRes = R.string.onboarding_title_2,
             descRes = R.string.onboarding_desc_2,
-            iconRes = R.drawable.ic_launcher_foreground,
+            iconRes = R.drawable.ic_logo,
             isFirst = false
         ),
         OnboardingSlide(
             titleRes = R.string.onboarding_title_3,
             descRes = R.string.onboarding_desc_3,
-            iconRes = R.drawable.ic_launcher_foreground,
+            iconRes = R.drawable.ic_logo,
             isFirst = false,
             isLast = true
         )

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

@@ -215,9 +215,10 @@ class SecuritySetupFragment : Fragment() {
         val salt = ByteArray(16).also { SecureRandom().nextBytes(it) }
         val saltB64 = Base64.encodeToString(salt, Base64.NO_WRAP)
         val hash = pbkdf2(input, salt)
-        requireContext().getSharedPreferences("prefs", Context.MODE_PRIVATE).edit()
+        val edit = requireContext().getSharedPreferences("prefs", Context.MODE_PRIVATE).edit()
             .putString("security_method", method)
-            .apply()
+        if (method == "pin") edit.putInt("pin_length", input.length)
+        edit.apply()
         CredentialStore(requireContext()).saveSecurityHash(saltB64, hash)
     }
 

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

@@ -3,7 +3,7 @@ package sh.sar.basedbank.util
 import android.content.Context
 import org.json.JSONArray
 import org.json.JSONObject
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
 
 object AccountCache {
 
@@ -12,7 +12,7 @@ object AccountCache {
     private fun bmlKey(loginId: String) = "bml_accounts_$loginId"
     private fun fahipayKey(loginId: String) = "fahipay_accounts_$loginId"
 
-    fun save(context: Context, accounts: List<MibAccount>) {
+    fun save(context: Context, accounts: List<BankAccount>) {
         val arr = JSONArray()
         for (acc in accounts) {
             arr.put(JSONObject().apply {
@@ -38,7 +38,7 @@ object AccountCache {
             .edit().putString(KEY_MIB, CacheEncryption.encrypt(arr.toString())).apply()
     }
 
-    fun saveBml(context: Context, loginId: String, accounts: List<MibAccount>) {
+    fun saveBml(context: Context, loginId: String, accounts: List<BankAccount>) {
         val arr = JSONArray()
         for (acc in accounts) {
             arr.put(JSONObject().apply {
@@ -61,14 +61,14 @@ object AccountCache {
             .edit().putString(bmlKey(loginId), CacheEncryption.encrypt(arr.toString())).apply()
     }
 
-    fun loadBml(context: Context, loginId: String): List<MibAccount> {
+    fun loadBml(context: Context, loginId: String): List<BankAccount> {
         val raw = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
             .getString(bmlKey(loginId), null) ?: return emptyList()
         return try {
             val arr = JSONArray(CacheEncryption.decrypt(raw))
             (0 until arr.length()).map { i ->
                 val o = arr.getJSONObject(i)
-                MibAccount(
+                BankAccount(
                     bank             = "BML",
                     profileName      = o.optString("profileName"),
                     profileType      = o.optString("profileType"),
@@ -89,10 +89,10 @@ object AccountCache {
         } catch (_: Exception) { emptyList() }
     }
 
-    fun loadBml(context: Context, loginIds: List<String>): List<MibAccount> =
+    fun loadBml(context: Context, loginIds: List<String>): List<BankAccount> =
         loginIds.flatMap { loadBml(context, it) }
 
-    fun saveFahipay(context: Context, loginId: String, accounts: List<MibAccount>) {
+    fun saveFahipay(context: Context, loginId: String, accounts: List<BankAccount>) {
         val arr = JSONArray()
         for (acc in accounts) {
             arr.put(JSONObject().apply {
@@ -115,14 +115,14 @@ object AccountCache {
             .edit().putString(fahipayKey(loginId), CacheEncryption.encrypt(arr.toString())).apply()
     }
 
-    fun loadFahipay(context: Context, loginId: String): List<MibAccount> {
+    fun loadFahipay(context: Context, loginId: String): List<BankAccount> {
         val raw = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
             .getString(fahipayKey(loginId), null) ?: return emptyList()
         return try {
             val arr = JSONArray(CacheEncryption.decrypt(raw))
             (0 until arr.length()).map { i ->
                 val o = arr.getJSONObject(i)
-                MibAccount(
+                BankAccount(
                     bank             = "FAHIPAY",
                     profileName      = o.optString("profileName"),
                     profileType      = o.optString("profileType"),
@@ -143,14 +143,14 @@ object AccountCache {
         } catch (_: Exception) { emptyList() }
     }
 
-    fun loadFahipay(context: Context, loginIds: List<String>): List<MibAccount> =
+    fun loadFahipay(context: Context, loginIds: List<String>): List<BankAccount> =
         loginIds.flatMap { loadFahipay(context, it) }
 
     fun clear(context: Context) {
         context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().clear().apply()
     }
 
-    fun load(context: Context): List<MibAccount> {
+    fun load(context: Context): List<BankAccount> {
         val raw = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
             .getString(KEY_MIB, null) ?: return emptyList()
         return try {
@@ -158,7 +158,7 @@ object AccountCache {
             val arr = JSONArray(json)
             (0 until arr.length()).map { i ->
                 val o = arr.getJSONObject(i)
-                MibAccount(
+                BankAccount(
                     bank             = o.optString("bank", "MIB"),
                     profileName      = o.optString("profileName"),
                     profileType      = o.optString("profileType"),

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

@@ -1,13 +1,13 @@
 package sh.sar.basedbank.util
 
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.util.bmlapi.BmlHistoryParser
 import sh.sar.basedbank.util.fahipayapi.FahipayHistoryParser
 import sh.sar.basedbank.util.mibapi.MibHistoryParser
 
 object AccountHistoryParser {
 
-    fun from(account: MibAccount): AccountHistoryDisplay? = when (account.bank) {
+    fun from(account: BankAccount): AccountHistoryDisplay? = when (account.bank) {
         "BML"     -> BmlHistoryParser.displayData(account)
         "FAHIPAY" -> FahipayHistoryParser.displayData(account)
         "MIB"     -> MibHistoryParser.displayData(account)

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

@@ -1,13 +1,13 @@
 package sh.sar.basedbank.util
 
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.util.bmlapi.BmlDashboardParser
 import sh.sar.basedbank.util.fahipayapi.FahipayAccountParser
 import sh.sar.basedbank.util.mibapi.MibAccountParser
 
 object AccountListParser {
 
-    fun from(account: MibAccount): AccountListDisplay? = when (account.bank) {
+    fun from(account: BankAccount): AccountListDisplay? = when (account.bank) {
         "BML"     -> BmlDashboardParser.displayData(account)
         "FAHIPAY" -> FahipayAccountParser.displayData(account)
         "MIB"     -> MibAccountParser.displayData(account)

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

@@ -0,0 +1,57 @@
+package sh.sar.basedbank.util
+
+import android.content.Context
+import org.json.JSONArray
+import org.json.JSONObject
+import sh.sar.basedbank.api.mib.MibCard
+
+object CardsCache {
+
+    private const val PREFS = "cards_cache"
+    private const val KEY_MIB_CARDS = "mib_cards"
+
+    fun save(context: Context, cards: List<MibCard>) {
+        val arr = JSONArray()
+        for (c in cards) {
+            arr.put(JSONObject().apply {
+                put("cardId", c.cardId)
+                put("maskedCardNumber", c.maskedCardNumber)
+                put("cardStatus", c.cardStatus)
+                put("cardType", c.cardType)
+                put("cardTypeDesc", c.cardTypeDesc)
+                put("customerId", c.customerId)
+                put("phoneNumber", c.phoneNumber)
+                put("cardHolderName", c.cardHolderName)
+                put("loginTag", c.loginTag)
+            })
+        }
+        context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
+            .edit().putString(KEY_MIB_CARDS, CacheEncryption.encrypt(arr.toString())).apply()
+    }
+
+    fun load(context: Context): List<MibCard> {
+        val raw = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
+            .getString(KEY_MIB_CARDS, null) ?: return emptyList()
+        return try {
+            val arr = JSONArray(CacheEncryption.decrypt(raw))
+            (0 until arr.length()).map { i ->
+                val o = arr.getJSONObject(i)
+                MibCard(
+                    cardId           = o.optString("cardId"),
+                    maskedCardNumber = o.optString("maskedCardNumber"),
+                    cardStatus       = o.optString("cardStatus"),
+                    cardType         = o.optString("cardType"),
+                    cardTypeDesc     = o.optString("cardTypeDesc"),
+                    customerId       = o.optString("customerId"),
+                    phoneNumber      = o.optString("phoneNumber"),
+                    cardHolderName   = o.optString("cardHolderName"),
+                    loginTag         = o.optString("loginTag")
+                )
+            }
+        } catch (_: Exception) { emptyList() }
+    }
+
+    fun clear(context: Context) {
+        context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().clear().apply()
+    }
+}

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

@@ -1,18 +1,18 @@
 package sh.sar.basedbank.util
 
-import sh.sar.basedbank.api.mib.MibBeneficiary
+import sh.sar.basedbank.api.models.BankContact
 import sh.sar.basedbank.util.bmlapi.BmlContactParser
 import sh.sar.basedbank.util.fahipayapi.FahipayContactParser
 import sh.sar.basedbank.util.mibapi.MibContactParser
 
 object ContactListParser {
 
-    fun from(contact: MibBeneficiary): ContactDisplay? = when {
+    fun from(contact: BankContact): ContactDisplay? = when {
         contact.benefCategoryId == "BML"                      -> BmlContactParser.displayData(contact)
         contact.benefType == "FAHIPAY"                        -> FahipayContactParser.displayData(contact)
         contact.benefType in setOf("I", "L", "S")             -> MibContactParser.displayData(contact)
         else                                                  -> null
     }
 
-    fun fromList(contacts: List<MibBeneficiary>): List<ContactDisplay> = contacts.mapNotNull { from(it) }
+    fun fromList(contacts: List<BankContact>): List<ContactDisplay> = contacts.mapNotNull { from(it) }
 }

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

@@ -1,7 +1,7 @@
 package sh.sar.basedbank.util
 
 import sh.sar.basedbank.BasedBankApp
-import sh.sar.basedbank.api.bml.BmlLoginFlow
+import sh.sar.basedbank.api.bml.BmlContactsClient
 import sh.sar.basedbank.api.mib.MibContactsClient
 
 /**
@@ -21,7 +21,7 @@ object ContactManager {
     private fun deleteBml(contact: ContactDisplay, app: BasedBankApp): Boolean {
         val sess = app.bmlSessions[contact.profileId] ?: app.anyBmlSession() ?: return false
         val contactId = contact.id.removePrefix("bml_")
-        return try { BmlLoginFlow().deleteContact(sess, contactId) } catch (_: Exception) { false }
+        return try { BmlContactsClient().deleteContact(sess, contactId) } catch (_: Exception) { false }
     }
 
     private fun deleteMib(contact: ContactDisplay, app: BasedBankApp): Boolean {

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

@@ -3,8 +3,8 @@ package sh.sar.basedbank.util
 import android.content.Context
 import org.json.JSONArray
 import org.json.JSONObject
-import sh.sar.basedbank.api.mib.MibBeneficiary
+import sh.sar.basedbank.api.models.BankContact
-import sh.sar.basedbank.api.mib.MibBeneficiaryCategory
+import sh.sar.basedbank.api.models.BankContactCategory
 
 object ContactsCache {
 
@@ -14,8 +14,8 @@ object ContactsCache {
 
     fun save(
         context: Context,
-        contacts: List<MibBeneficiary>,
+        contacts: List<BankContact>,
-        categories: List<MibBeneficiaryCategory>
+        categories: List<BankContactCategory>
     ) {
         val prefs = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit()
 
@@ -55,7 +55,7 @@ object ContactsCache {
         context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().clear().apply()
     }
 
-    fun loadContacts(context: Context): List<MibBeneficiary> {
+    fun loadContacts(context: Context): List<BankContact> {
         val raw = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
             .getString(KEY_CONTACTS, null) ?: return emptyList()
         return try {
@@ -63,7 +63,7 @@ object ContactsCache {
             val arr = JSONArray(json)
             (0 until arr.length()).map { i ->
                 val o = arr.getJSONObject(i)
-                MibBeneficiary(
+                BankContact(
                     benefNo = o.optString("benefNo"),
                     benefName = o.optString("benefName"),
                     benefNickName = o.optString("benefNickName"),
@@ -86,7 +86,7 @@ object ContactsCache {
 
     private fun bmlKey(loginId: String) = "bml_contacts_$loginId"
 
-    fun saveBml(context: Context, loginId: String, contacts: List<MibBeneficiary>) {
+    fun saveBml(context: Context, loginId: String, contacts: List<BankContact>) {
         val arr = JSONArray()
         for (c in contacts) {
             arr.put(JSONObject().apply {
@@ -108,14 +108,14 @@ object ContactsCache {
             .edit().putString(bmlKey(loginId), CacheEncryption.encrypt(arr.toString())).apply()
     }
 
-    fun loadBml(context: Context, loginId: String): List<MibBeneficiary> {
+    fun loadBml(context: Context, loginId: String): List<BankContact> {
         val raw = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
             .getString(bmlKey(loginId), null) ?: return emptyList()
         return try {
             val arr = JSONArray(CacheEncryption.decrypt(raw))
             (0 until arr.length()).map { i ->
                 val o = arr.getJSONObject(i)
-                MibBeneficiary(
+                BankContact(
                     benefNo = o.optString("benefNo"),
                     benefName = o.optString("benefName"),
                     benefNickName = o.optString("benefNickName"),
@@ -134,10 +134,10 @@ object ContactsCache {
         } catch (_: Exception) { emptyList() }
     }
 
-    fun loadBml(context: Context, loginIds: List<String>): List<MibBeneficiary> =
+    fun loadBml(context: Context, loginIds: List<String>): List<BankContact> =
         loginIds.flatMap { loadBml(context, it) }
 
-    fun saveFahipay(context: Context, contacts: List<MibBeneficiary>, categories: List<MibBeneficiaryCategory>) {
+    fun saveFahipay(context: Context, contacts: List<BankContact>, categories: List<BankContactCategory>) {
         val prefs = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit()
         val arr = JSONArray()
         for (c in contacts) arr.put(JSONObject().apply {
@@ -159,14 +159,14 @@ object ContactsCache {
         prefs.apply()
     }
 
-    fun loadFahipay(context: Context): List<MibBeneficiary> {
+    fun loadFahipay(context: Context): List<BankContact> {
         val raw = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
             .getString("fahipay_contacts", null) ?: return emptyList()
         return try {
             val arr = JSONArray(CacheEncryption.decrypt(raw))
             (0 until arr.length()).map { i ->
                 val o = arr.getJSONObject(i)
-                MibBeneficiary(
+                BankContact(
                     benefNo = o.optString("benefNo"),
                     benefName = "",
                     benefNickName = o.optString("benefNickName"),
@@ -185,19 +185,19 @@ object ContactsCache {
         } catch (_: Exception) { emptyList() }
     }
 
-    fun loadFahipayCategories(context: Context): List<MibBeneficiaryCategory> {
+    fun loadFahipayCategories(context: Context): List<BankContactCategory> {
         val raw = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
             .getString("fahipay_categories", null) ?: return emptyList()
         return try {
             val arr = JSONArray(CacheEncryption.decrypt(raw))
             (0 until arr.length()).map { i ->
                 val o = arr.getJSONObject(i)
-                MibBeneficiaryCategory(o.optString("id"), o.optString("categoryName"), o.optInt("numBenef"))
+                BankContactCategory(o.optString("id"), o.optString("categoryName"), o.optInt("numBenef"))
             }
         } catch (_: Exception) { emptyList() }
     }
 
-    fun loadCategories(context: Context): List<MibBeneficiaryCategory> {
+    fun loadCategories(context: Context): List<BankContactCategory> {
         val raw = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
             .getString(KEY_CATEGORIES, null) ?: return emptyList()
         return try {
@@ -205,7 +205,7 @@ object ContactsCache {
             val arr = JSONArray(json)
             (0 until arr.length()).map { i ->
                 val o = arr.getJSONObject(i)
-                MibBeneficiaryCategory(
+                BankContactCategory(
                     id = o.optString("id"),
                     categoryName = o.optString("categoryName"),
                     numBenef = o.optInt("numBenef", 0)

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

@@ -217,6 +217,7 @@ class CredentialStore(context: Context) {
             put("name", p.name)
             put("type", p.type)
             put("profileType", p.profileType)
+            put("autoActivated", p.autoActivated)
         })
         prefs.edit().putString("bml_${loginId}_profiles", arr.toString()).apply()
     }
@@ -228,10 +229,11 @@ class CredentialStore(context: Context) {
             (0 until arr.length()).map { i ->
                 val o = arr.getJSONObject(i)
                 BmlProfile(
-                    profileId   = o.optString("profileId"),
+                    profileId     = o.optString("profileId"),
-                    name        = o.optString("name"),
+                    name          = o.optString("name"),
-                    type        = o.optString("type"),
+                    type          = o.optString("type"),
-                    profileType = o.optString("profileType", "default")
+                    profileType   = o.optString("profileType", "default"),
+                    autoActivated = o.optBoolean("autoActivated", false)
                 )
             }
         } catch (_: Exception) { emptyList() }
@@ -262,10 +264,30 @@ class CredentialStore(context: Context) {
         } catch (_: Exception) { null }
     }
 
+    fun saveBmlProfileExpiresAt(profileId: String, expiresAt: Long) {
+        prefs.edit().putLong("bml_profile_${profileId}_expires_at", expiresAt).apply()
+    }
+
+    fun loadBmlProfileExpiresAt(profileId: String): Long =
+        prefs.getLong("bml_profile_${profileId}_expires_at", 0L)
+
+    fun saveBmlProfileRefreshToken(profileId: String, refreshToken: String) {
+        val key = getOrCreateKey()
+        prefs.edit().putString("bml_profile_${profileId}_enc_refresh_token", encrypt(refreshToken, key)).apply()
+    }
+
+    fun loadBmlProfileRefreshToken(profileId: String): String? {
+        val key = getOrCreateKey()
+        val enc = prefs.getString("bml_profile_${profileId}_enc_refresh_token", null) ?: return null
+        return try { decrypt(enc, key) } catch (_: Exception) { null }
+    }
+
     fun clearBmlProfileSession(profileId: String) {
         prefs.edit()
             .remove("bml_profile_${profileId}_enc_token")
             .remove("bml_profile_${profileId}_enc_device_id")
+            .remove("bml_profile_${profileId}_enc_refresh_token")
+            .remove("bml_profile_${profileId}_expires_at")
             .apply()
     }
 

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

@@ -3,12 +3,14 @@ package sh.sar.basedbank.util
 import android.content.Context
 import org.json.JSONArray
 import org.json.JSONObject
+import sh.sar.basedbank.api.bml.BmlLoanDetail
 import sh.sar.basedbank.api.mib.MibFinanceDeal
 
 object FinancingCache {
 
     private const val PREFS = "financing_cache"
     private const val KEY_MIB = "mib_financing"
+    private const val KEY_BML_LOANS = "bml_loans"
 
     fun save(context: Context, deals: List<MibFinanceDeal>) {
         val arr = JSONArray()
@@ -34,6 +36,52 @@ object FinancingCache {
             .edit().putString(KEY_MIB, CacheEncryption.encrypt(arr.toString())).apply()
     }
 
+    fun saveBmlLoans(context: Context, loans: Map<String, BmlLoanDetail>) {
+        val arr = JSONArray()
+        for ((internalId, d) in loans) {
+            arr.put(JSONObject().apply {
+                put("internalId", internalId)
+                put("loanAmount", d.loanAmount)
+                put("outstandingAmt", d.outstandingAmt)
+                put("repayAmount", d.repayAmount)
+                put("intRate", d.intRate)
+                put("loanStatus", d.loanStatus)
+                put("startDate", d.startDate)
+                put("endDate", d.endDate)
+                put("noOfRepayOverdue", d.noOfRepayOverdue)
+                put("overdueAmount", d.overdueAmount)
+            })
+        }
+        context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
+            .edit().putString(KEY_BML_LOANS, CacheEncryption.encrypt(arr.toString())).apply()
+    }
+
+    fun loadBmlLoans(context: Context): Map<String, BmlLoanDetail> {
+        val raw = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
+            .getString(KEY_BML_LOANS, null) ?: return emptyMap()
+        return try {
+            val json = CacheEncryption.decrypt(raw)
+            val arr = JSONArray(json)
+            buildMap {
+                for (i in 0 until arr.length()) {
+                    val o = arr.getJSONObject(i)
+                    val id = o.optString("internalId")
+                    if (id.isNotBlank()) put(id, BmlLoanDetail(
+                        loanAmount       = o.optDouble("loanAmount", 0.0),
+                        outstandingAmt   = o.optDouble("outstandingAmt", 0.0),
+                        repayAmount      = o.optDouble("repayAmount", 0.0),
+                        intRate          = o.optDouble("intRate", 0.0),
+                        loanStatus       = o.optString("loanStatus"),
+                        startDate        = o.optString("startDate"),
+                        endDate          = o.optString("endDate"),
+                        noOfRepayOverdue = o.optInt("noOfRepayOverdue", 0),
+                        overdueAmount    = o.optDouble("overdueAmount", 0.0)
+                    ))
+                }
+            }
+        } catch (_: Exception) { emptyMap() }
+    }
+
     fun clear(context: Context) {
         context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().clear().apply()
     }

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

@@ -4,11 +4,11 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import sh.sar.basedbank.BasedBankApp
-import sh.sar.basedbank.api.bml.BmlLoginFlow
+import sh.sar.basedbank.api.bml.BmlHistoryClient
-import sh.sar.basedbank.api.fahipay.FahipayLoginFlow
+import sh.sar.basedbank.api.fahipay.FahipayHistoryClient
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.api.mib.MibHistoryClient
-import sh.sar.basedbank.api.mib.Transaction
+import sh.sar.basedbank.api.models.BankTransaction
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
@@ -18,10 +18,11 @@ import java.util.Locale
  * The fragment holds one instance per account and calls [hasMore] / [fetchNextPage]
  * without knowing which bank it is talking to.
  */
-class HistoryFetcher(private val account: MibAccount) {
+class HistoryFetcher(private val account: BankAccount) {
 
     private val isMib     get() = account.bank == "MIB"
     private val isBmlCard get() = account.profileType == "BML_PREPAID" || account.profileType == "BML_CREDIT"
+    private val isBmlLoan get() = account.profileType == "BML_LOAN"
     private val isFahipay get() = account.bank == "FAHIPAY"
 
     // MIB pagination
@@ -40,24 +41,24 @@ class HistoryFetcher(private val account: MibAccount) {
     private var fahipayTotal     = -1
 
     fun hasMore(): Boolean = when {
+        isBmlLoan -> false
         isFahipay -> fahipayTotal < 0 || fahipayNextStart < fahipayTotal
         isMib     -> mibTotalCount < 0 || mibNextStart <= mibTotalCount
         isBmlCard -> cardMonthOffset < 3
         else      -> bmlTotalPages < 0 || bmlNextPage <= bmlTotalPages
     }
 
-    suspend fun fetchNextPage(app: BasedBankApp, pageSize: Int = 10): List<Transaction> = when {
+    suspend fun fetchNextPage(app: BasedBankApp, pageSize: Int = 10): List<BankTransaction> = when {
+        isBmlLoan -> emptyList()
         isFahipay -> withContext(Dispatchers.IO) { fetchFahipay(app) }
         isMib     -> app.mibMutex.withLock { withContext(Dispatchers.IO) { fetchMib(app, pageSize) } }
         isBmlCard -> withContext(Dispatchers.IO) { fetchBmlCard(app) }
         else      -> withContext(Dispatchers.IO) { fetchBmlCasa(app) }
     }
 
-    private fun fetchFahipay(app: BasedBankApp): List<Transaction> {
+    private fun fetchFahipay(app: BasedBankApp): List<BankTransaction> {
         val session = app.fahipaySessionFor(account) ?: return emptyList()
-        val flow = FahipayLoginFlow()
+        val (list, total) = FahipayHistoryClient().fetchHistory(
-        flow.setSessionCookie(session.sessionCookie)
-        val (list, total) = flow.fetchHistory(
             session            = session,
             accountDisplayName = account.accountBriefName,
             accountNumber      = account.accountNumber,
@@ -68,7 +69,7 @@ class HistoryFetcher(private val account: MibAccount) {
         return list
     }
 
-    private fun fetchMib(app: BasedBankApp, pageSize: Int): List<Transaction> {
+    private fun fetchMib(app: BasedBankApp, pageSize: Int): List<BankTransaction> {
         val loginId = account.loginTag.removePrefix("mib_")
         val session = app.mibSessions[loginId] ?: return emptyList()
         val profiles = app.mibProfilesMap[loginId] ?: emptyList()
@@ -86,13 +87,13 @@ class HistoryFetcher(private val account: MibAccount) {
         return list
     }
 
-    private fun fetchBmlCard(app: BasedBankApp): List<Transaction> {
+    private fun fetchBmlCard(app: BasedBankApp): List<BankTransaction> {
         val session = app.bmlSessionFor(account) ?: return emptyList()
         val cal = Calendar.getInstance()
         cal.add(Calendar.MONTH, -cardMonthOffset)
         val month = SimpleDateFormat("yyyyMM", Locale.US).format(cal.time)
         cardMonthOffset++
-        return BmlLoginFlow().fetchCardHistory(
+        return BmlHistoryClient().fetchCardHistory(
             session            = session,
             cardId             = account.internalId,
             accountDisplayName = account.accountBriefName,
@@ -101,9 +102,9 @@ class HistoryFetcher(private val account: MibAccount) {
         )
     }
 
-    private fun fetchBmlCasa(app: BasedBankApp): List<Transaction> {
+    private fun fetchBmlCasa(app: BasedBankApp): List<BankTransaction> {
         val session = app.bmlSessionFor(account) ?: return emptyList()
-        val (list, totalPages) = BmlLoginFlow().fetchAccountHistory(
+        val (list, totalPages) = BmlHistoryClient().fetchAccountHistory(
             session            = session,
             accountId          = account.internalId,
             accountDisplayName = account.accountBriefName,

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

@@ -1,12 +1,12 @@
 package sh.sar.basedbank.util.bmlapi
 
-import sh.sar.basedbank.api.mib.MibBeneficiary
+import sh.sar.basedbank.api.models.BankContact
 import sh.sar.basedbank.util.ContactDisplay
 import sh.sar.basedbank.util.TransferNetwork
 
 object BmlContactParser {
 
-    fun displayData(contact: MibBeneficiary) = ContactDisplay(
+    fun displayData(contact: BankContact) = ContactDisplay(
         id               = contact.benefNo,
         name             = contact.benefNickName,
         realName         = contact.benefName,

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

@@ -1,7 +1,7 @@
 package sh.sar.basedbank.util.bmlapi
 
 import sh.sar.basedbank.R
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.util.AccountListDisplay
 
 object BmlDashboardParser {
@@ -10,7 +10,8 @@ object BmlDashboardParser {
      * Returns all display fields for an account/card row in the accounts list.
      * Handles both BML CASA accounts and BML prepaid/credit cards.
      */
-    fun displayData(account: MibAccount): AccountListDisplay {
+    fun displayData(account: BankAccount): AccountListDisplay? {
+        if (account.profileType == "BML_LOAN") return null  // Loans shown on financing page only
         val isCard = account.profileType == "BML_PREPAID" || account.profileType == "BML_CREDIT"
         return if (isCard) {
             val isActive = account.statusDesc.equals("Active", ignoreCase = true)
@@ -51,7 +52,7 @@ object BmlDashboardParser {
     }
 
     /** Balance shown in the accounts list — ledger (working) balance for BML CASA. */
-    fun listBalance(account: MibAccount): String =
+    fun listBalance(account: BankAccount): String =
         "${account.currencyName} ${account.currentBalance}"
 
     fun cardBrandIcon(productName: String): Int = when {

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

@@ -1,11 +1,11 @@
 package sh.sar.basedbank.util.bmlapi
 
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.util.AccountHistoryDisplay
 
 object BmlHistoryParser {
 
-    fun displayData(account: MibAccount): AccountHistoryDisplay {
+    fun displayData(account: BankAccount): AccountHistoryDisplay {
         val blocked = account.blockedAmount.toDoubleOrNull() ?: 0.0
         return AccountHistoryDisplay(
             name             = account.accountBriefName,

app/src/main/java/sh/sar/basedbank/util/fahipayapi/FahipayAccountParser.kt

@@ -1,11 +1,11 @@
 package sh.sar.basedbank.util.fahipayapi
 
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.util.AccountListDisplay
 
 object FahipayAccountParser {
 
-    fun displayData(account: MibAccount) = AccountListDisplay(
+    fun displayData(account: BankAccount) = AccountListDisplay(
         name      = account.accountBriefName,
         number    = account.accountNumber,
         typeLabel = account.accountTypeName,

app/src/main/java/sh/sar/basedbank/util/fahipayapi/FahipayContactParser.kt

@@ -1,12 +1,12 @@
 package sh.sar.basedbank.util.fahipayapi
 
-import sh.sar.basedbank.api.mib.MibBeneficiary
+import sh.sar.basedbank.api.models.BankContact
 import sh.sar.basedbank.util.ContactDisplay
 import sh.sar.basedbank.util.TransferNetwork
 
 object FahipayContactParser {
 
-    fun displayData(contact: MibBeneficiary) = ContactDisplay(
+    fun displayData(contact: BankContact) = ContactDisplay(
         id               = contact.benefNo,
         name             = contact.benefNickName,
         realName         = contact.benefName,

app/src/main/java/sh/sar/basedbank/util/fahipayapi/FahipayHistoryParser.kt

@@ -1,11 +1,11 @@
 package sh.sar.basedbank.util.fahipayapi
 
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.util.AccountHistoryDisplay
 
 object FahipayHistoryParser {
 
-    fun displayData(account: MibAccount) = AccountHistoryDisplay(
+    fun displayData(account: BankAccount) = AccountHistoryDisplay(
         name             = account.accountBriefName,
         number           = account.accountNumber,
         bankPill         = "FP",

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

@@ -1,11 +1,11 @@
 package sh.sar.basedbank.util.mibapi
 
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.util.AccountListDisplay
 
 object MibAccountParser {
 
-    fun displayData(account: MibAccount) = AccountListDisplay(
+    fun displayData(account: BankAccount) = AccountListDisplay(
         name      = account.accountBriefName,
         number    = account.accountNumber,
         typeLabel = productLabel(account.accountTypeName),

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

@@ -1,12 +1,12 @@
 package sh.sar.basedbank.util.mibapi
 
-import sh.sar.basedbank.api.mib.MibBeneficiary
+import sh.sar.basedbank.api.models.BankContact
 import sh.sar.basedbank.util.ContactDisplay
 import sh.sar.basedbank.util.TransferNetwork
 
 object MibContactParser {
 
-    fun displayData(contact: MibBeneficiary): ContactDisplay {
+    fun displayData(contact: BankContact): ContactDisplay {
         val network = when (contact.benefType) {
             "I"  -> TransferNetwork.MIB
             "S"  -> TransferNetwork.SWIFT

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

@@ -1,11 +1,11 @@
 package sh.sar.basedbank.util.mibapi
 
-import sh.sar.basedbank.api.mib.MibAccount
+import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.util.AccountHistoryDisplay
 
 object MibHistoryParser {
 
-    fun displayData(account: MibAccount) = AccountHistoryDisplay(
+    fun displayData(account: BankAccount) = AccountHistoryDisplay(
         name             = account.accountBriefName,
         number           = account.accountNumber,
         bankPill         = null,   // MIB has no bank pill

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

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animated-vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+
+  <aapt:attr name="android:drawable">
+    <vector
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24"
+        android:width="24dp"
+        android:tint="?attr/colorControlNormal">
+
+      <path
+          android:name="strike_through"
+          android:pathData="M3.27,4.27 L19.74,20.74"
+          android:strokeColor="@android:color/white"
+          android:strokeLineCap="square"
+          android:strokeWidth="1.8"
+          android:trimPathEnd="0"/>
+
+      <group>
+        <clip-path
+            android:name="eye_mask"
+            android:pathData="M2,4.27 L2,4.27 L4.54,1.73 L4.54,1.73 L4.54,1 L23,1 L23,23 L1,23 L1,4.27 Z"/>
+        <path
+            android:name="eye"
+            android:fillColor="@android:color/white"
+            android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+      </group>
+
+    </vector>
+  </aapt:attr>
+
+  <target android:name="eye_mask">
+    <aapt:attr name="android:animation">
+      <objectAnimator
+          android:duration="320"
+          android:interpolator="@android:interpolator/fast_out_slow_in"
+          android:propertyName="pathData"
+          android:valueFrom="M2,4.27 L2,4.27 L4.54,1.73 L4.54,1.73 L4.54,1 L23,1 L23,23 L1,23 L1,4.27 Z"
+          android:valueTo="M2,4.27 L19.73,22 L22.27,19.46 L4.54,1.73 L4.54,1 L23,1 L23,23 L1,23 L1,4.27 Z"
+          android:valueType="pathType"/>
+    </aapt:attr>
+  </target>
+
+  <target android:name="strike_through">
+    <aapt:attr name="android:animation">
+      <objectAnimator
+          android:duration="320"
+          android:interpolator="@android:interpolator/fast_out_slow_in"
+          android:propertyName="trimPathEnd"
+          android:valueFrom="0"
+          android:valueTo="1"/>
+    </aapt:attr>
+  </target>
+
+</animated-vector>

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

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animated-vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+
+  <aapt:attr name="android:drawable">
+    <vector
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24"
+        android:width="24dp"
+        android:tint="?attr/colorControlNormal">
+
+      <!--
+        Shackle drawn first (behind body) so it appears to slot into the body.
+        Starts translateY=-4 (open/raised), animates to 0 (locked).
+      -->
+      <group
+          android:name="shackle"
+          android:translateY="-4">
+        <path
+            android:fillColor="@android:color/transparent"
+            android:pathData="M8.9,10V6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1V10"
+            android:strokeColor="@android:color/white"
+            android:strokeLineCap="round"
+            android:strokeWidth="2.2"/>
+      </group>
+
+      <!--
+        Body on top — covers the shackle legs once they slide inside.
+        Even-odd fill cuts out the keyhole.
+      -->
+      <path
+          android:fillColor="@android:color/white"
+          android:fillType="evenOdd"
+          android:pathData="M6,8H18c1.1,0 2,0.9 2,2V20c0,1.1-0.9,2-2,2H6c-1.1,0-2,-0.9-2,-2V10c0,-1.1 0.9,-2 2,-2zM12,15c-1.1,0-2,0.9-2,2s0.9,2 2,2 2,-0.9 2,-2-0.9,-2-2,-2z"/>
+
+    </vector>
+  </aapt:attr>
+
+  <target android:name="shackle">
+    <aapt:attr name="android:animation">
+      <objectAnimator
+          android:duration="320"
+          android:interpolator="@android:interpolator/overshoot"
+          android:propertyName="translateY"
+          android:valueFrom="-4"
+          android:valueTo="0"/>
+    </aapt:attr>
+  </target>
+
+</animated-vector>

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

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animated-vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+
+  <aapt:attr name="android:drawable">
+    <vector
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24"
+        android:width="24dp"
+        android:tint="?attr/colorControlNormal">
+
+      <path
+          android:name="strike_through"
+          android:pathData="M3.27,4.27 L19.74,20.74"
+          android:strokeColor="@android:color/white"
+          android:strokeLineCap="square"
+          android:strokeWidth="1.8"/>
+
+      <group>
+        <clip-path
+            android:name="eye_mask"
+            android:pathData="M2,4.27 L19.73,22 L22.27,19.46 L4.54,1.73 L4.54,1 L23,1 L23,23 L1,23 L1,4.27 Z"/>
+        <path
+            android:name="eye"
+            android:fillColor="@android:color/white"
+            android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+      </group>
+
+    </vector>
+  </aapt:attr>
+
+  <target android:name="eye_mask">
+    <aapt:attr name="android:animation">
+      <objectAnimator
+          android:duration="200"
+          android:interpolator="@android:interpolator/fast_out_linear_in"
+          android:propertyName="pathData"
+          android:valueFrom="M2,4.27 L19.73,22 L22.27,19.46 L4.54,1.73 L4.54,1 L23,1 L23,23 L1,23 L1,4.27 Z"
+          android:valueTo="M2,4.27 L2,4.27 L4.54,1.73 L4.54,1.73 L4.54,1 L23,1 L23,23 L1,23 L1,4.27 Z"
+          android:valueType="pathType"/>
+    </aapt:attr>
+  </target>
+
+  <target android:name="strike_through">
+    <aapt:attr name="android:animation">
+      <objectAnimator
+          android:duration="200"
+          android:interpolator="@android:interpolator/fast_out_linear_in"
+          android:propertyName="trimPathEnd"
+          android:valueFrom="1"
+          android:valueTo="0"/>
+    </aapt:attr>
+  </target>
+
+</animated-vector>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="#00000000"
+        android:endColor="#CC000000"
+        android:angle="270"/>
+</shape>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?attr/colorOnSurface"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.68L5.68,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.68L18.32,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z"/>
+</vector>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?attr/colorOnSurfaceVariant"
+        android:pathData="M20,4H4C2.9,4 2,4.9 2,6v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5V6l8,5 8,-5v2z"/>
+</vector>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?attr/colorOnSurfaceVariant"
+        android:pathData="M20,2H4C2.9,2 2,2.9 2,4v18l4,-4h14c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zM9,11H7V9h2v2zM13,11h-2V9h2v2zM17,11h-2V9h2v2z"/>
+</vector>

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

@@ -0,0 +1,10 @@
+<?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="32"
+    android:viewportHeight="32">
+    <path
+        android:fillColor="?attr/colorOnSurfaceVariant"
+        android:pathData="M26.576 5.363c-2.69-2.69-6.406-4.354-10.511-4.354-8.209 0-14.865 6.655-14.865 14.865 0 2.732 0.737 5.291 2.022 7.491l-0.038-0.070-2.109 7.702 7.879-2.067c2.051 1.139 4.498 1.809 7.102 1.809h0.006c8.209-0.003 14.862-6.659 14.862-14.868 0-4.103-1.662-7.817-4.349-10.507zM16.062 28.228h-0.005c-2.319 0-4.489-0.64-6.342-1.753l0.056 0.031-0.451-0.267-4.675 1.227 1.247-4.559-0.294-0.467c-1.185-1.862-1.889-4.131-1.889-6.565 0-6.822 5.531-12.353 12.353-12.353s12.353 5.531 12.353 12.353c0 6.822-5.53 12.353-12.353 12.353zM22.838 18.977c-0.371-0.186-2.197-1.083-2.537-1.208-0.341-0.124-0.589-0.185-0.837 0.187-0.246 0.371-0.958 1.207-1.175 1.455-0.216 0.249-0.434 0.279-0.805 0.094-1.15-0.466-2.138-1.087-2.997-1.852l0.010 0.009c-0.799-0.74-1.484-1.587-2.037-2.521l-0.028-0.052c-0.216-0.371-0.023-0.572 0.162-0.757 0.167-0.166 0.372-0.434 0.557-0.65 0.146-0.179 0.271-0.384 0.366-0.604l0.006-0.017c0.043-0.087 0.068-0.188 0.068-0.296 0-0.131-0.037-0.253-0.101-0.357l0.002 0.003c-0.094-0.186-0.836-2.014-1.145-2.758-0.302-0.724-0.609-0.625-0.836-0.637-0.216-0.010-0.464-0.012-0.712-0.012-0.395 0.010-0.746 0.188-0.988 0.463l-0.001 0.002c-0.802 0.761-1.3 1.834-1.3 3.023 0 0.026 0 0.053 0.001 0.079c0.131 1.467 0.681 2.784 1.527 3.857l-0.012-0.015c1.604 2.379 3.742 4.282 6.251 5.564l0.094 0.043c0.548 0.248 1.25 0.513 1.968 0.74l0.149 0.041c0.442 0.14 0.951 0.221 1.479 0.221 0.303 0 0.601-0.027 0.889-0.078l-0.031 0.004c1.069-0.223 1.956-0.868 2.497-1.749l0.009-0.017c0.165-0.366 0.261-0.793 0.261-1.242 0-0.185-0.016-0.366-0.047-0.542l0.003 0.019c-0.092-0.155-0.34-0.247-0.712-0.434z"/>
+</vector>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?attr/colorOnSurface"
+        android:pathData="M22,11h-4.17l3.24,-3.24 -1.41,-1.42L15,11h-2V9l4.66,-4.66 -1.42,-1.41L13,6.17V2h-2v4.17L7.76,2.93 6.34,4.34 11,9v2H9L4.34,6.34 2.93,7.76 6.17,11H2v2h4.17l-3.24,3.24 1.41,1.42L9,13h2v2l-4.66,4.66 1.42,1.41L11,17.83V22h2v-4.17l3.24,3.24 1.42,-1.41L13,15v-2h2l4.66,4.66 1.41,-1.42L17.83,13H22z"/>
+</vector>

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

@@ -5,166 +5,6 @@
     android:viewportWidth="108"
     android:viewportHeight="108">
     <path
-        android:fillColor="#3DDC84"
+        android:fillColor="#E8B547"
         android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
 </vector>

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

@@ -1,30 +1,24 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
-    android:viewportWidth="108"
+    android:viewportWidth="432"
-    android:viewportHeight="108">
+    android:viewportHeight="432">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+
-        <aapt:attr name="android:fillColor">
+    <!--
-            <gradient
+        Rufiyaa symbol centered on canvas.
-                android:endX="85.84757"
+        Original SVG bounding box: 276.85 × 175.60
-                android:endY="92.4963"
+        Scale 0.85 → 235.3 × 149.3, centered at (216, 216):
-                android:startX="42.9492"
+          translateX = 216 − 235.3/2 = 98
-                android:startY="49.59793"
+          translateY = 216 − 149.3/2 = 141
-                android:type="linear">
+    -->
-                <item
+    <group
-                    android:color="#44000000"
+        android:scaleX="0.85"
-                    android:offset="0.0" />
+        android:scaleY="0.85"
-                <item
+        android:translateX="98"
-                    android:color="#00000000"
+        android:translateY="141">
-                    android:offset="1.0" />
+        <path
-            </gradient>
+            android:fillColor="#000000"
-        </aapt:attr>
+            android:pathData="m 0.01444349,146.48136 c 0.292039,-6.44722 3.89308401,-9.12968 9.18909001,-9.48871 1.2523995,-0.0849 2.7807995,-0.0849 4.8186995,0 7.677319,0.0719 15.575535,2.04677 23.196,0.32719 3.328697,-0.83215 38.545925,-17.3522 71.890297,-40.525298 -6.38484,-3.92558 -9.558207,-9.227296 -9.06617,-16.8414 0.1618,-1.45617 2.26605,-16.30132 20.6841,-14.74007 2.82949,0.2398 11.06017,2.89394 24.6766,7.89527 4.8434,-4.011342 9.86993,-7.792775 14.86,-11.6179 -8.69961,-3.530822 -11.46541,-11.291021 -10.04177,-20.1135 1.42405,-8.825035 8.66169,-13.705029 19.0329,-11.88805 9.23153,1.617223 19.00984,5.215984 22.8004,6.7845 20.70075,-11.189327 54.77683,-28.8770828 65.3541,-34.0729998 5.70626,-3.35254 12.71464,-3.19857098 16.5862,2.73179 4.21557,6.6454798 3.9892,13.2813598 -2.19151,17.9821998 -8.64301,6.573585 -19.44036,9.920412 -29.2398,14.5974 -6.93317,3.490262 -13.93101,6.864024 -20.6089,10.8298 21.25669,6.267982 27.73865,10.456642 28.27166,22.5229 0.0826,1.868798 -0.20263,3.745 -0.64544,5.3661 -1.21907,4.462958 -5.06847,10.963331 -17.1941,9.7415 -5.09154,-0.513098 -25.58805,-6.353594 -42.9433,-12.0531 -4.15228,3.73688 -8.78178,6.907135 -13.2389,10.267 9.60154,3.066049 21.58993,6.56711 24.4216,17.486898 0.24324,1.08936 0.96989,5.15913 -0.58539,9.4564 -2.62403,7.6132 -9.24819,10.55389 -16.7664,10.1919 -3.54102,-0.12568 -18.38167,-3.16212 -42.9144,-12.18824 -26.82393,18.68149 -64.679357,43.44745 -92.643497,57.009 -5.389878,2.61389 -21.064916,10.09114 -30.0955,9.4114 -5.029255,-0.37856 -10.4541355,-5.68673 -13.6177995,-11.67795 -4.32270801,-8.18616 -4.01566901,-16.80012 -3.98877001,-17.39403 z" />
-    </path>
+    </group>
-    <path
+
-        android:fillColor="#FFFFFF"
+</vector>
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>

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

@@ -5,7 +5,19 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
+
+    <!-- Shackle (behind body) -->
+    <path
+        android:fillColor="@android:color/transparent"
+        android:pathData="M8.9,10V6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1V10"
+        android:strokeColor="@android:color/white"
+        android:strokeLineCap="round"
+        android:strokeWidth="2.2"/>
+
+    <!-- Body + keyhole cutout -->
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M18,8h-1V6c0-2.76-2.24-5-5-5S7,3.24 7,6v2H6c-1.1,0-2,0.9-2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10c0,-1.1-0.9,-2-2,-2zm-6,9c-1.1,0-2,-0.9-2,-2s0.9,-2 2,-2 2,0.9 2,2-0.9,2-2,2zm3.1,-9H8.9V6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" />
+        android:fillType="evenOdd"
+        android:pathData="M6,8H18c1.1,0 2,0.9 2,2V20c0,1.1-0.9,2-2,2H6c-1.1,0-2,-0.9-2,-2V10c0,-1.1 0.9,-2 2,-2zM12,15c-1.1,0-2,0.9-2,2s0.9,2 2,2 2,-0.9 2,-2-0.9,-2-2,-2z"/>
+
 </vector>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="#E8B547" />
+        </shape>
+    </item>
+    <item android:drawable="@drawable/ic_launcher_foreground" />
+</layer-list>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android: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"/>
+</vector>

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

@@ -0,0 +1,11 @@
+<?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"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39-6,-7.5-11,-7.5zM12,17c-2.76,0-5,-2.24-5,-5s2.24,-5 5,-5 5,2.24 5,5-2.24,5-5,5zM12,9c-1.66,0-3,1.34-3,3s1.34,3 3,3 3,-1.34 3,-3-1.34,-3-3,-3z" />
+</vector>

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

@@ -0,0 +1,11 @@
+<?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"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65-0.13,1.26-0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75-1.73,-4.39-6,-7.5-11,-7.5-1.4,0-2.74,0.25-3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21-0.08,0.43-0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33-1.41,0.53-2.2,0.53-2.76,0-5,-2.24-5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66-1.34,-3-3,-3l-0.17,0.01z" />
+</vector>

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

@@ -19,19 +19,26 @@
             android:layout_height="wrap_content"
             android:fitsSystemWindows="true">
 
-            <com.google.android.material.appbar.MaterialToolbar
+            <FrameLayout
-                android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="wrap_content">
-                app:titleTextAppearance="?attr/textAppearanceTitleLarge" />
 
-            <com.google.android.material.progressindicator.LinearProgressIndicator
+                <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/refreshIndicator"
+                    android:id="@+id/toolbar"
-                android:layout_width="match_parent"
+                    android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                    android:layout_height="?attr/actionBarSize"
-                android:indeterminate="true"
+                    app:titleTextAppearance="?attr/textAppearanceTitleLarge" />
-                android:visibility="gone"
+
-                app:trackCornerRadius="0dp" />
+                <com.google.android.material.progressindicator.LinearProgressIndicator
+                    android:id="@+id/refreshIndicator"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:indeterminate="true"
+                    android:visibility="gone"
+                    app:trackCornerRadius="0dp" />
+
+            </FrameLayout>
 
         </com.google.android.material.appbar.AppBarLayout>
 

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

@@ -31,28 +31,35 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
-    <FrameLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/swipeRefresh"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1">
 
-        <androidx.recyclerview.widget.RecyclerView
+        <FrameLayout
-            android:id="@+id/recyclerView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="match_parent">
-            android:paddingBottom="16dp"
-            android:clipToPadding="false" />
 
-        <TextView
+            <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/emptyView"
+                android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
+                android:layout_width="match_parent"
-            android:layout_height="match_parent"
+                android:layout_height="match_parent"
-            android:gravity="center"
+                android:paddingBottom="16dp"
-            android:text="No transactions found"
+                android:clipToPadding="false" />
-            android:textAppearance="?attr/textAppearanceBodyMedium"
-            android:textColor="?attr/colorOnSurfaceVariant"
-            android:visibility="gone" />
 
-    </FrameLayout>
+            <TextView
+                android:id="@+id/emptyView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:text="No transactions found"
+                android:textAppearance="?attr/textAppearanceBodyMedium"
+                android:textColor="?attr/colorOnSurfaceVariant"
+                android:visibility="gone" />
+
+        </FrameLayout>
+
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
 </LinearLayout>

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

@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/recyclerView"
+    android:id="@+id/swipeRefresh"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingHorizontal="16dp"
+    android:background="?attr/colorSurface">
-    android:paddingTop="8dp"
+
-    android:paddingBottom="16dp"
+    <androidx.recyclerview.widget.RecyclerView
-    android:clipToPadding="false"
+        android:id="@+id/recyclerView"
-    android:background="?attr/colorSurface" />
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingHorizontal="16dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="16dp"
+        android:clipToPadding="false" />
+
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

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

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/swipeRefresh"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/colorSurface">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingHorizontal="16dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="16dp"
+            android:clipToPadding="false"/>
+
+        <LinearLayout
+            android:id="@+id/loadingView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+            <ProgressBar
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/emptyView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:text="@string/cards_empty"
+            android:textAppearance="?attr/textAppearanceBodyMedium"
+            android:textColor="?attr/colorOnSurfaceVariant"
+            android:visibility="gone"/>
+
+    </FrameLayout>
+
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

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

@@ -41,34 +41,41 @@
             app:tabMode="scrollable"
             app:tabGravity="start" />
 
-        <FrameLayout
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/swipeRefresh"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1">
 
-            <androidx.viewpager2.widget.ViewPager2
+            <FrameLayout
-                android:id="@+id/viewPager"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent">
 
-            <ProgressBar
+                <androidx.viewpager2.widget.ViewPager2
-                android:id="@+id/loadingView"
+                    android:id="@+id/viewPager"
-                android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                    android:layout_height="match_parent" />
-                android:layout_gravity="center"
-                android:visibility="visible" />
 
-            <TextView
+                <ProgressBar
-                android:id="@+id/emptyView"
+                    android:id="@+id/loadingView"
-                android:layout_width="wrap_content"
+                    android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                    android:layout_height="wrap_content"
-                android:layout_gravity="center"
+                    android:layout_gravity="center"
-                android:text="@string/contacts_empty"
+                    android:visibility="visible" />
-                android:textAppearance="?attr/textAppearanceBodyMedium"
-                android:textColor="?attr/colorOnSurfaceVariant"
-                android:visibility="gone" />
 
-        </FrameLayout>
+                <TextView
+                    android:id="@+id/emptyView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="@string/contacts_empty"
+                    android:textAppearance="?attr/textAppearanceBodyMedium"
+                    android:textColor="?attr/colorOnSurfaceVariant"
+                    android:visibility="gone" />
+
+            </FrameLayout>
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     </LinearLayout>
 

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

@@ -7,11 +7,16 @@
     android:orientation="vertical"
     android:background="?attr/colorSurface">
 
-    <androidx.core.widget.NestedScrollView
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/swipeRefresh"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1">
 
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -92,6 +97,85 @@
 
         </LinearLayout>
 
+        <!-- Available Credit row (hidden when no credit cards) -->
+        <LinearLayout
+            android:id="@+id/rowCreditCards"
+            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/cardMvrCredit"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginEnd="8dp"
+                app:cardElevation="1dp"
+                app:cardCornerRadius="12dp">
+
+                <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/balance_mvr_credit"
+                        android:textAppearance="?attr/textAppearanceLabelSmall"
+                        android:textColor="?attr/colorOnSurfaceVariant" />
+
+                    <TextView
+                        android:id="@+id/tvMvrCredit"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:text="MVR —"
+                        android:textAppearance="?attr/textAppearanceTitleMedium" />
+
+                </LinearLayout>
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/cardUsdCredit"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginStart="8dp"
+                app:cardElevation="1dp"
+                app:cardCornerRadius="12dp">
+
+                <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/balance_usd_credit"
+                        android:textAppearance="?attr/textAppearanceLabelSmall"
+                        android:textColor="?attr/colorOnSurfaceVariant" />
+
+                    <TextView
+                        android:id="@+id/tvUsdCredit"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:text="USD —"
+                        android:textAppearance="?attr/textAppearanceTitleMedium" />
+
+                </LinearLayout>
+
+            </com.google.android.material.card.MaterialCardView>
+
+        </LinearLayout>
+
         <!-- Pending Finances card -->
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
@@ -132,46 +216,38 @@
             android:layout_height="wrap_content"
             android:orientation="vertical" />
 
-        <!-- Card support WIP -->
+        <!-- Card carousel (hidden when no cards loaded) -->
-        <com.google.android.material.card.MaterialCardView
+        <LinearLayout
+            android:id="@+id/sectionCards"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:orientation="vertical"
             android:layout_marginTop="16dp"
-            app:cardElevation="1dp"
+            android:visibility="gone">
-            app:cardCornerRadius="12dp"
-            app:strokeWidth="1dp"
-            app:strokeColor="?attr/colorOutlineVariant">
 
-            <LinearLayout
+            <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"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
+                android:clipToPadding="false"
-                android:gravity="center"
+                android:paddingEnd="4dp"/>
-                android:padding="24dp">
 
-                <TextView
+        </LinearLayout>
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/card_support_wip"
-                    android:textAppearance="?attr/textAppearanceTitleSmall"
-                    android:textColor="?attr/colorOnSurfaceVariant" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:text="@string/coming_soon"
-                    android:textAppearance="?attr/textAppearanceBodySmall"
-                    android:textColor="?attr/colorOutline" />
-
-            </LinearLayout>
-
-        </com.google.android.material.card.MaterialCardView>
 
     </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
 
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
     <!-- Quick actions fixed at bottom -->
     <LinearLayout
         android:id="@+id/buttonBar"

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

@@ -1,41 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/swipeRefresh"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/colorSurface">
 
-    <androidx.recyclerview.widget.RecyclerView
+    <FrameLayout
-        android:id="@+id/recyclerView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="match_parent">
-        android:paddingHorizontal="16dp"
-        android:paddingTop="8dp"
-        android:paddingBottom="16dp"
-        android:clipToPadding="false" />
 
-    <LinearLayout
+        <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/loadingView"
+            android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
+            android:layout_width="match_parent"
-        android:layout_height="match_parent"
+            android:layout_height="match_parent"
-        android:gravity="center"
+            android:paddingHorizontal="16dp"
-        android:orientation="vertical"
+            android:paddingTop="8dp"
-        android:visibility="gone">
+            android:paddingBottom="16dp"
+            android:clipToPadding="false" />
 
-        <ProgressBar
+        <LinearLayout
-            android:layout_width="wrap_content"
+            android:id="@+id/loadingView"
-            android:layout_height="wrap_content" />
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="gone">
 
-    </LinearLayout>
+            <ProgressBar
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
 
-    <TextView
+        </LinearLayout>
-        android:id="@+id/emptyView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:text="@string/financing_empty"
-        android:textAppearance="?attr/textAppearanceBodyMedium"
-        android:textColor="?attr/colorOnSurfaceVariant"
-        android:visibility="gone" />
 
-</FrameLayout>
+        <TextView
+            android:id="@+id/emptyView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:text="@string/financing_empty"
+            android:textAppearance="?attr/textAppearanceBodyMedium"
+            android:textColor="?attr/colorOnSurfaceVariant"
+            android:visibility="gone" />
+
+    </FrameLayout>
+
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

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

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/swipeRefresh"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/colorSurface">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingHorizontal="16dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="16dp"
+            android:clipToPadding="false"/>
+
+        <LinearLayout
+            android:id="@+id/loadingView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+            <ProgressBar
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/emptyView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:text="@string/cards_empty"
+            android:textAppearance="?attr/textAppearanceBodyMedium"
+            android:textColor="?attr/colorOnSurfaceVariant"
+            android:visibility="gone"/>
+
+    </FrameLayout>
+
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

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

@@ -96,6 +96,46 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/rowAutoUnlockPin"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="4dp"
+            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="@string/settings_auto_unlock_pin"
+                    android:textAppearance="?attr/textAppearanceBodyLarge"
+                    android:textColor="?attr/colorOnSurface" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/settings_auto_unlock_pin_desc"
+                    android:textAppearance="?attr/textAppearanceBodySmall"
+                    android:textColor="?attr/colorOnSurfaceVariant" />
+
+            </LinearLayout>
+
+            <com.google.android.material.materialswitch.MaterialSwitch
+                android:id="@+id/switchAutoUnlockPin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp" />
+
+        </LinearLayout>
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -112,14 +152,6 @@
             app:singleSelection="true"
             app:selectionRequired="true">
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btnAutolockOff"
-                style="@style/Widget.Material3.Button.OutlinedButton"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/autolock_off" />
-
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnAutolock30s"
                 style="@style/Widget.Material3.Button.OutlinedButton"
@@ -162,6 +194,44 @@
             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/fragment_transfer.xml

@@ -336,6 +336,61 @@
 
                 </com.google.android.material.textfield.TextInputLayout>
 
+                <!-- BML business OTP: channel selection (shown after confirmation, before OTP entry) -->
+                <LinearLayout
+                    android:id="@+id/layoutBmlChannelSelection"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:layout_marginBottom="8dp"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="4dp"
+                        android:text="@string/transfer_send_otp_via"
+                        android:textAppearance="?attr/textAppearanceLabelMedium"
+                        android:textColor="?attr/colorOnSurfaceVariant" />
+
+                    <LinearLayout
+                        android:id="@+id/containerBmlChannels"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical" />
+
+                </LinearLayout>
+
+                <!-- BML business OTP: sent-via label (shown after channel selection) -->
+                <TextView
+                    android:id="@+id/tvBmlOtpSentVia"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:textAppearance="?attr/textAppearanceBodySmall"
+                    android:textColor="?attr/colorOnSurfaceVariant"
+                    android:visibility="gone" />
+
+                <!-- BML business OTP: verification code input (shown after channel selection) -->
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/tilBmlOtp"
+                    style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/transfer_otp_code_hint"
+                    android:layout_marginBottom="16dp"
+                    android:visibility="gone">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/etBmlOtp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="number"
+                        android:maxLines="1"
+                        android:maxLength="6" />
+
+                </com.google.android.material.textfield.TextInputLayout>
+
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnTransfer"
                     android:layout_width="match_parent"

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

@@ -31,29 +31,36 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
-    <FrameLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/swipeRefresh"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1">
 
-        <androidx.recyclerview.widget.RecyclerView
+        <FrameLayout
-            android:id="@+id/recyclerView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="match_parent">
-            android:paddingTop="4dp"
-            android:paddingBottom="16dp"
-            android:clipToPadding="false" />
 
-        <TextView
+            <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/emptyView"
+                android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
+                android:layout_width="match_parent"
-            android:layout_height="match_parent"
+                android:layout_height="match_parent"
-            android:gravity="center"
+                android:paddingTop="4dp"
-            android:text="No transactions found"
+                android:paddingBottom="16dp"
-            android:textAppearance="?attr/textAppearanceBodyMedium"
+                android:clipToPadding="false" />
-            android:textColor="?attr/colorOnSurfaceVariant"
-            android:visibility="gone" />
 
-    </FrameLayout>
+            <TextView
+                android:id="@+id/emptyView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:text="No transactions found"
+                android:textAppearance="?attr/textAppearanceBodyMedium"
+                android:textColor="?attr/colorOnSurfaceVariant"
+                android:visibility="gone" />
+
+        </FrameLayout>
+
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
 </LinearLayout>