Skip to content

feat: show active mint name and balance on POS screen #312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Codepocketdev wants to merge 1 commit into
base: main
Choose a base branch
from
+100 −33
Open

feat: show active mint name and balance on POS screen #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 46 additions & 18 deletions app/src/main/java/com/electricdreams/numo/ui/components/PosUiCoordinator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.constraintlayout.widget.ConstraintLayout
import com.electricdreams.numo.R
import com.electricdreams.numo.core.cashu.CashuWalletManager
import com.electricdreams.numo.core.model.Amount
import com.electricdreams.numo.core.util.MintManager
import com.electricdreams.numo.core.worker.BitcoinPriceWorker
import com.electricdreams.numo.feature.history.PaymentsHistoryActivity
Expand All @@ -47,6 +48,9 @@ class PosUiCoordinator(
private lateinit var switchCurrencyButton: View
private lateinit var inputModeContainer: ConstraintLayout
private lateinit var errorMessage: TextView
private var mintInfoContainer: View? = null
private var mintInfoName: TextView? = null
private var mintInfoBalance: TextView? = null

// Input state
private val satoshiInput = StringBuilder()
Expand All @@ -67,11 +71,12 @@ class PosUiCoordinator(
initializeViews()
initializeManagers()
setupNavigationButtons()

updateMintIndicator()

// Disable charge button initially, enable when wallet is ready
submitButton.isEnabled = false
submitButton.alpha = 0.5f

// Load mint limits from preferred Lightning mint
loadMintLimits()

Expand All @@ -86,7 +91,7 @@ class PosUiCoordinator(
if (submitButtonSpinner.visibility != android.view.View.VISIBLE) {
submitButton.isEnabled = canCharge
submitButton.alpha = if (canCharge) 1.0f else 0.5f

// Rely on AmountDisplayManager to set correct text/state based on amount and wallet readiness
amountDisplayManager.updateDisplay(
satoshiInput,
Expand Down Expand Up @@ -115,18 +120,18 @@ class PosUiCoordinator(
Log.w(TAG, "Failed to pre-load cache for: $mintUrl", e)
}
}

// Now get limits for the preferred mint
val isStale = mintManager.needsRefresh(lightningMint)
val limits = mintManager.getMintLimits(lightningMint, activity, forceRefresh = isStale, isFirstFetch = false)
amountDisplayManager.setMintLimits(limits)

// Update display to re-evaluate button state based on new limits
amountDisplayManager.updateDisplay(satoshiInput, fiatInput, AmountDisplayManager.AnimationType.NONE)
}
}
}

/** Reload mint limits - called when returning to POS (e.g., after changing lightning mint) */
fun reloadMintLimits() {
Log.d(TAG, "reloadMintLimits() called")
Expand All @@ -135,18 +140,18 @@ class PosUiCoordinator(
if (lightningMint != null) {
// Disable button while refreshing, but let AmountDisplayManager handle the text based on wallet state
submitButton.isEnabled = false

activity.lifecycleScope.launch {
// Force refresh if stale, NOT first fetch - preserve existing cache
// This prevents inconsistent mint responses from overwriting valid limits
val isStale = mintManager.needsRefresh(lightningMint)
Log.d(TAG, "Fetching mint limits with forceRefresh=\$isStale (NOT first fetch)")
val limits = mintManager.getMintLimits(lightningMint, activity, forceRefresh = isStale, isFirstFetch = false)
Log.d(TAG, "Got limits: $limits")

// Same behavior as onCreate - always set limits
amountDisplayManager.setMintLimits(limits)

// Update display to re-evaluate button state based on new limits
amountDisplayManager.updateDisplay(satoshiInput, fiatInput, AmountDisplayManager.AnimationType.NONE)
}
Expand Down Expand Up @@ -191,7 +196,7 @@ class PosUiCoordinator(
fun showAmountRequiredError() {
errorMessage.visibility = View.VISIBLE
amountDisplayManager.shakeAmountDisplay()

mainHandler.postDelayed({
errorMessage.visibility = View.GONE
}, 3000)
Expand All @@ -206,6 +211,7 @@ class PosUiCoordinator(
fun refreshDisplay() {
// Force a display update to reflect any currency changes
amountDisplayManager.updateDisplay(satoshiInput, fiatInput, AmountDisplayManager.AnimationType.NONE)
updateMintIndicator()
}

/** Handle NFC payment */
Expand Down Expand Up @@ -234,7 +240,7 @@ class PosUiCoordinator(
} catch (e: Exception) {
android.util.Log.e("PosUiCoordinator", "Error playing success sound: ${e.message}")
}

// Vibrate
try {
val vibrator = activity.getVibrator()
Expand Down Expand Up @@ -272,7 +278,10 @@ class PosUiCoordinator(
errorMessage = activity.findViewById(R.id.error_message)
switchCurrencyButton = activity.findViewById(R.id.currency_switch_button)
inputModeContainer = activity.findViewById(R.id.input_mode_container)

mintInfoContainer = activity.findViewById(R.id.mint_info_bar)
mintInfoName = activity.findViewById(R.id.mint_info_name)
mintInfoBalance = activity.findViewById(R.id.mint_info_balance)

// Initialize currency switch button translationY to 2dp
val iconOffsetPx = 2f * activity.resources.displayMetrics.density
switchCurrencyButton.translationY = iconOffsetPx
Expand Down Expand Up @@ -302,14 +311,14 @@ class PosUiCoordinator(
// Initialize payment handlers
paymentMethodHandler = PaymentMethodHandler(activity)
paymentResultHandler = PaymentResultHandler(activity, bitcoinPriceWorker)

// Initialize NFC processor
nfcPaymentProcessor = NfcPaymentProcessor(
activity,
onPaymentSuccess = { token ->
paymentResultHandler.handlePaymentSuccess(
token,
amountDisplayManager.requestedAmount,
token,
amountDisplayManager.requestedAmount,
amountDisplayManager.isUsdInputMode
) { resultToken, resultAmount ->
// Use unified success handler
Expand All @@ -325,18 +334,37 @@ class PosUiCoordinator(
)
}

private fun updateMintIndicator() {
if (mintInfoContainer == null || mintInfoName == null || mintInfoBalance == null) return

val mintUrl = mintManager.getPreferredLightningMint()
if (mintUrl == null) {
mintInfoContainer?.visibility = View.GONE
return
}

mintInfoContainer?.visibility = View.VISIBLE
val displayName = mintManager.getMintDisplayName(mintUrl)
mintInfoName?.text = displayName

activity.lifecycleScope.launch {
val balance = CashuWalletManager.getBalanceForMint(mintUrl)
mintInfoBalance?.text = Amount(balance, Amount.Currency.BTC).toString()
}
}

private fun setupNavigationButtons() {
// Set up currency toggle
val secondaryAmountContainer = activity.findViewById<View>(R.id.secondary_amount_container)
secondaryAmountContainer.setOnClickListener {
secondaryAmountContainer.setOnClickListener {
if (amountDisplayManager.toggleInputMode(satoshiInput, fiatInput)) {
amountDisplayManager.updateDisplay(satoshiInput, fiatInput, AmountDisplayManager.AnimationType.CURRENCY_SWITCH)
}
}

// Navigation buttons
activity.findViewById<ImageButton>(R.id.action_more_options).setOnClickListener {
showOverflowMenu(it)
activity.findViewById<ImageButton>(R.id.action_more_options).setOnClickListener {
showOverflowMenu(it)
}
activity.findViewById<ImageButton>(R.id.action_history).setOnClickListener {
activity.startActivity(Intent(activity, PaymentsHistoryActivity::class.java))
Expand Down
69 changes: 54 additions & 15 deletions app/src/main/res/layout/activity_modern_pos.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,52 @@

</LinearLayout>

<!-- Mint Info Bar -->
<LinearLayout
android:id="@+id/mint_info_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:gravity="center"
android:orientation="horizontal"
android:paddingHorizontal="16dp"
android:paddingVertical="4dp"
app:layout_constraintTop_toBottomOf="@id/top_navigation"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">

<TextView
android:id="@+id/mint_info_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:textColor="@color/color_bg_white"
android:textSize="13sp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="6dp"
android:text="·"
android:textColor="@color/color_bg_white"
android:textSize="13sp" />

<TextView
android:id="@+id/mint_info_balance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_bg_white"
android:textSize="13sp" />

</LinearLayout>

<!-- Input Mode Container -->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/input_mode_container"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/top_navigation">
app:layout_constraintTop_toBottomOf="@id/mint_info_bar">

<!-- Upper content (amount + currency) - dynamically sized -->
<androidx.constraintlayout.widget.ConstraintLayout
Expand All @@ -90,13 +129,13 @@
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="32dp"
android:layout_marginBottom="8dp"
android:gravity="center"
android:text="@string/pos_error_amount_required"
android:textColor="@color/color_bg_white"
android:textSize="16sp"
android:visibility="gone"
android:layout_marginTop="32dp"
android:layout_marginBottom="8dp"
android:gravity="center"
android:text="@string/pos_error_amount_required"
android:textColor="@color/color_bg_white"
android:textSize="16sp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
Expand All @@ -108,12 +147,12 @@
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:gravity="center"
android:text="@string/pos_amount_placeholder_main"
android:textColor="@color/color_bg_white"
android:textSize="64sp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:gravity="center"
android:text="@string/pos_amount_placeholder_main"
android:textColor="@color/color_bg_white"
android:textSize="64sp"
android:textStyle="bold"
android:maxLines="1"
android:singleLine="true"
Expand Down Expand Up @@ -228,7 +267,7 @@
layout="@layout/auto_withdraw_progress_indicator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/top_navigation"
app:layout_constraintTop_toBottomOf="@id/mint_info_bar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />

Expand Down