fix: currency display symbol null

openMF · Mar 30, 2024 · 203cd9c · 203cd9c
1 parent 77c8119
commit 203cd9c
Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/app/src/main/java/org/mifos/mobile/ui/adapters/ClientChargeAdapter.kt b/app/src/main/java/org/mifos/mobile/ui/adapters/ClientChargeAdapter.kt
@@ -40,7 +40,7 @@ class ClientChargeAdapter(
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val charge = getItem(position)
-        var currencyRepresentation = charge?.currency?.displaySymbol
+        var currencyRepresentation = charge?.currency?.displaySymbol ?: charge?.currency?.code
         if (currencyRepresentation == null) {
             currencyRepresentation = charge?.currency?.code
         }

diff --git a/app/src/main/java/org/mifos/mobile/ui/adapters/RecentTransactionListAdapter.kt b/app/src/main/java/org/mifos/mobile/ui/adapters/RecentTransactionListAdapter.kt
@@ -35,7 +35,7 @@ class RecentTransactionListAdapter @Inject constructor(@ActivityContext context:
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val (_, _, _, type, _, currency, amount, submittedOnDate) = getItem(position)
-        var currencyRepresentation = currency?.displaySymbol
+        var currencyRepresentation = currency?.displaySymbol ?: currency?.code
         if (currencyRepresentation == null) {
             currencyRepresentation = currency?.code
         }

diff --git a/app/src/main/java/org/mifos/mobile/ui/adapters/SavingAccountsListAdapter.kt b/app/src/main/java/org/mifos/mobile/ui/adapters/SavingAccountsListAdapter.kt
@@ -124,7 +124,7 @@ class SavingAccountsListAdapter(
                 tvAccountBalance.setTextColor(ContextCompat.getColor(itemView.context, colorId))
                 tvAccountBalance.text = itemView.context.getString(
                     R.string.string_and_string,
-                    savingAccount.currency?.displaySymbol,
+                    savingAccount.currency?.displaySymbol ?: savingAccount.currency?.code,
                     formatCurrency(itemView.context, savingAccount.accountBalance),
                 )
             }

diff --git a/app/src/main/java/org/mifos/mobile/ui/adapters/SavingAccountsTransactionListAdapter.kt b/app/src/main/java/org/mifos/mobile/ui/adapters/SavingAccountsTransactionListAdapter.kt
@@ -106,15 +106,15 @@ class SavingAccountsTransactionListAdapter @Inject constructor() :
         fun bind(transaction: Transactions?) {
             with(binding) {
                 val (_, transactionType, _, _, date, currency, paymentDetailData, amount, runningBalance) = transaction!!
-
+                val displayedSymbol = currency?.displaySymbol ?: currency?.code
                 tvSavingAccountAmount.text = context?.getString(
                     R.string.string_and_string,
-                    currency?.displaySymbol,
+                    displayedSymbol,
                     formatCurrency(context, amount!!),
                 )
                 tvSavingAccountRunningBalance.text = context?.getString(
                     R.string.string_and_string,
-                    currency?.displaySymbol,
+                    displayedSymbol,
                     formatCurrency(context, runningBalance!!),
                 )
                 tvTransactionType.text = transactionType?.value

diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/LoanRepaymentScheduleFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/LoanRepaymentScheduleFragment.kt
@@ -82,14 +82,17 @@ class LoanRepaymentScheduleFragment : BaseFragment() {
                             hideProgress()
                             showError(getString(it.message))
                         }
+
                         is LoanUiState.ShowLoan -> {
                             hideProgress()
                             showLoanRepaymentSchedule(it.loanWithAssociations)
                         }
+
                         is LoanUiState.ShowEmpty -> {
                             hideProgress()
                             showEmptyRepaymentsSchedule(loanWithAssociations)
                         }
+
                         else -> throw IllegalStateException("Unexpected state: $it")
                     }
                 }
@@ -150,7 +153,8 @@ class LoanRepaymentScheduleFragment : BaseFragment() {
      */
     fun showLoanRepaymentSchedule(loanWithAssociations: LoanWithAssociations?) {
         this.loanWithAssociations = loanWithAssociations
-        var currencyRepresentation = loanWithAssociations?.currency?.displaySymbol
+        var currencyRepresentation =
+            loanWithAssociations?.currency?.displaySymbol ?: loanWithAssociations?.currency?.code
         loanRepaymentScheduleAdapter
             ?.setCurrency(currencyRepresentation)
         setTableViewList(loanWithAssociations?.repaymentSchedule?.periods)