diff --git a/app/src/main/java/org/mifos/mobile/ui/loan_account/LoanAccountsDetailFragment.kt b/app/src/main/java/org/mifos/mobile/ui/loan_account/LoanAccountsDetailFragment.kt index 4e93c76c9..7565c44bf 100644 --- a/app/src/main/java/org/mifos/mobile/ui/loan_account/LoanAccountsDetailFragment.kt +++ b/app/src/main/java/org/mifos/mobile/ui/loan_account/LoanAccountsDetailFragment.kt @@ -18,8 +18,6 @@ import org.mifos.mobile.ui.fragments.ClientChargeFragment import org.mifos.mobile.ui.fragments.GuarantorListFragment import org.mifos.mobile.ui.fragments.LoanAccountTransactionFragment import org.mifos.mobile.ui.loan_account_withdraw.LoanAccountWithdrawFragment -import org.mifos.mobile.ui.fragments.LoanApplicationFragment -import org.mifos.mobile.ui.fragments.LoanAccountWithdrawFragment import org.mifos.mobile.ui.loan_account_application.LoanApplicationFragment import org.mifos.mobile.ui.fragments.LoanRepaymentScheduleFragment import org.mifos.mobile.ui.fragments.QrCodeDisplayFragment diff --git a/app/src/main/java/org/mifos/mobile/ui/loan_account_application/LoanApplicationFragment.kt b/app/src/main/java/org/mifos/mobile/ui/loan_account_application/LoanApplicationFragment.kt index 5ad162ac0..5e0535bd1 100644 --- a/app/src/main/java/org/mifos/mobile/ui/loan_account_application/LoanApplicationFragment.kt +++ b/app/src/main/java/org/mifos/mobile/ui/loan_account_application/LoanApplicationFragment.kt @@ -69,7 +69,7 @@ class LoanApplicationFragment : BaseFragment() { private fun reviewNewLoanApplication() { val loansPayload = LoansPayload() loansPayload.clientId = viewModel.loanTemplate?.clientId - loansPayload.loanPurpose = viewModel.loanApplicationScreenData.value.selectedLoanPurpose + loansPayload.loanPurpose = viewModel.loanApplicationScreenData.value.selectedLoanPurpose ?: getString(R.string.loan_purpose_not_provided) loansPayload.productName = viewModel.loanApplicationScreenData.value.selectedLoanProduct loansPayload.currency = viewModel.loanApplicationScreenData.value.currencyLabel if (viewModel.purposeId > 0) loansPayload.loanPurposeId = viewModel.purposeId @@ -115,7 +115,7 @@ class LoanApplicationFragment : BaseFragment() { loansPayload.principal = viewModel.loanApplicationScreenData.value.principalAmount?.toDouble() ?: 0.0 loansPayload.productId = viewModel.productId - loansPayload.loanPurpose = viewModel.loanApplicationScreenData.value.selectedLoanPurpose + loansPayload.loanPurpose = viewModel.loanApplicationScreenData.value.selectedLoanPurpose ?: getString(R.string.loan_purpose_not_provided) loansPayload.productName = viewModel.loanApplicationScreenData.value.selectedLoanProduct loansPayload.currency = viewModel.loanApplicationScreenData.value.currencyLabel if (viewModel.purposeId > 0) loansPayload.loanPurposeId = viewModel.purposeId diff --git a/ui/src/main/java/org/mifos/mobile/core/ui/component/MifosDropDownTextField.kt b/ui/src/main/java/org/mifos/mobile/core/ui/component/MifosDropDownTextField.kt index 26a4ea209..a1a01057c 100644 --- a/ui/src/main/java/org/mifos/mobile/core/ui/component/MifosDropDownTextField.kt +++ b/ui/src/main/java/org/mifos/mobile/core/ui/component/MifosDropDownTextField.kt @@ -100,7 +100,7 @@ fun MifosDropDownTextField( DropdownMenu( expanded = expanded, modifier = Modifier - .fillMaxWidth() + .fillMaxWidth(0.92f) .heightIn(max = 200.dp), onDismissRequest = { expanded = false }, ) {