Enhance dashboard: add attention row for blocked and overdue funds

Introduces a new attention row in the dashboard to display blocked funds and overdue financing. The row is conditionally visible based on the presence of blocked amounts or overdue totals. Updates the account display logic to show blocked amounts where applicable, ensuring users have a clear view of their financial status. Additionally, new string resources for "Blocked Funds" and "Overdue Financing" are added for localization.
accounts list: use available balance, show blocked amount as secondary line
2026-05-28 15:24:49 +05:00 · 2026-05-28 14:54:33 +05:00 · 2026-05-28 14:53:45 +05:00
40 changed files with 457 additions and 702 deletions
@@ -27,6 +27,10 @@ android {
    }

    buildTypes {
+        debug {
+            applicationIdSuffix = ".debug"
+            versionNameSuffix = "-debug"
+        }
        release {
            signingConfig = signingConfigs.getByName("release")
            isMinifyEnabled = false
@@ -10,7 +10,7 @@

    <application
        android:name=".BasedBankApp"
-        android:allowBackup="false"
+        android:allowBackup="true"
        android:dataExtractionRules="@xml/data_extraction_rules"
        android:fullBackupContent="@xml/backup_rules"
        android:icon="@mipmap/ic_launcher"
@@ -30,9 +30,6 @@
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
        </activity>

        <activity
@@ -1 +0,0 @@
-visa_bingaa.png
@@ -1 +0,0 @@
-visa_bingaa.png
@@ -16,13 +16,6 @@ import sh.sar.basedbank.util.CredentialStore

 class BasedBankApp : Application() {

-    /**
-     * Set to true only after the user passes LockActivity or completes fresh login.
-     * Resets to false on every process restart so direct ADB/root activity launches
-     * cannot reach HomeActivity without re-authenticating.
-     */
-    var isUnlocked = false
-
    // Held in memory after successful login; cleared on logout
    var accounts: List<BankAccount> = emptyList()
    var fullName: String = ""
@@ -21,7 +21,6 @@ import kotlinx.coroutines.withContext
 import sh.sar.basedbank.databinding.ActivityLockBinding
 import sh.sar.basedbank.ui.home.HomeActivity
 import sh.sar.basedbank.util.CredentialStore
-import sh.sar.basedbank.BasedBankApp
 import javax.crypto.SecretKeyFactory
 import javax.crypto.spec.PBEKeySpec

@@ -260,16 +259,10 @@ class LockActivity : AppCompatActivity() {
    }

    private fun proceed() {
-        (application as BasedBankApp).isUnlocked = true
        if (intent.getBooleanExtra(EXTRA_RESUME, false)) {
            finish()
        } else {
-            val navDest = intent.getIntExtra("nav_destination", -1)
-            val autoScan = intent.getBooleanExtra("auto_scan", false)
-            startActivity(Intent(this, HomeActivity::class.java).apply {
-                if (navDest != -1) putExtra("nav_destination", navDest)
-                if (autoScan) putExtra("auto_scan", true)
-            })
+            startActivity(Intent(this, HomeActivity::class.java))
            finish()
        }
    }
@@ -7,43 +7,24 @@ import sh.sar.basedbank.ui.home.HomeActivity
 import sh.sar.basedbank.ui.login.LoginActivity
 import sh.sar.basedbank.ui.onboarding.OnboardingActivity
 import sh.sar.basedbank.util.CredentialStore
-import sh.sar.basedbank.BasedBankApp
-import sh.sar.basedbank.R

 class MainActivity : AppCompatActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-
        val prefs = getSharedPreferences("prefs", MODE_PRIVATE)
        val onboardingDone = prefs.getBoolean("onboarding_done", false)
        val securitySet = prefs.getString("security_method", null) != null
        val store = CredentialStore(this)
        val hasCredentials = store.hasMibCredentials() || store.hasBmlCredentials() || store.hasFahipayCredentials()

-        val navDestination = when (intent?.action) {
-            "sh.sar.basedbank.OPEN_TRANSFER"      -> R.id.nav_transfer
-            "sh.sar.basedbank.OPEN_SCAN_QR"       -> R.id.nav_transfer
-            "sh.sar.basedbank.OPEN_PAY_WITH_CARD" -> R.id.nav_pay_with_card
-            else -> -1
-        }
-        val autoScan = intent?.action == "sh.sar.basedbank.OPEN_SCAN_QR"
-
        val target = when {
            !onboardingDone -> OnboardingActivity::class.java
            !hasCredentials -> LoginActivity::class.java
            securitySet -> LockActivity::class.java  // proceed() → HomeActivity
            else -> HomeActivity::class.java
        }
-        // No lock screen configured — mark as unlocked so HomeActivity's guard passes
-        if (target == HomeActivity::class.java) {
-            (application as BasedBankApp).isUnlocked = true
-        }
-
-        startActivity(Intent(this, target).apply {
-            if (navDestination != -1) putExtra("nav_destination", navDestination)
-            if (autoScan) putExtra("auto_scan", true)
-        })
+        startActivity(Intent(this, target))
        finish()
    }
 }
@@ -9,6 +9,7 @@ import org.json.JSONObject
 import java.security.MessageDigest
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
+import kotlin.math.abs
 import kotlin.random.Random

 class SessionExpiredException : Exception("MIB session expired")
@@ -168,7 +169,7 @@ class MibLoginFlow(private val credentialStore: CredentialStore) {
                                accountTypeName  = a.optString("accountTypeName"),
                                availableBalance = a.optString("availableBalance"),
                                currentBalance   = a.optString("currentBalance"),
-                                blockedAmount    = a.optString("blockedAmount"),
+                                blockedAmount    = absBlockedAmount(a.optString("blockedAmount")),
                                mvrBalance       = a.optString("mvrBalance"),
                                statusDesc       = a.optString("statusDesc"),
                                profileImageHash = profile.customerImage,
@@ -188,6 +189,13 @@ class MibLoginFlow(private val credentialStore: CredentialStore) {

    // ─── Helpers ─────────────────────────────────────────────────────────────

+    /** MIB returns blockedAmount as a signed decimal where negative = funds held.
+     *  Normalize to a positive magnitude so downstream code can treat it uniformly. */
+    private fun absBlockedAmount(raw: String): String {
+        val v = raw.toDoubleOrNull() ?: return raw
+        return "%.2f".format(abs(v))
+    }
+
    private fun initialKeyExchange(
        appId: String, encKey: String, sfunc: String, key2: String? = null
    ): Pair<MibSession, String> {
@@ -325,7 +333,7 @@ class MibLoginFlow(private val credentialStore: CredentialStore) {
                        accountTypeName = a.optString("accountTypeName"),
                        availableBalance = a.optString("availableBalance"),
                        currentBalance = a.optString("currentBalance"),
-                        blockedAmount = a.optString("blockedAmount"),
+                        blockedAmount = absBlockedAmount(a.optString("blockedAmount")),
                        mvrBalance = a.optString("mvrBalance"),
                        statusDesc = a.optString("statusDesc"),
                        profileImageHash = profile.customerImage,
@@ -125,6 +125,14 @@ class AccountsAdapter(
            binding.tvAccountNumber.text = display.number
            binding.tvAccountType.text   = display.typeLabel
            binding.tvBalance.text       = if (hideAmounts) maskAmount(display.balance) else display.balance
+            val blocked = display.blockedBalance
+            if (blocked != null) {
+                val shown = if (hideAmounts) maskAmount(blocked) else blocked
+                binding.tvBlocked.text       = binding.root.context.getString(R.string.account_blocked_label, shown)
+                binding.tvBlocked.visibility = View.VISIBLE
+            } else {
+                binding.tvBlocked.visibility = View.GONE
+            }
            binding.btnTransfer.setOnClickListener { onTransferClick?.invoke(account) }
            binding.root.setOnClickListener { onAccountClick(account) }
            binding.root.setOnLongClickListener {
@@ -1,3 +1,139 @@
 package sh.sar.basedbank.ui.home

-// Merged into CardsFragment
+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.databinding.FragmentCardSettingsBinding
+import sh.sar.basedbank.util.bmlapi.BmlCardParser
+
+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)?.triggerRefresh()
+        }
+
+        val updateCardList = {
+            val mibItems = (viewModel.mibCards.value ?: emptyList()).map { CardItem.Mib(it) }
+            val bmlItems = (viewModel.accounts.value ?: emptyList())
+                .filter { it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT" || it.profileType == "BML_DEBIT" }
+                .map { CardItem.Bml(it) }
+            val all = mibItems + bmlItems
+            adapter.update(all)
+            binding.loadingView.visibility = View.GONE
+            binding.swipeRefresh.isRefreshing = false
+            binding.emptyView.visibility = if (all.isEmpty()) View.VISIBLE else View.GONE
+            binding.recyclerView.visibility = if (all.isEmpty()) View.GONE else View.VISIBLE
+        }
+        viewModel.mibCards.observe(viewLifecycleOwner) { updateCardList() }
+        viewModel.accounts.observe(viewLifecycleOwner) { updateCardList() }
+
+        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<CardItem>,
+        private val context: Context
+    ) : RecyclerView.Adapter<CardSettingsAdapter.VH>() {
+
+        fun update(newCards: List<CardItem>) {
+            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 tvCardStatus: TextView = view.findViewById(R.id.tvCardStatus)
+            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(item: CardItem) {
+                when (item) {
+                    is CardItem.Mib -> {
+                        tvCardOwner.text = item.card.cardHolderName
+                        tvCardNumber.text = PayWithCardFragment.formatMasked(item.card.maskedCardNumber)
+                        tvCardType.text = item.card.cardTypeDesc
+                        val assetPath = PayWithCardFragment.cardImageAsset(item.card)
+                        if (assetPath != null) PayWithCardFragment.loadCardImage(ivCardImage, assetPath)
+                        else ivCardImage.setImageDrawable(null)
+                        PayWithCardFragment.bindCardStatus(tvCardStatus, PayWithCardFragment.mibCardStatusLabel(item.card.cardStatus))
+                        itemView.alpha = 1f
+                    }
+                    is CardItem.Bml -> {
+                        tvCardOwner.text = item.account.accountBriefName
+                        tvCardNumber.text = PayWithCardFragment.formatMasked(item.account.accountNumber)
+                        tvCardType.text = item.account.accountTypeName
+                        PayWithCardFragment.loadCardImage(ivCardImage, BmlCardParser.cardImageAsset(item.account))
+                        val isActive = item.account.statusDesc.equals("Active", ignoreCase = true)
+                        val bmlStatus = item.account.statusDesc.takeUnless { isActive }
+                        PayWithCardFragment.bindCardStatus(tvCardStatus, bmlStatus)
+                        itemView.alpha = if (isActive) 1f else 0.45f
+                    }
+                }
+                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)
+            }
+        }
+    }
+}
@@ -57,14 +57,24 @@ class DashboardFragment : Fragment() {
    }

    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        viewModel.accounts.observe(viewLifecycleOwner) { updateBalances(it) }
-        viewModel.financing.observe(viewLifecycleOwner) { updatePendingFinances() }
-        viewModel.bmlLoanDetails.observe(viewLifecycleOwner) { updatePendingFinances() }
+        viewModel.accounts.observe(viewLifecycleOwner) {
+            updateBalances(it)
+            updateAttentionRow()
+        }
+        viewModel.financing.observe(viewLifecycleOwner) {
+            updatePendingFinances()
+            updateAttentionRow()
+        }
+        viewModel.bmlLoanDetails.observe(viewLifecycleOwner) {
+            updatePendingFinances()
+            updateAttentionRow()
+        }
        viewModel.bmlLimits.observe(viewLifecycleOwner) { updateForeignLimits(it) }
        viewModel.hideAmounts.observe(viewLifecycleOwner) {
            updateBalances(viewModel.accounts.value ?: emptyList())
            updatePendingFinances()
            updateForeignLimits(viewModel.bmlLimits.value ?: emptyList())
+            updateAttentionRow()
        }

        binding.swipeRefresh.setOnRefreshListener {
@@ -76,6 +86,10 @@ class DashboardFragment : Fragment() {
            (activity as? HomeActivity)?.navigateTo(R.id.nav_finances)
        }

+        binding.cardOverdue.setOnClickListener {
+            (activity as? HomeActivity)?.navigateTo(R.id.nav_finances)
+        }
+
        val cardAdapter = DashboardCardAdapter()
        binding.rvCards.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
        binding.rvCards.adapter = cardAdapter
@@ -244,6 +258,56 @@ class DashboardFragment : Fragment() {
        }
    }

+    private fun updateAttentionRow() {
+        val hide = viewModel.hideAmounts.value ?: false
+        val accounts = viewModel.accounts.value ?: emptyList()
+
+        // Blocked: sum across CASA-style accounts (exclude cards and loans) per currency.
+        val blockedByCurrency = accounts
+            .filter { it.profileType != "BML_CREDIT" && it.profileType != "BML_PREPAID" && it.profileType != "BML_DEBIT" && it.profileType != "BML_LOAN" }
+            .mapNotNull { acc ->
+                val v = acc.blockedAmount.replace(",", "").toDoubleOrNull() ?: 0.0
+                if (v > 0.0) acc.currencyName.uppercase() to v else null
+            }
+            .groupBy({ it.first }, { it.second })
+            .mapValues { (_, vs) -> vs.sum() }
+
+        val blockedTotal = blockedByCurrency.values.sum()
+        if (blockedTotal > 0.0) {
+            // Primary line: prefer MVR if present, otherwise the first currency.
+            val primaryCcy = if ("MVR" in blockedByCurrency) "MVR" else blockedByCurrency.keys.first()
+            val primaryAmt = blockedByCurrency.getValue(primaryCcy)
+            binding.tvBlockedTotal.text = if (hide) "$primaryCcy ••••••" else "$primaryCcy %,.2f".format(primaryAmt)
+
+            val secondary = blockedByCurrency.filterKeys { it != primaryCcy }
+            if (secondary.isNotEmpty()) {
+                binding.tvBlockedSecondary.text = secondary.entries.joinToString(" · ") { (ccy, amt) ->
+                    if (hide) "$ccy ••••••" else "$ccy %,.2f".format(amt)
+                }
+                binding.tvBlockedSecondary.visibility = View.VISIBLE
+            } else {
+                binding.tvBlockedSecondary.visibility = View.GONE
+            }
+            binding.cardBlocked.visibility = View.VISIBLE
+        } else {
+            binding.cardBlocked.visibility = View.GONE
+        }
+
+        // Overdue: MIB finance deals + BML loan details (assumed MVR — matches existing Pending Finances).
+        val mibOverdue = (viewModel.financing.value ?: emptyList()).sumOf { it.overdueAmount }
+        val bmlOverdue = (viewModel.bmlLoanDetails.value ?: emptyMap()).values.sumOf { it.overdueAmount }
+        val overdueTotal = mibOverdue + bmlOverdue
+        if (overdueTotal > 0.0) {
+            binding.tvOverdueTotal.text = if (hide) "MVR ••••••" else "MVR %,.2f".format(overdueTotal)
+            binding.cardOverdue.visibility = View.VISIBLE
+        } else {
+            binding.cardOverdue.visibility = View.GONE
+        }
+
+        binding.rowAttention.visibility =
+            if (blockedTotal > 0.0 || overdueTotal > 0.0) View.VISIBLE else View.GONE
+    }
+
    private fun updatePendingFinances() {
        val hide = viewModel.hideAmounts.value ?: false
        val mibTotal = (viewModel.financing.value ?: emptyList()).sumOf { it.outstandingAmount }
@@ -287,17 +351,17 @@ class DashboardFragment : Fragment() {
                when (item) {
                    is CardItem.Mib -> {
                        tvCardOwner.text = item.card.cardHolderName
-                        tvCardNumber.text = CardsFragment.formatMasked(item.card.maskedCardNumber)
-                        val assetPath = CardsFragment.cardImageAsset(item.card)
-                        if (assetPath != null) CardsFragment.loadCardImage(ivCardImage, assetPath)
+                        tvCardNumber.text = PayWithCardFragment.formatMasked(item.card.maskedCardNumber)
+                        val assetPath = PayWithCardFragment.cardImageAsset(item.card)
+                        if (assetPath != null) PayWithCardFragment.loadCardImage(ivCardImage, assetPath)
                        else ivCardImage.setImageDrawable(null)
-                        CardsFragment.bindCardStatus(tvCardStatus, CardsFragment.mibCardStatusLabel(item.card.cardStatus))
+                        PayWithCardFragment.bindCardStatus(tvCardStatus, PayWithCardFragment.mibCardStatusLabel(item.card.cardStatus))
                    }
                    is CardItem.Bml -> {
                        tvCardOwner.text = item.account.accountBriefName
-                        tvCardNumber.text = CardsFragment.formatMasked(item.account.accountNumber)
-                        CardsFragment.loadCardImage(ivCardImage, BmlCardParser.cardImageAsset(item.account))
-                        CardsFragment.bindCardStatus(tvCardStatus, null)  // only Active BML cards reach dashboard
+                        tvCardNumber.text = PayWithCardFragment.formatMasked(item.account.accountNumber)
+                        PayWithCardFragment.loadCardImage(ivCardImage, BmlCardParser.cardImageAsset(item.account))
+                        PayWithCardFragment.bindCardStatus(tvCardStatus, null)  // only Active BML cards reach dashboard
                    }
                }
                val isMib = item is CardItem.Mib
@@ -118,18 +118,6 @@ class HomeActivity : AppCompatActivity() {
            isAppearanceLightStatusBars = isLight
            isAppearanceLightNavigationBars = isLight
        }
-        // Auth guard: HomeActivity must only be reachable after LockActivity or fresh login.
-        // Using loadSecurityHash() (EncryptedSharedPreferences) instead of plain prefs so
-        // a rooted device cannot bypass this by editing security_method in plain prefs.
-        val app = application as BasedBankApp
-        if (CredentialStore(this).loadSecurityHash() != null && !app.isUnlocked) {
-            startActivity(
-                android.content.Intent(this, sh.sar.basedbank.LockActivity::class.java)
-            )
-            finish()
-            return
-        }
-
        setSupportActionBar(binding.toolbar)

        toggle = ActionBarDrawerToggle(
@@ -159,7 +147,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    -> CardsFragment()
+                R.id.nav_pay_with_card    -> PayWithCardFragment()
+                R.id.nav_card_settings    -> CardSettingsFragment()
                else -> null
            }
            if (frag != null) show(frag)
@@ -176,6 +165,7 @@ class HomeActivity : AppCompatActivity() {
        }

        // Load data
+        val app = application as BasedBankApp
        if (app.mibAccounts.isNotEmpty() || app.bmlAccounts.isNotEmpty() || app.fahipayAccounts.isNotEmpty()) {
            // Came from fresh manual login — accounts ready, rest fetched in background
            val merged = app.mibAccounts + app.bmlAccounts + app.fahipayAccounts
@@ -228,19 +218,10 @@ class HomeActivity : AppCompatActivity() {

        viewModel.hideAmounts.value = getSharedPreferences("prefs", MODE_PRIVATE).getBoolean("hide_amounts", false)

-        // Show dashboard on first create, or navigate to shortcut destination
+        // Show dashboard on first create
        if (savedInstanceState == null) {
-            val navDest = intent.getIntExtra("nav_destination", -1)
-            val autoScan = intent.getBooleanExtra("auto_scan", false)
-            if (navDest != -1) {
-                val fragment = if (autoScan && navDest == R.id.nav_transfer)
-                    TransferFragment.newInstanceWithAutoScan()
-                else null
-                navigateTo(navDest, fragment)
-            } else {
-                show(DashboardFragment())
-                binding.navigationView.setCheckedItem(R.id.nav_dashboard)
-            }
+            show(DashboardFragment())
+            binding.navigationView.setCheckedItem(R.id.nav_dashboard)
        }

        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
@@ -378,7 +359,8 @@ fun applyNavLabelVisibility() {
            R.id.nav_finances         -> FinancingFragment()
            R.id.nav_otp              -> OtpFragment()
            R.id.nav_settings         -> SettingsFragment()
-            R.id.nav_pay_with_card    -> CardsFragment()
+            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)
@@ -25,6 +25,7 @@ object NavCustomization {
        NavItemDef(R.id.nav_transfer_history, "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,         "nav_finances",         R.drawable.ic_nav_finances,         R.string.nav_finances,         R.string.nav_desc_finances),
        NavItemDef(R.id.nav_pay_with_card,    "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_card_settings,    "nav_card_settings",    R.drawable.ic_nav_card,             R.string.nav_card_settings,    R.string.nav_desc_card_settings),
        NavItemDef(R.id.nav_otp,              "nav_otp",              R.drawable.ic_nav_otp,              R.string.nav_otp,              R.string.nav_desc_otp),
        NavItemDef(R.id.nav_settings,         "nav_settings",         R.drawable.ic_nav_settings,         R.string.nav_settings,         R.string.nav_desc_settings),
    )
@@ -3,14 +3,13 @@ package sh.sar.basedbank.ui.home
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.graphics.Color
+import android.graphics.BitmapFactory
 import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
@@ -19,25 +18,20 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.PagerSnapHelper
 import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.color.MaterialColors
 import sh.sar.basedbank.R
+import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.api.mib.MibCard
-import sh.sar.basedbank.databinding.FragmentCardsBinding
+import sh.sar.basedbank.databinding.FragmentPayWithCardBinding
 import sh.sar.basedbank.util.CardsCache
 import sh.sar.basedbank.util.bmlapi.BmlCardParser
-import kotlin.math.abs

-class CardsFragment : Fragment() {
+class PayWithCardFragment : Fragment() {

-    private var _binding: FragmentCardsBinding? = null
+    private var _binding: FragmentPayWithCardBinding? = null
    private val binding get() = _binding!!
    private val viewModel: HomeViewModel by activityViewModels()

-    private var cards: List<CardItem> = emptyList()
-    private var currentCardPosition: Int = 0
-    private var cardWidth: Int = 0
    private var pendingQrAccountNumber: String? = null

    private val qrLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
@@ -55,67 +49,39 @@ class CardsFragment : Fragment() {
    }

    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        _binding = FragmentCardsBinding.inflate(inflater, container, false)
+        _binding = FragmentPayWithCardBinding.inflate(inflater, container, false)
        return binding.root
    }

    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val screenW = resources.displayMetrics.widthPixels
-        val peekPx = screenW / 8
-        cardWidth = screenW - 2 * peekPx
+        val adapter = CardWalletAdapter(emptyList(), requireContext())
+        binding.recyclerView.layoutManager = LinearLayoutManager(requireContext())
+        binding.recyclerView.adapter = adapter

-        val stackAdapter = CardStackAdapter(cardWidth)
-        binding.rvCards.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
-        binding.rvCards.adapter = stackAdapter
-        binding.rvCards.setPadding(peekPx, 0, peekPx, 0)
-        binding.rvCards.clipToPadding = false
-
-        val snapHelper = PagerSnapHelper()
-        snapHelper.attachToRecyclerView(binding.rvCards)
-
-        binding.rvCards.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                applyCardScales()
-            }
-            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
-                if (newState == RecyclerView.SCROLL_STATE_IDLE) {
-                    val lm = recyclerView.layoutManager ?: return
-                    val snapView = snapHelper.findSnapView(lm) ?: return
-                    val position = lm.getPosition(snapView)
-                    if (position >= 0) {
-                        currentCardPosition = position
-                        buildDots(cards.size, position)
-                        updateCardInfo(position)
-                    }
-                    applyCardScales()
-                }
-            }
-        })
-
-ViewCompat.setOnApplyWindowInsetsListener(binding.contentLayout) { v, insets ->
-            val isBottomNav = requireContext().getSharedPreferences("prefs", Context.MODE_PRIVATE)
-                .getBoolean("bottom_nav", false)
+        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(0, 0, 0, (16 * resources.displayMetrics.density).toInt() + extraBottom)
+            v.setPadding(v.paddingLeft, v.paddingTop, v.paddingRight, bottomPaddingBase + extraBottom)
            insets
        }

+        binding.swipeRefresh.setOnRefreshListener {
+            (activity as? HomeActivity)?.triggerRefresh()
+        }
+
        val updateCardList = {
            val mibItems = (viewModel.mibCards.value ?: emptyList()).map { CardItem.Mib(it) }
            val bmlItems = (viewModel.accounts.value ?: emptyList())
-                .filter { it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT" || it.profileType == "BML_DEBIT" }
+                .filter { (it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT" || it.profileType == "BML_DEBIT") && it.statusDesc.equals("Active", ignoreCase = true) }
                .map { CardItem.Bml(it) }
-            cards = mibItems + bmlItems
-            stackAdapter.update(cards)
+            val all = mibItems + bmlItems
+            adapter.update(all)
            binding.loadingView.visibility = View.GONE
-            val empty = cards.isEmpty()
-            binding.emptyView.visibility = if (empty) View.VISIBLE else View.GONE
-            binding.contentLayout.visibility = if (empty) View.GONE else View.VISIBLE
-            if (!empty) {
-                buildDots(cards.size, currentCardPosition)
-                updateCardInfo(currentCardPosition)
-            }
+            binding.swipeRefresh.isRefreshing = false
+            binding.emptyView.visibility = if (all.isEmpty()) View.VISIBLE else View.GONE
+            binding.recyclerView.visibility = if (all.isEmpty()) View.GONE else View.VISIBLE
        }
        viewModel.mibCards.observe(viewLifecycleOwner) { updateCardList() }
        viewModel.accounts.observe(viewLifecycleOwner) { updateCardList() }
@@ -127,84 +93,6 @@ ViewCompat.setOnApplyWindowInsetsListener(binding.contentLayout) { v, insets ->
            binding.loadingView.visibility = View.VISIBLE
        }
        (activity as? HomeActivity)?.triggerRefreshCards()
-
-        binding.btnScanToPay.setOnClickListener {
-            val item = cards.getOrNull(currentCardPosition) ?: return@setOnClickListener
-            if (item is CardItem.Mib) {
-                Toast.makeText(requireContext(), R.string.mib_qr_nfc_not_supported, Toast.LENGTH_SHORT).show()
-            } else {
-                pendingQrAccountNumber = (item as CardItem.Bml).account.accountNumber
-                qrLauncher.launch(Intent(requireContext(), QrScannerActivity::class.java))
-            }
-        }
-
-        val nfcAvailable = android.nfc.NfcAdapter.getDefaultAdapter(requireContext()) != null
-        binding.btnTapToPay.isEnabled = nfcAvailable
-        binding.btnTapToPay.setOnClickListener {
-            val item = cards.getOrNull(currentCardPosition) ?: return@setOnClickListener
-            val msg = if (item is CardItem.Mib) R.string.mib_qr_nfc_not_supported else R.string.work_in_progress
-            Toast.makeText(requireContext(), msg, Toast.LENGTH_SHORT).show()
-        }
-
-        val wip = View.OnClickListener {
-            Toast.makeText(requireContext(), R.string.work_in_progress, Toast.LENGTH_SHORT).show()
-        }
-        binding.btnChangePin.setOnClickListener(wip)
-        binding.btnFreeze.setOnClickListener(wip)
-        binding.btnBlock.setOnClickListener(wip)
-    }
-
-    private fun applyCardScales() {
-        val rv = binding.rvCards
-        val rvCenter = rv.paddingStart + (rv.width - rv.paddingStart - rv.paddingEnd) / 2f
-        val lm = rv.layoutManager as? LinearLayoutManager ?: return
-        val first = lm.findFirstVisibleItemPosition()
-        val last = lm.findLastVisibleItemPosition()
-        if (first < 0) return
-        for (i in first..last) {
-            val child = lm.findViewByPosition(i) ?: continue
-            val childCenter = (child.left + child.right) / 2f
-            val fraction = (abs(childCenter - rvCenter) / cardWidth.toFloat()).coerceIn(0f, 1f)
-            val scale = 1f - 0.18f * fraction
-            child.scaleX = scale
-            child.scaleY = scale
-            child.alpha = 1f - 0.4f * fraction
-        }
-    }
-
-    private fun buildDots(count: Int, selected: Int) {
-        binding.pageIndicator.removeAllViews()
-        if (count <= 1) {
-            binding.pageIndicator.visibility = View.GONE
-            return
-        }
-        binding.pageIndicator.visibility = View.VISIBLE
-        val dp = resources.displayMetrics.density
-        val activeColor = MaterialColors.getColor(
-            requireContext(), com.google.android.material.R.attr.colorPrimary, Color.GRAY)
-        val inactiveColor = MaterialColors.getColor(
-            requireContext(), com.google.android.material.R.attr.colorOutlineVariant, Color.LTGRAY)
-        val size = (8 * dp).toInt()
-        val margin = (4 * dp).toInt()
-        repeat(count) { i ->
-            val dot = View(requireContext())
-            dot.layoutParams = LinearLayout.LayoutParams(size, size).apply {
-                setMargins(margin, 0, margin, 0)
-            }
-            dot.background = GradientDrawable().apply {
-                shape = GradientDrawable.OVAL
-                setColor(if (i == selected) activeColor else inactiveColor)
-            }
-            binding.pageIndicator.addView(dot)
-        }
-    }
-
-    private fun updateCardInfo(position: Int) {
-        val item = cards.getOrNull(position) ?: return
-        binding.tvSelectedCardType.text = when (item) {
-            is CardItem.Mib -> item.card.cardTypeDesc
-            is CardItem.Bml -> item.account.accountTypeName
-        }
    }

    override fun onResume() {
@@ -217,78 +105,83 @@ ViewCompat.setOnApplyWindowInsetsListener(binding.contentLayout) { v, insets ->
        _binding = null
    }

-    private inner class CardStackAdapter(private val cardWidth: Int) : RecyclerView.Adapter<CardStackAdapter.VH>() {
-        private var items: List<CardItem> = emptyList()
+    private inner class CardWalletAdapter(
+        private var cards: List<CardItem>,
+        private val context: Context
+    ) : RecyclerView.Adapter<CardWalletAdapter.VH>() {

-        fun update(newItems: List<CardItem>) {
-            items = newItems
+        fun update(newCards: List<CardItem>) {
+            cards = newCards
            notifyDataSetChanged()
        }

-        override fun getItemCount() = items.size
-
        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH =
-            VH(LayoutInflater.from(parent.context).inflate(R.layout.item_card_stack, parent, false))
+            VH(LayoutInflater.from(context).inflate(R.layout.item_card_wallet, parent, false))

-        override fun onBindViewHolder(holder: VH, position: Int) {
-            holder.bind(items[position])
-            // Pre-scale based on data position so initial render and off-screen cards are correct
-            val fraction = abs(position - currentCardPosition).toFloat().coerceIn(0f, 1f)
-            val scale = 1f - 0.18f * fraction
-            holder.itemView.scaleX = scale
-            holder.itemView.scaleY = scale
-            holder.itemView.alpha = 1f - 0.4f * fraction
-        }
+        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 tvCardStatus: TextView = view.findViewById(R.id.tvCardStatus)
-
-            init {
-                itemView.layoutParams = RecyclerView.LayoutParams(cardWidth, RecyclerView.LayoutParams.WRAP_CONTENT)
-            }
+            private val btnPayQr: View = view.findViewById(R.id.btnPayQr)
+            private val btnPayNfc: View = view.findViewById(R.id.btnPayNfc)

            fun bind(item: CardItem) {
                when (item) {
                    is CardItem.Mib -> {
                        tvCardOwner.text = item.card.cardHolderName
                        tvCardNumber.text = formatMasked(item.card.maskedCardNumber)
+                        tvCardType.text = item.card.cardTypeDesc
                        val assetPath = cardImageAsset(item.card)
                        if (assetPath != null) loadCardImage(ivCardImage, assetPath)
                        else ivCardImage.setImageDrawable(null)
                        bindCardStatus(tvCardStatus, mibCardStatusLabel(item.card.cardStatus))
-                        itemView.alpha = 1f
                    }
                    is CardItem.Bml -> {
                        tvCardOwner.text = item.account.accountBriefName
                        tvCardNumber.text = formatMasked(item.account.accountNumber)
+                        tvCardType.text = item.account.accountTypeName
                        loadCardImage(ivCardImage, BmlCardParser.cardImageAsset(item.account))
-                        val isActive = item.account.statusDesc.equals("Active", ignoreCase = true)
-                        bindCardStatus(tvCardStatus, item.account.statusDesc.takeUnless { isActive })
-                        itemView.alpha = if (isActive) 1f else 0.45f
+                        val bmlStatus = item.account.statusDesc.takeUnless { it.equals("Active", ignoreCase = true) }
+                        bindCardStatus(tvCardStatus, bmlStatus)
                    }
                }
+                val isMib = item is CardItem.Mib
+                btnPayQr.setOnClickListener {
+                    if (isMib) {
+                        Toast.makeText(context, R.string.mib_qr_nfc_not_supported, Toast.LENGTH_SHORT).show()
+                    } else {
+                        pendingQrAccountNumber = (item as CardItem.Bml).account.accountNumber
+                        qrLauncher.launch(Intent(requireContext(), QrScannerActivity::class.java))
+                    }
+                }
+                val nfcAdapter = android.nfc.NfcAdapter.getDefaultAdapter(context)
+                val nfcSupported = nfcAdapter != null
+                btnPayNfc.isEnabled = nfcSupported
+                btnPayNfc.setOnClickListener {
+                    val msg = if (isMib) R.string.mib_qr_nfc_not_supported else R.string.work_in_progress
+                    Toast.makeText(context, msg, Toast.LENGTH_SHORT).show()
+                }
            }
        }
    }

    companion object {
        fun cardImageAsset(card: MibCard): String? = when (card.cardType) {
-            "51" -> "cards/mib/faisa.png"
            "53" -> "cards/mib/visa_black_platinum.png"
            "57" -> "cards/mib/visa_blue_everyday.png"
            "70" -> "cards/mib/visa_business.png"
-            "701" -> "cards/mib/visa_bingaa_mvr.png"
-            "702" -> "cards/mib/visa_bingaa_usd.png"
            else -> null
        }

        fun loadCardImage(imageView: ImageView, assetPath: String) {
            try {
                val bitmap = imageView.context.assets.open(assetPath).use {
-                    android.graphics.BitmapFactory.decodeStream(it)
+                    BitmapFactory.decodeStream(it)
                }
                imageView.setImageBitmap(bitmap)
            } catch (_: Exception) {
@@ -297,8 +190,8 @@ ViewCompat.setOnApplyWindowInsetsListener(binding.contentLayout) { v, insets ->
        }

        fun mibCardStatusLabel(cardStatus: String): String? = when (cardStatus) {
-            "CHST0" -> null
-            else -> cardStatus
+            "CHST0" -> null   // Active — no badge
+            else    -> cardStatus
        }

        fun bindCardStatus(tv: TextView, statusLabel: String?) {
@@ -37,10 +37,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import sh.sar.basedbank.BasedBankApp
 import sh.sar.basedbank.R
 import sh.sar.basedbank.databinding.ActivityQrScannerBinding
-import sh.sar.basedbank.util.CredentialStore
 import java.util.concurrent.Executors

 class QrScannerActivity : AppCompatActivity() {
@@ -97,14 +95,6 @@ class QrScannerActivity : AppCompatActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-
-        if (CredentialStore(this).loadSecurityHash() != null &&
-            !(application as BasedBankApp).isUnlocked) {
-            startActivity(Intent(this, sh.sar.basedbank.LockActivity::class.java))
-            finish()
-            return
-        }
-
        WindowCompat.setDecorFitsSystemWindows(window, false)
        binding = ActivityQrScannerBinding.inflate(layoutInflater)
        setContentView(binding.root)
@@ -151,11 +151,6 @@ class TransferFragment : Fragment() {
        private const val ARG_AMOUNT_PREFILL = "amount_prefill"
        private const val ARG_REMARKS_PREFILL = "remarks_prefill"
        private const val ARG_BML_QR_URL = "bml_qr_url"
-        private const val ARG_AUTO_SCAN = "auto_scan"
-
-        fun newInstanceWithAutoScan() = TransferFragment().apply {
-            arguments = Bundle().apply { putBoolean(ARG_AUTO_SCAN, true) }
-        }

        fun newInstanceFromBmlQr(qrUrl: String, fromAccountNumber: String? = null) = TransferFragment().apply {
            arguments = Bundle().apply {
@@ -258,10 +253,6 @@ class TransferFragment : Fragment() {
        arguments?.getString(ARG_REMARKS_PREFILL)?.let { binding.etRemarks.setText(it) }

        arguments?.getString(ARG_BML_QR_URL)?.let { lookupBmlQrMerchant(it) }
-
-        if (arguments?.getBoolean(ARG_AUTO_SCAN, false) == true) {
-            qrLauncher.launch(Intent(requireContext(), QrScannerActivity::class.java))
-        }
    }

    private fun lookupBmlQrMerchant(qrUrl: String) {
@@ -215,7 +215,6 @@ class CredentialsFragment : Fragment() {
                app.mibSessions[loginId] = flow.lastSession!!
                app.mibProfilesMap[loginId] = flow.lastProfiles
                app.mibLoginFlows[loginId] = flow
-                app.isUnlocked = true
                val intent = Intent(requireContext(), HomeActivity::class.java)
                intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
                startActivity(intent)
@@ -365,7 +364,6 @@ class CredentialsFragment : Fragment() {
        if (hasBusinessProfiles) {
            Toast.makeText(requireContext(), "Business profiles can be enabled in Settings → Logins", Toast.LENGTH_LONG).show()
        }
-        (requireActivity().application as BasedBankApp).isUnlocked = true
        val intent = Intent(requireContext(), HomeActivity::class.java)
        intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
        startActivity(intent)
@@ -498,7 +496,6 @@ class CredentialsFragment : Fragment() {
        app.fahipaySessions[loginId] = session
        app.fahipayAccounts = app.fahipayAccounts.filter { it.loginTag != loginTag } + listOf(account)
        app.accounts = app.accounts.filter { it.loginTag != loginTag } + listOf(account)
-        app.isUnlocked = true
        val intent = Intent(requireContext(), HomeActivity::class.java)
        intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
        startActivity(intent)
@@ -1,14 +1,10 @@
 package sh.sar.basedbank.ui.login

-import android.content.Intent
 import android.content.res.Configuration
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.WindowCompat
-import sh.sar.basedbank.BasedBankApp
-import sh.sar.basedbank.LockActivity
 import sh.sar.basedbank.databinding.ActivityLoginBinding
-import sh.sar.basedbank.util.CredentialStore

 class LoginActivity : AppCompatActivity() {

@@ -16,16 +12,6 @@ class LoginActivity : AppCompatActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-
-        // If security is configured and the user hasn't unlocked this session,
-        // they must authenticate first before being able to add more accounts.
-        val app = application as BasedBankApp
-        if (CredentialStore(this).loadSecurityHash() != null && !app.isUnlocked) {
-            startActivity(Intent(this, LockActivity::class.java))
-            finish()
-            return
-        }
-
        WindowCompat.setDecorFitsSystemWindows(window, false)
        binding = ActivityLoginBinding.inflate(layoutInflater)
        setContentView(binding.root)
@@ -13,12 +13,9 @@ import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayoutMediator
-import sh.sar.basedbank.BasedBankApp
-import sh.sar.basedbank.LockActivity
 import sh.sar.basedbank.R
 import sh.sar.basedbank.databinding.ActivityOnboardingBinding
 import sh.sar.basedbank.ui.login.LoginActivity
-import sh.sar.basedbank.util.CredentialStore

 class OnboardingActivity : AppCompatActivity(), SecuritySetupFragment.Callback {

@@ -28,15 +25,6 @@ class OnboardingActivity : AppCompatActivity(), SecuritySetupFragment.Callback {

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-
-        // If security is already configured, onboarding is complete. Redirect to lock screen
-        // to prevent overwriting an existing PIN/pattern via direct activity launch.
-        if (CredentialStore(this).loadSecurityHash() != null) {
-            startActivity(Intent(this, LockActivity::class.java))
-            finish()
-            return
-        }
-
        WindowCompat.setDecorFitsSystemWindows(window, false)
        binding = ActivityOnboardingBinding.inflate(layoutInflater)
        setContentView(binding.root)
@@ -5,6 +5,7 @@ data class AccountListDisplay(
    val number: String,
    val typeLabel: String,
    val balance: String,
+    val blockedBalance: String? = null, // null when zero or not applicable
    val isCard: Boolean = false,
    val cardBrandIcon: Int = 0,       // drawable res, only meaningful if isCard
    val statusLabel: String? = null   // null = active; shown as status pill if set
@@ -26,11 +26,13 @@ object BmlDashboardParser {
                statusLabel   = if (isActive) null else account.statusDesc
            )
        } else {
+            val blocked = account.blockedAmount.toDoubleOrNull() ?: 0.0
            AccountListDisplay(
-                name      = account.accountBriefName,
-                number    = account.accountNumber,
-                typeLabel = productLabel(account.accountTypeName),
-                balance   = listBalance(account)
+                name           = account.accountBriefName,
+                number         = account.accountNumber,
+                typeLabel      = productLabel(account.accountTypeName),
+                balance        = listBalance(account),
+                blockedBalance = if (blocked > 0.0) "${account.currencyName} ${account.blockedAmount}" else null
            )
        }
    }
@@ -52,9 +54,9 @@ object BmlDashboardParser {
        }
    }

-    /** Balance shown in the accounts list — ledger (working) balance for BML CASA. */
+    /** Balance shown in the accounts list — available balance, consistent with transfer/contact picker. */
    fun listBalance(account: BankAccount): String =
-        "${account.currencyName} ${account.currentBalance}"
+        "${account.currencyName} ${account.availableBalance}"

    fun cardBrandIcon(productName: String): Int = when {
        productName.contains("AMEX", ignoreCase = true) ||
@@ -5,12 +5,16 @@ import sh.sar.basedbank.util.AccountListDisplay

 object MibAccountParser {

-    fun displayData(account: BankAccount) = AccountListDisplay(
-        name      = account.accountBriefName,
-        number    = account.accountNumber,
-        typeLabel = productLabel(account.accountTypeName),
-        balance   = "${account.currencyName} ${account.availableBalance}"
-    )
+    fun displayData(account: BankAccount): AccountListDisplay {
+        val blocked = account.blockedAmount.toDoubleOrNull() ?: 0.0
+        return AccountListDisplay(
+            name           = account.accountBriefName,
+            number         = account.accountNumber,
+            typeLabel      = productLabel(account.accountTypeName),
+            balance        = "${account.currencyName} ${account.availableBalance}",
+            blockedBalance = if (blocked > 0.0) "${account.currencyName} ${account.blockedAmount}" else null
+        )
+    }

    /**
     * Returns a display-ready product label for a MIB (Faisanet) account type name.
@@ -5,13 +5,16 @@ import sh.sar.basedbank.util.AccountHistoryDisplay

 object MibHistoryParser {

-    fun displayData(account: BankAccount) = AccountHistoryDisplay(
-        name             = account.accountBriefName,
-        number           = account.accountNumber,
-        bankPill         = null,   // MIB has no bank pill
-        typeLabel        = MibAccountParser.productLabel(account.accountTypeName),
-        availableBalance = "${account.currencyName} ${account.availableBalance}",
-        workingBalance   = "${account.currencyName} ${account.currentBalance}",
-        blockedBalance   = null
-    )
+    fun displayData(account: BankAccount): AccountHistoryDisplay {
+        val blocked = account.blockedAmount.toDoubleOrNull() ?: 0.0
+        return AccountHistoryDisplay(
+            name             = account.accountBriefName,
+            number           = account.accountNumber,
+            bankPill         = null,   // MIB has no bank pill
+            typeLabel        = MibAccountParser.productLabel(account.accountTypeName),
+            availableBalance = "${account.currencyName} ${account.availableBalance}",
+            workingBalance   = "${account.currencyName} ${account.currentBalance}",
+            blockedBalance   = if (blocked > 0.0) "${account.currencyName} ${account.blockedAmount}" else null
+        )
+    }
 }
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/seed_primary" />
-    <foreground android:drawable="@drawable/ic_shortcut_pay_card_fg" />
-    <monochrome android:drawable="@drawable/ic_shortcut_pay_card_fg" />
-</adaptive-icon>
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <group
-        android:translateX="30"
-        android:translateY="30"
-        android:scaleX="2"
-        android:scaleY="2">
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M20,4H4C2.89,4 2.01,4.89 2.01,6L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2V6C22,4.89 21.11,4 20,4zM20,18H4v-6h16V18zM20,8H4V6h16V8z" />
-    </group>
-</vector>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/seed_primary" />
-    <foreground android:drawable="@drawable/ic_shortcut_scan_qr_fg" />
-    <monochrome android:drawable="@drawable/ic_shortcut_scan_qr_fg" />
-</adaptive-icon>
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <group
-        android:translateX="30"
-        android:translateY="30"
-        android:scaleX="2"
-        android:scaleY="2">
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M9.5,6.5v3h-3v-3H9.5zM11,5L5,5v5.5h6L11,5zM9.5,14.5v3h-3v-3H9.5zM11,13L5,13v5.5h6L11,13zM17.5,6.5v3h-3v-3H17.5zM19,5h-6v5.5h6L19,5zM13,13h1.5v1.5L13,14.5zM14.5,14.5L16,14.5L16,16h-1.5zM16,13h1.5v1.5L16,14.5zM13,16h1.5v1.5L13,17.5zM14.5,17.5L16,17.5L16,19h-1.5zM16,16h1.5v1.5L16,17.5zM17.5,14.5L19,14.5L19,16h-1.5zM17.5,17.5L19,17.5L19,19h-1.5z" />
-    </group>
-</vector>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/seed_primary" />
-    <foreground android:drawable="@drawable/ic_shortcut_transfer_fg" />
-    <monochrome android:drawable="@drawable/ic_shortcut_transfer_fg" />
-</adaptive-icon>
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <group
-        android:translateX="30"
-        android:translateY="30"
-        android:scaleX="2"
-        android:scaleY="2">
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
-    </group>
-</vector>
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/colorSurface">
-
-        <!-- Main content when cards exist -->
-        <LinearLayout
-            android:id="@+id/contentLayout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:visibility="gone">
-
-            <!-- Top spacer: pushes card to vertical center -->
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
-
-            <!-- Horizontal card stack. Width/padding set programmatically for centering + peek. -->
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/rvCards"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:clipToPadding="false"
-                android:overScrollMode="never" />
-
-            <!-- Page indicator dots -->
-            <LinearLayout
-                android:id="@+id/pageIndicator"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:orientation="horizontal"
-                android:paddingTop="12dp"
-                android:paddingBottom="2dp" />
-
-            <!-- Selected card type / product name -->
-            <TextView
-                android:id="@+id/tvSelectedCardType"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:paddingHorizontal="16dp"
-                android:paddingTop="6dp"
-                android:paddingBottom="2dp"
-                android:textAppearance="?attr/textAppearanceLabelLarge"
-                android:textColor="?attr/colorOnSurfaceVariant" />
-
-            <!-- Flexible spacer: absorbs remaining space, pushes buttons to bottom -->
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
-
-            <!-- Divider -->
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginHorizontal="24dp"
-                android:layout_marginBottom="4dp"
-                android:background="?attr/colorOutlineVariant" />
-
-            <!-- Primary pay actions -->
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingHorizontal="16dp"
-                android:paddingTop="8dp"
-                android:paddingBottom="4dp">
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnScanToPay"
-                    style="@style/Widget.Material3.Button.TonalButton"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:minWidth="0dp"
-                    android:minHeight="0dp"
-                    android:paddingTop="14dp"
-                    android:paddingBottom="14dp"
-                    android:text="@string/card_pay_qr"
-                    android:textSize="13sp"
-                    app:icon="@drawable/ic_qr_scan"
-                    app:iconSize="22dp"
-                    app:iconGravity="top"
-                    app:iconPadding="6dp" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnTapToPay"
-                    style="@style/Widget.Material3.Button.TonalButton"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:minWidth="0dp"
-                    android:minHeight="0dp"
-                    android:paddingTop="14dp"
-                    android:paddingBottom="14dp"
-                    android:text="@string/card_pay_nfc"
-                    android:textSize="13sp"
-                    app:icon="@drawable/ic_nfc"
-                    app:iconSize="22dp"
-                    app:iconGravity="top"
-                    app:iconPadding="6dp" />
-
-            </LinearLayout>
-
-            <!-- Secondary card management actions -->
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingHorizontal="8dp"
-                android:paddingTop="4dp"
-                android:paddingBottom="8dp">
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnChangePin"
-                    style="@style/Widget.Material3.Button.TextButton"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="wrap_content"
-                    android:minWidth="0dp"
-                    android:minHeight="0dp"
-                    android:text="@string/card_action_change_pin"
-                    android:textSize="11sp"
-                    app:icon="@drawable/ic_edit"
-                    app:iconSize="16dp"
-                    app:iconPadding="3dp" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnFreeze"
-                    style="@style/Widget.Material3.Button.TextButton"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="wrap_content"
-                    android:minWidth="0dp"
-                    android:minHeight="0dp"
-                    android:text="@string/card_action_freeze"
-                    android:textSize="11sp"
-                    app:icon="@drawable/ic_freeze"
-                    app:iconSize="16dp"
-                    app:iconPadding="3dp" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnBlock"
-                    style="@style/Widget.Material3.Button.TextButton"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="wrap_content"
-                    android:minWidth="0dp"
-                    android:minHeight="0dp"
-                    android:text="@string/card_action_block"
-                    android:textSize="11sp"
-                    app:icon="@drawable/ic_block"
-                    app:iconSize="16dp"
-                    app:iconPadding="3dp" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <!-- Loading state -->
-        <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>
-
-        <!-- Empty state -->
-        <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>
@@ -176,6 +176,103 @@

        </LinearLayout>

+        <!-- Attention row: Blocked + Overdue (hidden when nothing applies) -->
+        <LinearLayout
+            android:id="@+id/rowAttention"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="16dp"
+            android:visibility="gone">
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/cardBlocked"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginEnd="8dp"
+                app:cardElevation="1dp"
+                app:cardCornerRadius="12dp"
+                app:cardBackgroundColor="?attr/colorErrorContainer"
+                android:visibility="gone">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="16dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/dashboard_blocked"
+                        android:textAppearance="?attr/textAppearanceLabelSmall"
+                        android:textColor="?attr/colorOnErrorContainer" />
+
+                    <TextView
+                        android:id="@+id/tvBlockedTotal"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:text="MVR —"
+                        android:textAppearance="?attr/textAppearanceTitleMedium"
+                        android:textColor="?attr/colorOnErrorContainer" />
+
+                    <TextView
+                        android:id="@+id/tvBlockedSecondary"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:textAppearance="?attr/textAppearanceLabelSmall"
+                        android:textColor="?attr/colorOnErrorContainer"
+                        android:alpha="0.75"
+                        android:visibility="gone" />
+
+                </LinearLayout>
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/cardOverdue"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginStart="8dp"
+                app:cardElevation="1dp"
+                app:cardCornerRadius="12dp"
+                app:cardBackgroundColor="?attr/colorErrorContainer"
+                android:clickable="true"
+                android:focusable="true"
+                android:visibility="gone">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="16dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/dashboard_overdue"
+                        android:textAppearance="?attr/textAppearanceLabelSmall"
+                        android:textColor="?attr/colorOnErrorContainer" />
+
+                    <TextView
+                        android:id="@+id/tvOverdueTotal"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:text="MVR —"
+                        android:textAppearance="?attr/textAppearanceTitleMedium"
+                        android:textColor="?attr/colorOnErrorContainer" />
+
+                </LinearLayout>
+
+            </com.google.android.material.card.MaterialCardView>
+
+        </LinearLayout>
+
        <!-- Pending Finances card -->
        <com.google.android.material.card.MaterialCardView
            android:id="@+id/cardPendingFinances"
@@ -72,6 +72,15 @@
                android:textAppearance="?attr/textAppearanceTitleSmall"
                android:textColor="?attr/colorOnSurface" />

+            <TextView
+                android:id="@+id/tvBlocked"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:textAppearance="?attr/textAppearanceLabelSmall"
+                android:textColor="?attr/colorError"
+                android:visibility="gone" />
+
            <ImageButton
                android:id="@+id/btnTransfer"
                android:layout_width="40dp"
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginHorizontal="6dp"
-    app:cardCornerRadius="16dp"
-    app:cardElevation="6dp">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:id="@+id/ivCardImage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:scaleType="fitCenter"
-            android:adjustViewBounds="true"
-            android:contentDescription="@string/nav_pay_with_card" />
-
-        <!-- Bottom gradient for text legibility -->
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:layout_gravity="bottom"
-            android:background="@drawable/bg_card_overlay_gradient" />
-
-        <!-- Status badge (top-right) -->
-        <TextView
-            android:id="@+id/tvCardStatus"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top|end"
-            android:layout_margin="8dp"
-            android:paddingStart="6dp"
-            android:paddingEnd="6dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:textSize="9sp"
-            android:textColor="#FFFFFF"
-            android:textStyle="bold"
-            android:visibility="gone" />
-
-        <!-- Card owner name + masked number (bottom-left) -->
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|start"
-            android:orientation="vertical"
-            android:padding="12dp">
-
-            <TextView
-                android:id="@+id/tvCardOwner"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?attr/textAppearanceLabelMedium"
-                android:textColor="#FFFFFF"
-                android:textStyle="bold"
-                android:shadowColor="#80000000"
-                android:shadowDx="1"
-                android:shadowDy="1"
-                android:shadowRadius="3" />
-
-            <TextView
-                android:id="@+id/tvCardNumber"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:textAppearance="?attr/textAppearanceBodySmall"
-                android:textColor="#CCFFFFFF"
-                android:fontFamily="monospace" />
-
-        </LinearLayout>
-
-    </FrameLayout>
-
-</com.google.android.material.card.MaterialCardView>
@@ -32,6 +32,9 @@
        <item android:id="@+id/nav_pay_with_card"
            android:icon="@drawable/ic_nav_card"
            android:title="@string/nav_pay_with_card" />
+        <item android:id="@+id/nav_card_settings"
+            android:icon="@drawable/ic_nav_card"
+            android:title="@string/nav_card_settings" />
    </group>

    <group android:id="@+id/group_system" android:checkableBehavior="single">
@@ -15,6 +15,9 @@
    <item android:id="@+id/nav_pay_with_card"
        android:icon="@drawable/ic_nav_card"
        android:title="@string/nav_pay_with_card" />
+    <item android:id="@+id/nav_card_settings"
+        android:icon="@drawable/ic_nav_card"
+        android:title="@string/nav_card_settings" />
    <item android:id="@+id/nav_otp"
        android:icon="@drawable/ic_nav_otp"
        android:title="@string/nav_otp" />
@@ -72,8 +72,7 @@
    <string name="nav_activities">ހަރަކާތްތައް</string>
    <string name="nav_transfer_history">ޓްރާންސެކްޝަން ތާރީހް</string>
    <string name="nav_finances">ފައިނޭންސް</string>
-    <string name="nav_pay_with_card">ކާޑްތައް</string>
-    <string name="nav_desc_pay_with_card">ކާޑް މެނޭޖްކޮށް ފައިސާ ދައްކާ</string>
+    <string name="nav_card_settings">ކާޑް ސެޓިންގ</string>
    <string name="nav_settings">ސެޓިންގ</string>
    <string name="nav_desc_accounts">ހުރިހާ ބޭންކް އެކައުންޓްތައް ބަލާ</string>
    <string name="nav_desc_contacts">ޓްރާންސްފަ ކޮންޓެކްޓްތައް މެނޭޖް ކުރޭ</string>
@@ -82,6 +81,8 @@
    <string name="nav_desc_activities">ފަހުގެ ޓްރާންސްފަތައް ބަލާ</string>
    <string name="nav_desc_transfer_history">އެކައުންޓް ތަކުގެ ޓްރާންސެކްޝަން ތާރީހް</string>
    <string name="nav_desc_finances">ލޯން އަދި ފައިނޭންސިންގ</string>
+    <string name="nav_desc_pay_with_card">ކާޑް ބޭނުންކޮށް ފައިސާ ދައްކާ</string>
+    <string name="nav_desc_card_settings">ކާޑް ސެޓިންގ މެނޭޖް ކުރޭ</string>
    <string name="nav_desc_otp">OTP ކޯޑް ތައްޔާރު ކުރޭ</string>
    <string name="nav_desc_settings">އެޕްލިކޭޝަންގެ ތަރުތީބު</string>
    <string name="nav_open_drawer">ނެވިގޭޝަން ހުޅުވާ</string>
@@ -93,7 +93,8 @@
    <string name="nav_desc_activities">View your recent transfers</string>
    <string name="nav_desc_transfer_history">Full transaction history by account</string>
    <string name="nav_desc_finances">Loans and financing overview</string>
-    <string name="nav_desc_pay_with_card">Manage and pay with your cards</string>
+    <string name="nav_desc_pay_with_card">Make a payment using your card</string>
+    <string name="nav_desc_card_settings">Manage your card preferences</string>
    <string name="nav_desc_otp">Generate OTP codes for authentication</string>
    <string name="nav_desc_settings">App preferences and configuration</string>
    <string name="nav_open_drawer">Open navigation</string>
@@ -208,6 +209,9 @@
    <string name="accounts">Accounts</string>
    <string name="cards">Cards</string>
    <string name="available_balance">Available Balance</string>
+    <string name="account_blocked_label">%1$s blocked</string>
+    <string name="dashboard_blocked">Blocked Funds</string>
+    <string name="dashboard_overdue">Overdue Financing</string>

    <!-- Transfer -->
    <string name="transfer_tab_quick">Quick Transfer</string>
@@ -310,9 +314,9 @@
    <string name="loan_rate_fmt">%.2f%%</string>

    <!-- Cards -->
-    <string name="nav_pay_with_card">Cards</string>
-    <string name="card_pay_qr">Scan to Pay</string>
-    <string name="card_pay_nfc">Tap to Pay</string>
+    <string name="nav_pay_with_card">Pay with Card</string>
+    <string name="card_pay_qr">QR Pay</string>
+    <string name="card_pay_nfc">NFC Pay</string>
    <string name="mib_qr_nfc_not_supported">Skill issue on MIB side, Not supported</string>
    <string name="card_action_change_pin">Change PIN</string>
    <string name="card_action_freeze">Freeze</string>
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <shortcut
-        android:shortcutId="transfer"
-        android:enabled="true"
-        android:icon="@drawable/ic_shortcut_transfer"
-        android:shortcutShortLabel="@string/transfer"
-        android:shortcutLongLabel="@string/transfer">
-        <intent
-            android:action="sh.sar.basedbank.OPEN_TRANSFER"
-            android:targetPackage="sh.sar.basedbank"
-            android:targetClass="sh.sar.basedbank.MainActivity" />
-        <categories android:name="android.shortcut.conversation" />
-    </shortcut>
-
-    <shortcut
-        android:shortcutId="scan_qr"
-        android:enabled="true"
-        android:icon="@drawable/ic_shortcut_scan_qr"
-        android:shortcutShortLabel="@string/transfer_scan_qr"
-        android:shortcutLongLabel="@string/transfer_scan_qr">
-        <intent
-            android:action="sh.sar.basedbank.OPEN_SCAN_QR"
-            android:targetPackage="sh.sar.basedbank"
-            android:targetClass="sh.sar.basedbank.MainActivity" />
-        <categories android:name="android.shortcut.conversation" />
-    </shortcut>
-
-    <shortcut
-        android:shortcutId="pay_with_card"
-        android:enabled="true"
-        android:icon="@drawable/ic_shortcut_pay_card"
-        android:shortcutShortLabel="@string/nav_pay_with_card"
-        android:shortcutLongLabel="@string/nav_pay_with_card">
-        <intent
-            android:action="sh.sar.basedbank.OPEN_PAY_WITH_CARD"
-            android:targetPackage="sh.sar.basedbank"
-            android:targetClass="sh.sar.basedbank.MainActivity" />
-        <categories android:name="android.shortcut.conversation" />
-    </shortcut>
-
-</shortcuts>