Release version 1.0.11

.gitea/workflows/build-apk.yml

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

app/build.gradle.kts

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

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

@@ -25,6 +25,8 @@ import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.api.mib.MibCard
 import sh.sar.basedbank.api.mib.MibFinanceDeal
 import sh.sar.basedbank.util.bmlapi.BmlCardParser
+import sh.sar.basedbank.util.PaymvQrParser
+import sh.sar.basedbank.util.CredentialStore
 import kotlin.math.abs
 import sh.sar.basedbank.databinding.FragmentDashboardBinding
 import sh.sar.basedbank.databinding.ItemForeignLimitBinding
@@ -40,10 +42,10 @@ class DashboardFragment : Fragment() {
     private val qrLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
         if (result.resultCode != Activity.RESULT_OK) return@registerForActivityResult
         val raw = result.data?.getStringExtra(QrScannerActivity.EXTRA_QR_CONTENT) ?: return@registerForActivityResult
-        if (raw.startsWith("https://ebanking.bankofmaldives.com.mv/qrpay/") ||
+        val bmlUrl = PaymvQrParser.extractBmlGatewayUrl(raw)
-            raw.startsWith("https://pay.bml.com.mv/app/")) {
+        if (raw.startsWith("https://ebanking.bankofmaldives.com.mv/qrpay/") || bmlUrl != null) {
             (requireActivity() as HomeActivity).navigateTo(
-                R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(raw, pendingQrAccountNumber)
+                R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(bmlUrl ?: raw, pendingQrAccountNumber)
             )
         } else {
             Toast.makeText(requireContext(), R.string.transfer_qr_invalid, Toast.LENGTH_SHORT).show()
@@ -101,8 +103,13 @@ class DashboardFragment : Fragment() {
                 .filter { (it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT" || it.profileType == "BML_DEBIT") && it.statusDesc.equals("Active", ignoreCase = true) }
                 .map { CardItem.Bml(it) }
             val all = mibItems + bmlItems
-            cardAdapter.update(all)
+            val defaultNum = CredentialStore(requireContext()).getDefaultCardAccountNumber()
-            binding.sectionCards.visibility = if (all.isNotEmpty()) View.VISIBLE else View.GONE
+            val ordered = if (defaultNum != null) {
+                val def = all.filterIsInstance<CardItem.Bml>().firstOrNull { it.account.accountNumber == defaultNum }
+                if (def != null) listOf(def) + all.filter { it !== def } else all
+            } else all
+            cardAdapter.update(ordered)
+            binding.sectionCards.visibility = if (ordered.isNotEmpty()) View.VISIBLE else View.GONE
         }
         viewModel.mibCards.observe(viewLifecycleOwner) { updateCardList() }
         viewModel.accounts.observe(viewLifecycleOwner) { updateCardList() }
@@ -278,26 +285,23 @@ class DashboardFragment : Fragment() {
             .groupBy({ it.first }, { it.second })
             .mapValues { (_, vs) -> vs.sum() }
 
+        val blockedMvr = blockedByCurrency["MVR"] ?: 0.0
+        val blockedUsd = blockedByCurrency["USD"] ?: 0.0
         val blockedTotal = blockedByCurrency.values.sum()
-        if (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 (blockedMvr > 0.0) {
-            if (secondary.isNotEmpty()) {
+            binding.tvBlockedMvr.text = if (hide) "MVR ••••••" else "MVR %,.2f".format(blockedMvr)
-                binding.tvBlockedSecondary.text = secondary.entries.joinToString(" · ") { (ccy, amt) ->
+            binding.cardBlockedMvr.visibility = View.VISIBLE
-                    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
+            binding.cardBlockedMvr.visibility = View.GONE
         }
+        if (blockedUsd > 0.0) {
+            binding.tvBlockedUsd.text = if (hide) "USD ••••••" else "USD %,.2f".format(blockedUsd)
+            binding.cardBlockedUsd.visibility = View.VISIBLE
+        } else {
+            binding.cardBlockedUsd.visibility = View.GONE
+        }
+        binding.rowBlocked.visibility = if (blockedTotal > 0.0) View.VISIBLE else View.GONE
 
         // Overdue: MIB finance deals + BML loan details (assumed MVR — matches existing Pending Finances).
         val mibOverdue = (viewModel.financing.value ?: emptyList()).sumOf { it.overdueAmount }
@@ -310,8 +314,7 @@ class DashboardFragment : Fragment() {
             binding.cardOverdue.visibility = View.GONE
         }
 
-        binding.rowAttention.visibility =
+        binding.rowAttention.visibility = if (overdueTotal > 0.0) View.VISIBLE else View.GONE
-            if (blockedTotal > 0.0 || overdueTotal > 0.0) View.VISIBLE else View.GONE
     }
 
     private fun updatePendingFinances() {

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

@@ -255,6 +255,9 @@ class HomeActivity : AppCompatActivity() {
                     binding.drawerLayout.closeDrawers()
                     return
                 }
+                // Let CardsFragment handle back if in manage mode
+                val currentFrag = supportFragmentManager.findFragmentById(R.id.contentFrame)
+                if (currentFrag is CardsFragment && currentFrag.onBackPressed()) return
                 // Pop fragment back stack if there's anything on it (e.g. showWithBackStack)
                 if (supportFragmentManager.backStackEntryCount > 0) {
                     supportFragmentManager.popBackStack()
@@ -263,7 +266,6 @@ class HomeActivity : AppCompatActivity() {
                 // In bottom nav mode, pressing back navigates up the hierarchy
                 val isBottomNav = getSharedPreferences("prefs", MODE_PRIVATE).getBoolean("bottom_nav", false)
                 if (isBottomNav && binding.bottomNavigation.selectedItemId != R.id.nav_dashboard) {
-                    val currentFrag = supportFragmentManager.findFragmentById(R.id.contentFrame)
                     // Sub-page reached via More (e.g. Settings, Activities) — go back to More
                     if (binding.bottomNavigation.selectedItemId == R.id.nav_more && currentFrag !is MoreFragment) {
                         show(MoreFragment())

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

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

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

@@ -36,6 +36,7 @@ import sh.sar.basedbank.BasedBankApp
 import sh.sar.basedbank.R
 import sh.sar.basedbank.api.models.BankAccount
 import sh.sar.basedbank.databinding.FragmentPayMvQrBinding
+import sh.sar.basedbank.util.CredentialStore
 import sh.sar.basedbank.databinding.ItemAccountDropdownBinding
 import sh.sar.basedbank.util.AccountListParser
 import sh.sar.basedbank.util.PaymvQrParser
@@ -60,9 +61,9 @@ class PayMvQrFragment : Fragment() {
         val raw = result.data?.getStringExtra(QrScannerActivity.EXTRA_QR_CONTENT) ?: return@registerForActivityResult
 
         // BML card/gateway QR — hand off to dedicated payment screen
-        if (raw.startsWith("https://ebanking.bankofmaldives.com.mv/qrpay/") ||
+        val bmlUrl = PaymvQrParser.extractBmlGatewayUrl(raw)
-            raw.startsWith("https://pay.bml.com.mv/app/")) {
+        if (raw.startsWith("https://ebanking.bankofmaldives.com.mv/qrpay/") || bmlUrl != null) {
-            (requireActivity() as HomeActivity).navigateTo(R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(raw))
+            (requireActivity() as HomeActivity).navigateTo(R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(bmlUrl ?: raw))
             return@registerForActivityResult
         }
 
@@ -98,6 +99,8 @@ class PayMvQrFragment : Fragment() {
         }
         setupDropdown()
         binding.etAmount.addTextChangedListener { scheduleGenerate() }
+        binding.etReference.addTextChangedListener { scheduleGenerate() }
+        binding.switchIncludePhone.setOnCheckedChangeListener { _, _ -> scheduleGenerate() }
         binding.btnShare.isEnabled = false
         binding.btnSave.isEnabled = false
         binding.btnShare.setOnClickListener { shareQr() }
@@ -110,7 +113,9 @@ 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_DEBIT" && it.profileType != "BML_LOAN"
+                it.profileType != "BML_PREPAID" && it.profileType != "BML_CREDIT" && it.profileType != "BML_DEBIT" && it.profileType != "BML_LOAN" &&
+                it.bank != "MIB" && // TODO: MIB does not support PayMV QR
+                !(it.bank == "BML" && it.currencyName.contains("USD", ignoreCase = true)) // TODO: BML USD not supported by MMA
             }
             val adapter = QrAccountAdapter(requireContext(), eligible)
             binding.actvAccount.setAdapter(adapter)
@@ -145,8 +150,28 @@ class PayMvQrFragment : Fragment() {
             ?.let { "%.2f".format(it) }
 
         val ctx = requireContext()
+        val includePhone = binding.switchIncludePhone.isChecked
+        val loginId = sh.sar.basedbank.util.ProfileImageStore.loginIdFromTag(account.loginTag)
+        val store = CredentialStore(ctx)
+        val mobile = if (includePhone) {
+            when (account.bank) {
+                "BML"     -> store.loadBmlUserProfile(loginId)?.mobile
+                "FAHIPAY" -> store.loadFahipayUserProfile(loginId)?.mobile
+                else      -> null
+            }?.let { m ->
+                when {
+                    m.startsWith("+") -> m
+                    m.length == 7     -> "+960$m"
+                    else              -> m
+                }
+            }
+        } else null
+
+        val purpose = binding.etReference.text?.toString()?.trim()
+            ?.takeIf { it.isNotBlank() } ?: getString(R.string.paymvqr_reference_default)
+
         val bmp = withContext(Dispatchers.Default) {
-            val payload = buildQrPayload(account.accountNumber, account.accountBriefName, acquirer, amountFormatted)
+            val payload = buildQrPayload(account.accountNumber, account.accountBriefName, acquirer, amountFormatted, mobile, purpose)
             renderQrCard(ctx, account, payload, amountFormatted)
         }
         if (_binding == null) return
@@ -164,7 +189,9 @@ class PayMvQrFragment : Fragment() {
         accountNumber: String,
         accountName: String,
         acquirer: String,
-        amountStr: String?
+        amountStr: String?,
+        mobile: String?,
+        purpose: String
     ): String {
         fun tlv(tag: String, value: String): String {
             val len = value.length
@@ -174,17 +201,30 @@ class PayMvQrFragment : Fragment() {
         val poi          = tlv("01", "11")
         val sub00        = tlv("00", "mv.favara.mpqr")
         val sub01        = tlv("01", acquirer)
+        val sub02        = tlv("02", acquirer) // repeated acquirer, as per official PayMV app
         val sub03        = tlv("03", accountNumber)
+        val sub05        = if (!mobile.isNullOrBlank()) tlv("05", mobile) else ""
         val sub10        = tlv("10", "IPAY")
-        val merchantAcct = tlv("26", sub00 + sub01 + sub03 + sub10)
+        val merchantAcct = tlv("26", sub00 + sub01 + sub02 + sub03 + sub05 + sub10)
+        val mcc          = tlv("52", "0000")
         val currency     = tlv("53", "462")
         val amountTLV    = if (!amountStr.isNullOrBlank()) tlv("54", amountStr) else ""
         val country      = tlv("58", "MV")
         val name         = tlv("59", accountName.take(25))
-        val prefix       = format + poi + merchantAcct + currency + amountTLV + country + name + "6304"
+        val ref          = generateReference()
+        val addlData     = tlv("62", tlv("05", ref) + tlv("08", purpose))
+        val timestamp    = java.time.LocalDateTime.now()
+            .format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.00000"))
+        val tag80        = tlv("80", tlv("00", "mv.favara.mpqr") + tlv("01", timestamp))
+        val prefix       = format + poi + merchantAcct + mcc + currency + amountTLV + country + name + addlData + tag80 + "6304"
         return prefix + crc16(prefix)
     }
 
+    private fun generateReference(): String {
+        val chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+        return (1..9).map { chars.random() }.joinToString("")
+    }
+
     private fun crc16(data: String): String {
         var crc = 0xFFFF
         for (c in data) {
@@ -427,7 +467,7 @@ class PayMvQrFragment : Fragment() {
             } else {
                 b.tvDropdownAccountType.visibility = View.GONE
             }
-            b.tvDropdownBalance.text = displayData?.balance ?: ""
+            b.tvDropdownBalance.visibility = View.GONE
             b.root.alpha = 1f
 
             val networkIcon = BmlCardParser.cardNetworkIcon(acc)

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

@@ -14,8 +14,11 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
+import android.view.animation.AccelerateInterpolator
+import android.view.animation.DecelerateInterpolator
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.doOnNextLayout
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -26,7 +29,9 @@ import sh.sar.basedbank.R
 import sh.sar.basedbank.api.mib.MibCard
 import sh.sar.basedbank.databinding.FragmentCardsBinding
 import sh.sar.basedbank.util.CardsCache
+import sh.sar.basedbank.util.CredentialStore
 import sh.sar.basedbank.util.bmlapi.BmlCardParser
+import sh.sar.basedbank.util.PaymvQrParser
 import kotlin.math.abs
 
 class CardsFragment : Fragment() {
@@ -39,14 +44,27 @@ class CardsFragment : Fragment() {
     private var currentCardPosition: Int = 0
     private var cardWidth: Int = 0
     private var pendingQrAccountNumber: String? = null
+    private var isManageMode: Boolean = false
+
+    // Carousel snapshot captured on enter, used to reverse the exit animation
+    private var carouselCardLayoutTop = 0f      // card layout top relative to contentLayout
+    private var carouselCardCenterX = 0f        // card center X relative to contentLayout
+    private var carouselTextLayoutTop = 0f      // tvSelectedCardType layout top relative to contentLayout
+
+    // Swipe-to-dismiss tracking
+    private var swipeDragStartRawY = 0f
+    private var swipeIsDragging = false
+
+    private lateinit var stackAdapter: CardStackAdapter
+    private val store by lazy { CredentialStore(requireContext()) }
 
     private val qrLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
         if (result.resultCode != Activity.RESULT_OK) return@registerForActivityResult
         val raw = result.data?.getStringExtra(QrScannerActivity.EXTRA_QR_CONTENT) ?: return@registerForActivityResult
-        if (raw.startsWith("https://ebanking.bankofmaldives.com.mv/qrpay/") ||
+        val bmlUrl = PaymvQrParser.extractBmlGatewayUrl(raw)
-            raw.startsWith("https://pay.bml.com.mv/app/")) {
+        if (raw.startsWith("https://ebanking.bankofmaldives.com.mv/qrpay/") || bmlUrl != null) {
             (requireActivity() as HomeActivity).navigateTo(
-                R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(raw, pendingQrAccountNumber)
+                R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(bmlUrl ?: raw, pendingQrAccountNumber)
             )
         } else {
             Toast.makeText(requireContext(), R.string.transfer_qr_invalid, Toast.LENGTH_SHORT).show()
@@ -64,7 +82,7 @@ class CardsFragment : Fragment() {
         val peekPx = screenW / 8
         cardWidth = screenW - 2 * peekPx
 
-        val stackAdapter = CardStackAdapter(cardWidth)
+        stackAdapter = CardStackAdapter(cardWidth)
         binding.rvCards.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
         binding.rvCards.adapter = stackAdapter
         binding.rvCards.setPadding(peekPx, 0, peekPx, 0)
@@ -101,24 +119,8 @@ ViewCompat.setOnApplyWindowInsetsListener(binding.contentLayout) { v, insets ->
             insets
         }
 
-        val updateCardList = {
+        viewModel.mibCards.observe(viewLifecycleOwner) { rebuildCards() }
-            val mibItems = (viewModel.mibCards.value ?: emptyList()).map { CardItem.Mib(it) }
+        viewModel.accounts.observe(viewLifecycleOwner) { rebuildCards() }
-            val bmlItems = (viewModel.accounts.value ?: emptyList())
-                .filter { it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT" || it.profileType == "BML_DEBIT" }
-                .map { CardItem.Bml(it) }
-            cards = mibItems + bmlItems
-            stackAdapter.update(cards)
-            binding.loadingView.visibility = View.GONE
-            val empty = cards.isEmpty()
-            binding.emptyView.visibility = if (empty) View.VISIBLE else View.GONE
-            binding.contentLayout.visibility = if (empty) View.GONE else View.VISIBLE
-            if (!empty) {
-                buildDots(cards.size, currentCardPosition)
-                updateCardInfo(currentCardPosition)
-            }
-        }
-        viewModel.mibCards.observe(viewLifecycleOwner) { updateCardList() }
-        viewModel.accounts.observe(viewLifecycleOwner) { updateCardList() }
 
         val cached = CardsCache.load(requireContext())
         if (cached.isNotEmpty()) {
@@ -128,6 +130,54 @@ ViewCompat.setOnApplyWindowInsetsListener(binding.contentLayout) { v, insets ->
         }
         (activity as? HomeActivity)?.triggerRefreshCards()
 
+        binding.btnManageCard.setOnClickListener {
+            setManageMode(!isManageMode)
+        }
+
+        // Swipe-down on the manage card to dismiss manage mode
+        binding.manageCardView.root.setOnTouchListener { _, event ->
+            if (!isManageMode) return@setOnTouchListener false
+            val mgr = binding.manageCardView.root
+            when (event.action) {
+                android.view.MotionEvent.ACTION_DOWN -> {
+                    mgr.animate().cancel()
+                    binding.tvSelectedCardType.animate().cancel()
+                    swipeDragStartRawY = event.rawY
+                    swipeIsDragging = false
+                    true
+                }
+                android.view.MotionEvent.ACTION_MOVE -> {
+                    val dy = (event.rawY - swipeDragStartRawY).coerceAtLeast(0f)
+                    if (dy > 12f || swipeIsDragging) {
+                        swipeIsDragging = true
+                        mgr.translationY = dy
+                        binding.tvSelectedCardType.translationY = dy * 0.6f
+                        val scale = 1f - (dy / (binding.contentLayout.height * 2.5f)).coerceIn(0f, 0.12f)
+                        mgr.scaleX = scale
+                        mgr.scaleY = scale
+                        true
+                    } else false
+                }
+                android.view.MotionEvent.ACTION_UP, android.view.MotionEvent.ACTION_CANCEL -> {
+                    if (swipeIsDragging) {
+                        val dy = (event.rawY - swipeDragStartRawY).coerceAtLeast(0f)
+                        swipeIsDragging = false
+                        if (dy > 130f) {
+                            setManageMode(false)
+                        } else {
+                            // Snap back
+                            mgr.animate().translationY(0f).scaleX(1f).scaleY(1f)
+                                .setDuration(280).setInterpolator(DecelerateInterpolator()).start()
+                            binding.tvSelectedCardType.animate().translationY(0f)
+                                .setDuration(280).setInterpolator(DecelerateInterpolator()).start()
+                        }
+                        true
+                    } else false
+                }
+                else -> false
+            }
+        }
+
         binding.btnScanToPay.setOnClickListener {
             val item = cards.getOrNull(currentCardPosition) ?: return@setOnClickListener
             if (item is CardItem.Mib) {
@@ -154,6 +204,216 @@ ViewCompat.setOnApplyWindowInsetsListener(binding.contentLayout) { v, insets ->
         binding.btnBlock.setOnClickListener(wip)
     }
 
+    private fun setManageMode(enabled: Boolean) {
+        isManageMode = enabled
+        requireActivity().title = getString(if (enabled) R.string.card_manage else R.string.nav_pay_with_card)
+        if (enabled) enterManageMode() else exitManageMode()
+    }
+
+    private fun enterManageMode() {
+        val item = cards.getOrNull(currentCardPosition) ?: return
+
+        // Bind card data
+        val cv = binding.manageCardView
+        when (item) {
+            is CardItem.Mib -> {
+                cv.tvCardOwner.text = item.card.cardHolderName
+                cv.tvCardNumber.text = formatMasked(item.card.maskedCardNumber)
+                val assetPath = cardImageAsset(item.card)
+                if (assetPath != null) loadCardImage(cv.ivCardImage, assetPath)
+                else cv.ivCardImage.setImageDrawable(null)
+                bindCardStatus(cv.tvCardStatus, mibCardStatusLabel(item.card.cardStatus))
+                cv.root.alpha = 1f
+            }
+            is CardItem.Bml -> {
+                cv.tvCardOwner.text = item.account.accountBriefName
+                cv.tvCardNumber.text = formatMasked(item.account.accountNumber)
+                loadCardImage(cv.ivCardImage, BmlCardParser.cardImageAsset(item.account))
+                val isActive = item.account.statusDesc.equals("Active", ignoreCase = true)
+                bindCardStatus(cv.tvCardStatus, item.account.statusDesc.takeUnless { isActive })
+                cv.root.alpha = if (isActive) 1f else 0.45f
+            }
+        }
+
+        // Capture positions BEFORE layout changes (for enter animation + exit animation later)
+        val contentLoc = IntArray(2).also { binding.contentLayout.getLocationOnScreen(it) }
+        val lm = binding.rvCards.layoutManager as? LinearLayoutManager
+        val srcView = lm?.findViewByPosition(currentCardPosition)
+        val srcLoc = IntArray(2).also { srcView?.getLocationOnScreen(it) ?: run { it[0] = contentLoc[0]; it[1] = contentLoc[1] } }
+        val srcScreenTop = (srcLoc[1] - contentLoc[1]).toFloat()
+        val srcCenterX = (srcLoc[0] - contentLoc[0]).toFloat() + cardWidth / 2f
+
+        val textLoc = IntArray(2).also { binding.tvSelectedCardType.getLocationOnScreen(it) }
+        val textSrcScreenTop = (textLoc[1] - contentLoc[1]).toFloat()
+
+        // Apply layout changes
+        binding.btnManageCard.visibility = View.GONE
+        binding.topSpacer.visibility = View.GONE
+        binding.rvCards.visibility = View.GONE
+        binding.pageIndicator.visibility = View.GONE
+        binding.llPayButtons.visibility = View.GONE
+        binding.llManageButtons.visibility = View.VISIBLE
+        binding.llDefaultCardRow.visibility = View.VISIBLE
+        binding.manageCardView.root.visibility = View.VISIBLE
+
+        // Set switch state (clear listener first to avoid triggering on programmatic set)
+        val isBml = item is CardItem.Bml
+        binding.switchDefaultCard.setOnCheckedChangeListener(null)
+        binding.switchDefaultCard.isChecked = isBml && store.getDefaultCardAccountNumber() == (item as? CardItem.Bml)?.account?.accountNumber
+        binding.switchDefaultCard.setOnCheckedChangeListener { _, isChecked ->
+            if (item is CardItem.Mib) {
+                // MIB doesn't support NFC/QR pay — same toast as scan/tap to pay
+                binding.switchDefaultCard.setOnCheckedChangeListener(null)
+                binding.switchDefaultCard.isChecked = false
+                binding.switchDefaultCard.setOnCheckedChangeListener { _, c ->
+                    handleDefaultCardToggle(c)
+                }
+                Toast.makeText(requireContext(), R.string.mib_qr_nfc_not_supported, Toast.LENGTH_SHORT).show()
+            } else {
+                handleDefaultCardToggle(isChecked)
+            }
+        }
+
+        // After layout pass, compute offsets, save carousel snapshot, and animate
+        binding.contentLayout.doOnNextLayout {
+            val mgr = binding.manageCardView.root
+            val dstLoc = IntArray(2).also { mgr.getLocationOnScreen(it) }
+            val dstTop = (dstLoc[1] - contentLoc[1]).toFloat()
+            val dstCenterX = (dstLoc[0] - contentLoc[0]).toFloat() + mgr.width / 2f
+
+            val scaleStart = if (mgr.width > 0) cardWidth.toFloat() / mgr.width.toFloat() else 1f
+            val transXStart = srcCenterX - dstCenterX
+            val transYStart = srcScreenTop - dstTop
+
+            // Save the carousel card's position (relative to contentLayout) for the exit animation
+            carouselCardLayoutTop = srcScreenTop
+            carouselCardCenterX = srcCenterX
+            carouselTextLayoutTop = textSrcScreenTop
+
+            val textDstLoc = IntArray(2).also { binding.tvSelectedCardType.getLocationOnScreen(it) }
+            val textDstTop = (textDstLoc[1] - contentLoc[1]).toFloat()
+
+            mgr.pivotX = mgr.width / 2f
+            mgr.pivotY = 0f
+            mgr.scaleX = scaleStart
+            mgr.scaleY = scaleStart
+            mgr.translationX = transXStart
+            mgr.translationY = transYStart
+
+            mgr.animate()
+                .scaleX(1f).scaleY(1f)
+                .translationX(0f).translationY(0f)
+                .setDuration(380)
+                .setInterpolator(DecelerateInterpolator())
+                .start()
+
+            binding.tvSelectedCardType.translationY = textSrcScreenTop - textDstTop
+            binding.tvSelectedCardType.animate()
+                .translationY(0f)
+                .setDuration(380)
+                .setInterpolator(DecelerateInterpolator())
+                .start()
+        }
+    }
+
+    private fun handleDefaultCardToggle(isChecked: Boolean) {
+        val item = cards.getOrNull(currentCardPosition) as? CardItem.Bml ?: return
+        store.setDefaultCardAccountNumber(if (isChecked) item.account.accountNumber else null)
+        rebuildCards()
+    }
+
+    private fun exitManageMode() {
+        binding.manageCardView.root.animate().cancel()
+        binding.tvSelectedCardType.animate().cancel()
+
+        val mgr = binding.manageCardView.root
+        val contentLoc = IntArray(2).also { binding.contentLayout.getLocationOnScreen(it) }
+
+        // Compute layout top of manage card (strip current translationY which may be from a swipe drag)
+        val mgrLoc = IntArray(2).also { mgr.getLocationOnScreen(it) }
+        val mgrLayoutTop = (mgrLoc[1] - contentLoc[1]).toFloat() - mgr.translationY
+
+        val textLoc = IntArray(2).also { binding.tvSelectedCardType.getLocationOnScreen(it) }
+        val textLayoutTop = (textLoc[1] - contentLoc[1]).toFloat() - binding.tvSelectedCardType.translationY
+
+        // Target: animate card back to carousel position
+        val scaleEnd = if (mgr.width > 0) cardWidth.toFloat() / mgr.width.toFloat() else 1f
+        val mgrLayoutCenterX = (mgrLoc[0] - contentLoc[0]).toFloat() - mgr.translationX + mgr.width / 2f
+        val targetTransX = carouselCardCenterX - mgrLayoutCenterX
+        val targetTransY = carouselCardLayoutTop - mgrLayoutTop
+
+        val targetTextTransY = carouselTextLayoutTop - textLayoutTop
+
+        mgr.pivotX = mgr.width / 2f
+        mgr.pivotY = 0f
+
+        mgr.animate()
+            .scaleX(scaleEnd).scaleY(scaleEnd)
+            .translationX(targetTransX)
+            .translationY(targetTransY)
+            .setDuration(320)
+            .setInterpolator(AccelerateInterpolator())
+            .withEndAction {
+                mgr.scaleX = 1f; mgr.scaleY = 1f
+                mgr.translationX = 0f; mgr.translationY = 0f
+                mgr.visibility = View.GONE
+                binding.tvSelectedCardType.translationY = 0f
+
+                binding.btnManageCard.visibility = View.VISIBLE
+                binding.topSpacer.visibility = View.VISIBLE
+                binding.rvCards.visibility = View.VISIBLE
+                binding.llPayButtons.visibility = View.VISIBLE
+                binding.llManageButtons.visibility = View.GONE
+                binding.llDefaultCardRow.visibility = View.GONE
+                binding.switchDefaultCard.setOnCheckedChangeListener(null)
+                buildDots(cards.size, currentCardPosition)
+            }
+            .start()
+
+        binding.tvSelectedCardType.animate()
+            .translationY(targetTextTransY)
+            .setDuration(320)
+            .setInterpolator(AccelerateInterpolator())
+            .withEndAction { binding.tvSelectedCardType.translationY = 0f }
+            .start()
+    }
+
+    private fun rebuildCards() {
+        // Remember which card is currently selected by identity so we can restore position after reorder
+        val currentCard = cards.getOrNull(currentCardPosition)
+
+        val defaultNum = store.getDefaultCardAccountNumber()
+        val mibItems = (viewModel.mibCards.value ?: emptyList()).map { CardItem.Mib(it) }
+        val bmlItems = (viewModel.accounts.value ?: emptyList())
+            .filter { it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT" || it.profileType == "BML_DEBIT" }
+            .map { CardItem.Bml(it) }
+        val all: List<CardItem> = mibItems + bmlItems
+        // Move default BML card to front
+        cards = if (defaultNum != null) {
+            val def = all.filterIsInstance<CardItem.Bml>().firstOrNull { it.account.accountNumber == defaultNum }
+            if (def != null) listOf(def) + all.filter { it !== def } else all
+        } else all
+
+        // Restore position to follow the same card after reorder
+        if (currentCard != null) {
+            val newPos = cards.indexOf(currentCard)
+            if (newPos >= 0 && newPos != currentCardPosition) {
+                currentCardPosition = newPos
+                binding.rvCards.scrollToPosition(newPos)
+            }
+        }
+
+        stackAdapter.update(cards)
+        binding.loadingView.visibility = View.GONE
+        val empty = cards.isEmpty()
+        binding.emptyView.visibility = if (empty) View.VISIBLE else View.GONE
+        binding.contentLayout.visibility = if (empty) View.GONE else View.VISIBLE
+        if (!empty) {
+            buildDots(cards.size, currentCardPosition)
+            updateCardInfo(currentCardPosition)
+        }
+    }
+
     private fun applyCardScales() {
         val rv = binding.rvCards
         val rvCenter = rv.paddingStart + (rv.width - rv.paddingStart - rv.paddingEnd) / 2f
@@ -173,6 +433,7 @@ ViewCompat.setOnApplyWindowInsetsListener(binding.contentLayout) { v, insets ->
     }
 
     private fun buildDots(count: Int, selected: Int) {
+        if (isManageMode) return
         binding.pageIndicator.removeAllViews()
         if (count <= 1) {
             binding.pageIndicator.visibility = View.GONE
@@ -207,6 +468,14 @@ ViewCompat.setOnApplyWindowInsetsListener(binding.contentLayout) { v, insets ->
         }
     }
 
+    fun onBackPressed(): Boolean {
+        if (isManageMode) {
+            setManageMode(false)
+            return true
+        }
+        return false
+    }
+
     override fun onResume() {
         super.onResume()
         requireActivity().title = getString(R.string.nav_pay_with_card)

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

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

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

@@ -125,9 +125,12 @@ class TransferFragment : Fragment() {
         val raw = result.data?.getStringExtra(QrScannerActivity.EXTRA_QR_CONTENT) ?: return@registerForActivityResult
 
         // BML card/gateway QR — hand off to dedicated payment screen
-        if (raw.startsWith("https://ebanking.bankofmaldives.com.mv/qrpay/") ||
+        val bmlUrl = PaymvQrParser.extractBmlGatewayUrl(raw)
-            raw.startsWith("https://pay.bml.com.mv/app/")) {
+        if (raw.startsWith("https://ebanking.bankofmaldives.com.mv/qrpay/") || bmlUrl != null) {
-            (requireActivity() as HomeActivity).navigateTo(R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(raw))
+            val fromCard = selectedAccount?.takeIf {
+                it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT" || it.profileType == "BML_DEBIT"
+            }
+            (requireActivity() as HomeActivity).navigateTo(R.id.nav_transfer, TransferFragment.newInstanceFromBmlQr(bmlUrl ?: raw, fromCard?.accountNumber))
             return@registerForActivityResult
         }
 
@@ -290,6 +293,25 @@ class TransferFragment : Fragment() {
             }
             bmlQrInfo = info
 
+            // Auto-select the user's default BML card if no card was pre-selected
+            if (selectedAccount == null) {
+                val defaultNum = CredentialStore(requireContext()).getDefaultCardAccountNumber()
+                if (defaultNum != null) {
+                    val allAccounts = viewModel.accounts.value ?: emptyList()
+                    val defaultCard = allAccounts.firstOrNull {
+                        it.accountNumber == defaultNum &&
+                        (it.profileType == "BML_PREPAID" || it.profileType == "BML_CREDIT" || it.profileType == "BML_DEBIT") &&
+                        it.statusDesc.equals("Active", ignoreCase = true)
+                    }
+                    if (defaultCard != null) {
+                        selectedAccount = defaultCard
+                        updateAmountPrefix(defaultCard)
+                        showFromCard(defaultCard)
+                        updateTransferButton()
+                    }
+                }
+            }
+
             // Show merchant in the "To" card — clear button hidden (can't change recipient for QR)
             binding.tvToAccountName.text = info.merchantName
             binding.tvToBankBic.text = info.merchantAddress.ifBlank { "BML Merchant" }
@@ -297,7 +319,6 @@ class TransferFragment : Fragment() {
             binding.tvToBalance.visibility = View.GONE
             binding.ivToPhoto.scaleType = android.widget.ImageView.ScaleType.CENTER_CROP
             binding.ivToPhoto.setImageBitmap(makeInitialsBitmap(info.merchantName, "#0066A1"))
-            binding.btnClearToInfo.visibility = View.GONE
             binding.cardToInfo.visibility = View.VISIBLE
 
             // Pre-fill amount if dynamic QR
@@ -353,6 +374,14 @@ class TransferFragment : Fragment() {
 
             binding.actvFrom.setOnItemClickListener { _, _, position, _ ->
                 val picked = accountDropdownAdapter?.getAccount(position) ?: return@setOnItemClickListener
+                if (bmlQrInfo != null) {
+                    val isCard = picked.profileType == "BML_PREPAID" || picked.profileType == "BML_CREDIT" || picked.profileType == "BML_DEBIT"
+                    if (!isCard) {
+                        Toast.makeText(requireContext(), "Unsupported for BML QR — select a card", Toast.LENGTH_SHORT).show()
+                        binding.actvFrom.setText("", false)
+                        return@setOnItemClickListener
+                    }
+                }
                 selectedAccount = picked
                 updateAmountPrefix(picked)
                 showFromCard(picked)
@@ -506,6 +535,14 @@ class TransferFragment : Fragment() {
         binding.tilTo.setEndIconOnClickListener { lookupAccount() }
 
         binding.btnClearToInfo.setOnClickListener {
+            if (bmlQrInfo != null) {
+                bmlQrInfo = null
+                bmlGatewayQr = false
+                binding.tilAmount.isEnabled = true
+                binding.tilRemarks.isEnabled = true
+                binding.tilRemarks.alpha = 1f
+                binding.etAmount.setText("")
+            }
             resolvedAccountNumber = ""
             resolvedRecipientName = ""
             resolvedToOwnAccount = null
@@ -1737,6 +1774,7 @@ class TransferFragment : Fragment() {
                         .also { it.root.tag = it }
                 }
                 val inactive = (acc.profileType == "BML_PREPAID" || acc.profileType == "BML_CREDIT" || acc.profileType == "BML_DEBIT") && !acc.statusDesc.equals("Active", ignoreCase = true)
+                val isCard = acc.profileType == "BML_PREPAID" || acc.profileType == "BML_CREDIT" || acc.profileType == "BML_DEBIT"
                 val isBmlAccount = acc.bank == "BML"
                 val ownerPrefix = if (isBmlAccount && acc.profileName.isNotBlank()) "${acc.profileName} · " else ""
                 val hide = viewModel.hideAmounts.value ?: false
@@ -1754,7 +1792,11 @@ class TransferFragment : Fragment() {
                 }
                 val balance = displayData?.balance ?: ""
                 b.tvDropdownBalance.text = if (hide && balance.isNotBlank()) maskAmount(balance) else balance
-                b.root.alpha = if (inactive) 0.4f else 1f
+                b.root.alpha = when {
+                    inactive -> 0.4f
+                    bmlQrInfo != null && !isCard -> 0.35f
+                    else -> 1f
+                }
                 val networkIcon = BmlCardParser.cardNetworkIcon(acc)
                 when {
                     networkIcon != null -> {

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

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

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

@@ -615,6 +615,18 @@ class CredentialStore(context: Context) {
         } catch (_: Exception) { null }
     }
 
+    // ── Default payment card ──────────────────────────────────────────────────
+
+    /** BML card account number the user has pinned as their default payment card, or null. */
+    fun getDefaultCardAccountNumber(): String? = prefs.getString("default_card_account_number", null)
+
+    fun setDefaultCardAccountNumber(accountNumber: String?) {
+        val editor = prefs.edit()
+        if (accountNumber == null) editor.remove("default_card_account_number")
+        else editor.putString("default_card_account_number", accountNumber)
+        editor.apply()
+    }
+
     // ── MIB profile visibility (per loginId) ─────────────────────────────────
 
     /** Returns the set of MIB profile IDs the user has chosen to hide (for a given loginId). */

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

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

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

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

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

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

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

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

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

@@ -116,6 +116,8 @@
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
             android:visibility="invisible"
+            android:clickable="true"
+            android:focusable="true"
             app:cardBackgroundColor="?attr/colorSecondaryContainer"
             app:cardCornerRadius="12dp"
             app:cardElevation="0dp">

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

@@ -176,9 +176,9 @@
 
         </LinearLayout>
 
-        <!-- Attention row: Blocked + Overdue (hidden when nothing applies) -->
+        <!-- Blocked funds row: MVR + USD separate cards (hidden when no blocked amounts) -->
         <LinearLayout
-            android:id="@+id/rowAttention"
+            android:id="@+id/rowBlocked"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
@@ -186,7 +186,7 @@
             android:visibility="gone">
 
             <com.google.android.material.card.MaterialCardView
-                android:id="@+id/cardBlocked"
+                android:id="@+id/cardBlockedMvr"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -205,12 +205,12 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/dashboard_blocked"
+                        android:text="@string/dashboard_blocked_mvr"
                         android:textAppearance="?attr/textAppearanceLabelSmall"
                         android:textColor="?attr/colorOnErrorContainer" />
 
                     <TextView
-                        android:id="@+id/tvBlockedTotal"
+                        android:id="@+id/tvBlockedMvr"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="4dp"
@@ -218,22 +218,12 @@
                         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:id="@+id/cardBlockedUsd"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -241,6 +231,52 @@
                 app:cardElevation="1dp"
                 app:cardCornerRadius="12dp"
                 app:cardBackgroundColor="?attr/colorErrorContainer"
+                android:visibility="gone">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="16dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/dashboard_blocked_usd"
+                        android:textAppearance="?attr/textAppearanceLabelSmall"
+                        android:textColor="?attr/colorOnErrorContainer" />
+
+                    <TextView
+                        android:id="@+id/tvBlockedUsd"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:text="USD —"
+                        android:textAppearance="?attr/textAppearanceTitleMedium"
+                        android:textColor="?attr/colorOnErrorContainer" />
+
+                </LinearLayout>
+
+            </com.google.android.material.card.MaterialCardView>
+
+        </LinearLayout>
+
+        <!-- Overdue row (hidden when no overdue financing) -->
+        <LinearLayout
+            android:id="@+id/rowAttention"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="16dp"
+            android:visibility="gone">
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/cardOverdue"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:cardElevation="1dp"
+                app:cardCornerRadius="12dp"
+                app:cardBackgroundColor="?attr/colorErrorContainer"
                 android:clickable="true"
                 android:focusable="true"
                 android:visibility="gone">

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

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

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

@@ -2,7 +2,7 @@
 <com.google.android.material.card.MaterialCardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="280dp"
+    android:layout_width="320dp"
     android:layout_height="wrap_content"
     android:layout_marginEnd="12dp"
     app:cardCornerRadius="16dp"

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

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

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

@@ -115,11 +115,13 @@
     <!-- PayMV QR Generator -->
     <string name="paymvqr_select_account">Select account</string>
     <string name="paymvqr_amount_hint">Amount (optional)</string>
-    <string name="paymvqr_amount_helper">Leave empty to allow payer to enter any amount</string>
     <string name="paymvqr_share">Share</string>
     <string name="paymvqr_save_image">Save Image</string>
     <string name="paymvqr_saved">QR saved to gallery</string>
     <string name="paymvqr_save_failed">Failed to save image</string>
+    <string name="paymvqr_include_phone">Include phone number</string>
+    <string name="paymvqr_reference_hint">Reference (optional)</string>
+    <string name="paymvqr_reference_default">PayMV QR Transfer</string>
 
     <!-- Toolbar -->
     <string name="action_lock">Lock app</string>
@@ -218,7 +220,8 @@
     <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_blocked_mvr">Blocked MVR</string>
+    <string name="dashboard_blocked_usd">Blocked USD</string>
     <string name="dashboard_overdue">Overdue Financing</string>
 
     <!-- Transfer -->
@@ -240,6 +243,7 @@
     <string name="transfer_qr_invalid">Invalid or unsupported QR code</string>
     <string name="qr_camera_permission_title">Camera permission required</string>
     <string name="qr_camera_permission_message">Camera access is needed to scan QR codes. Please grant the permission in Settings.</string>
+    <string name="camera_permission_profile_message">Camera access is needed to take a photo. Please grant the permission in Settings.</string>
     <string name="go_to_settings">Go to Settings</string>
     <string name="transfer_select_source_first">Select a source account first</string>
     <string name="transfer_enter_account_first">Enter an account number first</string>
@@ -326,6 +330,8 @@
     <string name="card_pay_qr">Scan to Pay</string>
     <string name="card_pay_nfc">Tap to Pay</string>
     <string name="mib_qr_nfc_not_supported">Skill issue on MIB side, Not supported</string>
+    <string name="card_manage">Manage Card</string>
+    <string name="card_set_as_default">Set as Default Card</string>
     <string name="card_action_change_pin">Change PIN</string>
     <string name="card_action_freeze">Freeze</string>
     <string name="card_action_block">Block</string>