From 1edfc08da37a5084a35c3def4f4fddbcb8f516ce Mon Sep 17 00:00:00 2001 From: Peter Olamit Date: Wed, 15 May 2019 17:31:40 -0700 Subject: [PATCH 1/2] HW-50743 External Account Profile Information --- .../ui/transfermethod/AddTransferMethodFragment.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodFragment.java b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodFragment.java index b5662f118..2b103ab45 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodFragment.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodFragment.java @@ -16,6 +16,7 @@ */ package com.hyperwallet.android.ui.transfermethod; +import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.PROFILE_TYPE; import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TRANSFER_METHOD_COUNTRY; import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TRANSFER_METHOD_CURRENCY; import static com.hyperwallet.android.model.HyperwalletTransferMethod.TransferMethodFields.TYPE; @@ -209,6 +210,7 @@ public void onViewStateRestored(@Nullable Bundle savedInstanceState) { mCountry = savedInstanceState.getString(ARGUMENT_TRANSFER_METHOD_COUNTRY); mCurrency = savedInstanceState.getString(ARGUMENT_TRANSFER_METHOD_CURRENCY); mTransferMethodType = savedInstanceState.getString(ARGUMENT_TRANSFER_METHOD_TYPE); + mTransferMethodProfileType = savedInstanceState.getString(ARGUMENT_TRANSFER_METHOD_PROFILE_TYPE); mShowCreateProgressBar = savedInstanceState.getBoolean(ARGUMENT_SHOW_CREATE_PROGRESS_BAR); mTransferMethod = savedInstanceState.getParcelable(ARGUMENT_TRANSFER_METHOD); } else { // same as AddTransferMethodFragment#newInstance @@ -216,6 +218,7 @@ public void onViewStateRestored(@Nullable Bundle savedInstanceState) { mCountry = getArguments().getString(ARGUMENT_TRANSFER_METHOD_COUNTRY); mCurrency = getArguments().getString(ARGUMENT_TRANSFER_METHOD_CURRENCY); mTransferMethodType = getArguments().getString(ARGUMENT_TRANSFER_METHOD_TYPE); + mTransferMethodProfileType = getArguments().getString(ARGUMENT_TRANSFER_METHOD_PROFILE_TYPE); mTransferMethod = getArguments().getParcelable(ARGUMENT_TRANSFER_METHOD); } } @@ -238,6 +241,7 @@ public void onSaveInstanceState(@NonNull Bundle outState) { outState.putString(ARGUMENT_TRANSFER_METHOD_COUNTRY, mCountry); outState.putString(ARGUMENT_TRANSFER_METHOD_CURRENCY, mCurrency); outState.putString(ARGUMENT_TRANSFER_METHOD_TYPE, mTransferMethodType); + outState.putString(ARGUMENT_TRANSFER_METHOD_PROFILE_TYPE, mTransferMethodProfileType); outState.putBoolean(ARGUMENT_SHOW_CREATE_PROGRESS_BAR, mShowCreateProgressBar); outState.putParcelable(ARGUMENT_TRANSFER_METHOD, mTransferMethod); super.onSaveInstanceState(outState); @@ -516,6 +520,8 @@ private void triggerSubmit() { mTransferMethod.setField(widget.getName(), widget.getValue()); } } + + mTransferMethod.setField(PROFILE_TYPE, mTransferMethodProfileType); mPresenter.createTransferMethod(mTransferMethod); } } From af7b6e9ef1a42127f608d63d1bd2ba96346057ad Mon Sep 17 00:00:00 2001 From: Peter Olamit Date: Thu, 16 May 2019 17:27:10 -0700 Subject: [PATCH 2/2] fix for required/non required field can be submitted --- .../ui/transfermethod/AddTransferMethodFragment.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodFragment.java b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodFragment.java index 2b103ab45..00d14a1fc 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodFragment.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodFragment.java @@ -594,16 +594,7 @@ private boolean performValidation(boolean bypassFocusCheck) { } } } - return valid && hasWidget && haveAllWidgetsReceivedFocus(); - } - - private boolean haveAllWidgetsReceivedFocus() { - for (String key : mWidgetInputStateHashMap.keySet()) { - if (!mWidgetInputStateHashMap.get(key).hasFocused()) { - return false; - } - } - return true; + return valid && hasWidget; } @Override