forked from shihaam/thijooree
optimize bml and mib recipt to be 1:1
This commit is contained in:
@@ -416,7 +416,8 @@ class BmlLoginFlow {
|
||||
BmlTransferResult(
|
||||
success = true,
|
||||
reference = payload?.optString("reference") ?: "",
|
||||
timestamp = payload?.optString("timestamp") ?: ""
|
||||
timestamp = payload?.optString("timestamp") ?: "",
|
||||
message = json.optString("message")
|
||||
)
|
||||
}
|
||||
} catch (_: Exception) { BmlTransferResult(false, errorMessage = "Parse error") }
|
||||
|
||||
@@ -20,6 +20,7 @@ data class BmlTransferResult(
|
||||
val success: Boolean,
|
||||
val reference: String = "",
|
||||
val timestamp: String = "",
|
||||
val message: String = "",
|
||||
val errorMessage: String = ""
|
||||
)
|
||||
|
||||
|
||||
@@ -558,7 +558,8 @@ class TransferFragment : Fragment() {
|
||||
remarks = remarks,
|
||||
bmlFromName = src.accountBriefName,
|
||||
bmlReference = result.reference,
|
||||
bmlTimestamp = result.timestamp
|
||||
bmlTimestamp = result.timestamp,
|
||||
bmlMessage = result.message
|
||||
)
|
||||
val time = result.timestamp.take(19).replace("T", " ")
|
||||
Triple(true, "Reference: ${result.reference}\n$time", receipt)
|
||||
|
||||
@@ -18,4 +18,5 @@ data class TransferReceiptData(
|
||||
val bmlFromName: String = "",
|
||||
val bmlReference: String = "",
|
||||
val bmlTimestamp: String = "",
|
||||
val bmlMessage: String = "",
|
||||
)
|
||||
|
||||
@@ -61,6 +61,7 @@ class TransferReceiptFragment : Fragment() {
|
||||
private const val ARG_BML_FROM_NAME = "bml_from_name"
|
||||
private const val ARG_BML_REFERENCE = "bml_reference"
|
||||
private const val ARG_BML_TIMESTAMP = "bml_timestamp"
|
||||
private const val ARG_BML_MESSAGE = "bml_message"
|
||||
|
||||
// Holds the already-rendered to-avatar bitmap from TransferFragment
|
||||
var pendingToAvatarBitmap: Bitmap? = null
|
||||
@@ -83,6 +84,7 @@ class TransferReceiptFragment : Fragment() {
|
||||
putString(ARG_BML_FROM_NAME, data.bmlFromName)
|
||||
putString(ARG_BML_REFERENCE, data.bmlReference)
|
||||
putString(ARG_BML_TIMESTAMP, data.bmlTimestamp)
|
||||
putString(ARG_BML_MESSAGE, data.bmlMessage)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -147,7 +149,7 @@ class TransferReceiptFragment : Fragment() {
|
||||
binding.tvToBank.text = args.getString(ARG_TO_BANK, "")
|
||||
binding.tvTransactionDate.text = args.getString(ARG_MIB_DATE, "")
|
||||
binding.tvValueDate.text = args.getString(ARG_MIB_DATE, "")
|
||||
binding.tvPurpose.text = args.getString(ARG_REMARKS, "").ifBlank { "-" }
|
||||
binding.tvPurpose.text = args.getString(ARG_REMARKS, "")
|
||||
}
|
||||
|
||||
private fun loadProfileImage(hash: String, isProfile: Boolean, onLoaded: (Bitmap) -> Unit) {
|
||||
@@ -181,7 +183,9 @@ class TransferReceiptFragment : Fragment() {
|
||||
|
||||
binding.tvAmountValue.text = formattedAmount
|
||||
binding.tvAmountCurrency.text = currency
|
||||
binding.tvMessageRow.text = "Thank you. Transfer transaction is successful."
|
||||
val apiMessage = args.getString(ARG_BML_MESSAGE, "")
|
||||
binding.tvMessage.text = apiMessage
|
||||
binding.tvMessageRow.text = apiMessage
|
||||
binding.tvReference.text = args.getString(ARG_BML_REFERENCE, "")
|
||||
binding.tvTransactionDate.text = formatBmlTimestamp(args.getString(ARG_BML_TIMESTAMP, ""))
|
||||
binding.tvFrom.text = args.getString(ARG_BML_FROM_NAME, "").ifBlank {
|
||||
|
||||
Reference in New Issue
Block a user