Merge branch 'fix#1432' of https://github.com/rutvik-panchal/mifos-mo…

…bile into fix#1432
openMF · Nov 29, 2020 · 9f017a6 · 9f017a6
2 parents d9fd53c + 8611532
commit 9f017a6
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/LoanAccountsDetailFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/LoanAccountsDetailFragment.kt
@@ -152,15 +152,15 @@ class LoanAccountsDetailFragment : BaseFragment(), LoanAccountsDetailView {
      * @param loanWithAssociations object containing details of each loan account,
      */
     fun showDetails(loanWithAssociations: LoanWithAssociations?) {
-        tvOutstandingBalanceName?.text = resources.getString(R.string.string_and_string,
-                loanWithAssociations?.summary?.currency?.displaySymbol, CurrencyUtil.formatCurrency(activity,
-                loanWithAssociations?.summary?.totalOutstanding))
+
+        var currencyRepresentation = loanWithAssociations?.summary?.currency?.displaySymbol
+        if (currencyRepresentation == null) {
+            currencyRepresentation = loanWithAssociations?.summary?.currency?.code
+        }
         if (loanWithAssociations?.repaymentSchedule?.periods != null) for ((_, _, dueDate, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, totalDueForPeriod) in loanWithAssociations.repaymentSchedule?.periods!!) {
             if (dueDate == loanWithAssociations.summary?.getOverdueSinceDate()) {
-                tvNextInstallmentName?.text = resources.getString(R.string.string_and_string,
-                        loanWithAssociations.summary?.currency?.displaySymbol,
-                        CurrencyUtil.formatCurrency(activity,
-                                totalDueForPeriod))
+                tvNextInstallmentName?.text = currencyRepresentation +
+                        CurrencyUtil.formatCurrency(activity, totalDueForPeriod)
                 break
             } else if (loanWithAssociations.summary?.getOverdueSinceDate() == null) {
                 tvNextInstallmentName?.setText(R.string.not_available)