auto select from account after to account is selected
This commit is contained in:
@@ -342,18 +342,7 @@ class TransferFragment : Fragment() {
|
|||||||
val colorHex = bundle.getString(ContactPickerSheetFragment.KEY_COLOR) ?: "#607D8B"
|
val colorHex = bundle.getString(ContactPickerSheetFragment.KEY_COLOR) ?: "#607D8B"
|
||||||
val imageHash = bundle.getString(ContactPickerSheetFragment.KEY_IMAGE_HASH)
|
val imageHash = bundle.getString(ContactPickerSheetFragment.KEY_IMAGE_HASH)
|
||||||
prefillToDirectly(accountNumber, label, subtitle, colorHex, imageHash)
|
prefillToDirectly(accountNumber, label, subtitle, colorHex, imageHash)
|
||||||
if (selectedAccount == null) {
|
selectDefaultSourceIfNone()
|
||||||
val defaultNum = CredentialStore(requireContext()).getDefaultAccountNumber()
|
|
||||||
if (defaultNum != null) {
|
|
||||||
val defaultAcc = viewModel.accounts.value?.firstOrNull { it.accountNumber == defaultNum }
|
|
||||||
if (defaultAcc != null) {
|
|
||||||
selectedAccount = defaultAcc
|
|
||||||
updateAmountPrefix(defaultAcc)
|
|
||||||
showFromCard(defaultAcc)
|
|
||||||
updateTransferButton()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.btnPickContact.setOnClickListener {
|
binding.btnPickContact.setOnClickListener {
|
||||||
@@ -793,9 +782,18 @@ class TransferFragment : Fragment() {
|
|||||||
colorHex = contact.bankColor,
|
colorHex = contact.bankColor,
|
||||||
imageHash = contact.customerImgHash
|
imageHash = contact.customerImgHash
|
||||||
)
|
)
|
||||||
|
selectDefaultSourceIfNone()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Picks the user's default account as the source when a recipient is chosen before any source. */
|
||||||
|
private fun selectDefaultSourceIfNone() {
|
||||||
|
if (selectedAccount != null) return
|
||||||
|
val defaultNum = CredentialStore(requireContext()).getDefaultAccountNumber() ?: return
|
||||||
|
val defaultAcc = viewModel.accounts.value?.firstOrNull { it.accountNumber == defaultNum } ?: return
|
||||||
|
selectSourceAccount(defaultAcc)
|
||||||
|
}
|
||||||
|
|
||||||
private fun lookupAccount() {
|
private fun lookupAccount() {
|
||||||
if (selectedAccount == null) {
|
if (selectedAccount == null) {
|
||||||
val defaultNum = CredentialStore(requireContext()).getDefaultAccountNumber()
|
val defaultNum = CredentialStore(requireContext()).getDefaultAccountNumber()
|
||||||
|
|||||||
Reference in New Issue
Block a user