Merge branch 'bug/DTSERWFOUR-170-Remaining-Screen-Updates' of https://github.com/hyperwallet/hyperwallet-android-ui-sdk into bug/DTSERWFOUR-170-Remaining-Screen-Updates

shanavas123 · shanavas123 · commit 2a17ee481ead · 2020-11-24T23:37:35.000+05:30
diff --git a/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListPrepaidCardReceiptsViewModel.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListPrepaidCardReceiptsViewModel.java
@@ -19,8 +19,6 @@ public class ListPrepaidCardReceiptsViewModel extends ListReceiptsViewModel {
     private PrepaidCardReceiptRepository mPrepaidCardReceiptRepository;
     private MutableLiveData<Event<Receipt>> mDetailNavigation = new MutableLiveData<>();
 
-    private boolean mIsInitialized;
-
     ListPrepaidCardReceiptsViewModel(@NonNull final PrepaidCardReceiptRepository receiptRepository) {
         mPrepaidCardReceiptRepository = receiptRepository;
 
@@ -50,10 +48,7 @@ public LiveData<PagedList<Receipt>> receipts() {
 
     @Override
     public void init() {
-        if (!mIsInitialized) {
-            mIsInitialized = true;
-            mPrepaidCardReceiptRepository.loadPrepaidCardReceipts();
-        }
+        mPrepaidCardReceiptRepository.loadPrepaidCardReceipts();
     }
 
     @Override
diff --git a/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListUserReceiptsViewModel.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListUserReceiptsViewModel.java
@@ -19,8 +19,6 @@ public class ListUserReceiptsViewModel extends ListReceiptsViewModel {
     private UserReceiptRepository mUserReceiptRepository;
     private MutableLiveData<Event<Receipt>> mDetailNavigation = new MutableLiveData<>();
 
-    private boolean mIsInitialized;
-
     ListUserReceiptsViewModel(@NonNull final UserReceiptRepository userReceiptRepository) {
         mUserReceiptRepository = userReceiptRepository;
 
@@ -36,11 +34,8 @@ public void onChanged(Event<Errors> event) {
 
     @Override
     public void init() {
-        if (!mIsInitialized) {
-            mIsInitialized = true;
-            // load initial receipts
-            mUserReceiptRepository.loadUserReceipts();
-        }
+        // load initial receipts
+        mUserReceiptRepository.loadUserReceipts();
     }
 
     @Override
diff --git a/receiptui/src/test/java/com/hyperwallet/android/ui/receipt/viewmodel/ListPrepaidCardReceiptsViewModelTest.java b/receiptui/src/test/java/com/hyperwallet/android/ui/receipt/viewmodel/ListPrepaidCardReceiptsViewModelTest.java
@@ -5,6 +5,7 @@
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
 import com.hyperwallet.android.ui.receipt.repository.PrepaidCardReceiptRepository;
@@ -61,12 +62,12 @@ public void testListLoadPrepaidCardReceiptsViewModel() {
     }
 
     @Test
-    public void testInit_verifyInitializedOnce() {
+    public void testInit_verifyInitializedMultiple() {
         mListPrepaidCardReceiptsViewModel.init();
         verify(mPrepaidCardReceiptRepository).loadPrepaidCardReceipts();
         // call again. multiple calls to init should only register 1 call to repository
         mListPrepaidCardReceiptsViewModel.init();
-        verify(mPrepaidCardReceiptRepository).loadPrepaidCardReceipts();
+        verify(mPrepaidCardReceiptRepository, times(2)).loadPrepaidCardReceipts();
     }
 
     @Test
diff --git a/receiptui/src/test/java/com/hyperwallet/android/ui/receipt/viewmodel/ListReceiptsViewModelTest.java b/receiptui/src/test/java/com/hyperwallet/android/ui/receipt/viewmodel/ListReceiptsViewModelTest.java
@@ -5,6 +5,7 @@
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
 import com.hyperwallet.android.ui.receipt.repository.PrepaidCardReceiptRepository;
@@ -60,12 +61,12 @@ public void testLoadPrepaidCardReceiptsViewModel() {
     }
 
     @Test
-    public void testInit_verifyInitializedOnce() {
+    public void testInit_verifyInitializedMultiple() {
         mListReceiptsViewModel.init();
         verify(mPrepaidCardReceiptRepository).loadPrepaidCardReceipts();
         // call again. multiple calls to init should only register 1 call to repository
         mListReceiptsViewModel.init();
-        verify(mPrepaidCardReceiptRepository).loadPrepaidCardReceipts();
+        verify(mPrepaidCardReceiptRepository, times(2)).loadPrepaidCardReceipts();
     }
 
     @Test
diff --git a/receiptui/src/test/java/com/hyperwallet/android/ui/receipt/viewmodel/ListUserReceiptsViewModelTest.java b/receiptui/src/test/java/com/hyperwallet/android/ui/receipt/viewmodel/ListUserReceiptsViewModelTest.java
@@ -5,6 +5,7 @@
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
 import com.hyperwallet.android.ui.receipt.repository.PrepaidCardReceiptRepository;
@@ -61,12 +62,12 @@ public void testListUserReceiptViewModel() {
     }
 
     @Test
-    public void testInit_verifyInitializedOnce() {
+    public void testInit_verifyInitializedMultiple() {
         mListUserReceiptsViewModel.init();
         verify(mUserReceiptRepository).loadUserReceipts();
         // call again. multiple calls to init should only register 1 call to repository
         mListUserReceiptsViewModel.init();
-        verify(mUserReceiptRepository).loadUserReceipts();
+        verify(mUserReceiptRepository, times(2)).loadUserReceipts();
     }
 
     @Test
diff --git a/transferui/src/main/java/com/hyperwallet/android/ui/transfer/view/CreateTransferFragment.java b/transferui/src/main/java/com/hyperwallet/android/ui/transfer/view/CreateTransferFragment.java
@@ -570,6 +570,22 @@ private void registerTransferSourceObservers() {
                     public void onChanged(ArrayList<TransferSource> transferSources) {
                         if (transferSources.size() <= 1) {
                             mTransferSource.setOnClickListener(null);
+                        } else {
+                            mTransferSource.setOnClickListener(new OneClickListener() {
+                                @Override
+                                public void onOneClick(View v) {
+                                    TransferSource activeSource =
+                                            mCreateTransferViewModel.getTransferSelectedSource().getValue();
+                                    ArrayList<TransferSource> sourceList =
+                                            mCreateTransferViewModel.getTransferSources().getValue();
+                                    Intent intent = new Intent(requireContext(), ListTransferSourceActivity.class);
+                                    intent.putParcelableArrayListExtra(ListTransferSourceActivity.EXTRA_TRANSFER_SOURCE_LIST,
+                                            sourceList);
+                                    intent.putExtra(ListTransferSourceActivity.EXTRA_SELECTED_SOURCE_TOKEN,
+                                            activeSource.getToken());
+                                    startActivityForResult(intent, SELECT_TRANSFER_SOURCE_REQUEST_CODE);
+                                }
+                            });
                         }
                     }
                 });
diff --git a/transferui/src/main/java/com/hyperwallet/android/ui/transfer/viewmodel/CreateTransferViewModel.java b/transferui/src/main/java/com/hyperwallet/android/ui/transfer/viewmodel/CreateTransferViewModel.java
@@ -99,7 +99,6 @@ public class CreateTransferViewModel extends ViewModel {
     private final MutableLiveData<TransferSource> mSelectedTransferSource = new MutableLiveData<>();
 
     private String mSourceToken;
-    private boolean mIsInitialized;
     private String initialAmount;
     private boolean mIsPortraitMode;
     private ProgramModel mProgramModel;
@@ -133,10 +132,7 @@ public class CreateTransferViewModel extends ViewModel {
         mPrepaidCardRepository = prepaidCardRepository;
 
         // initialize
-        mTransferAvailableFunds.setValue(Boolean.FALSE);
-        mIsLoading.postValue(Boolean.TRUE);
-        mIsCreateQuoteLoading.setValue(Boolean.FALSE);
-        mShowFxRateChange.setValue(Boolean.FALSE);
+        initialize();
     }
 
     /**
@@ -155,7 +151,11 @@ public class CreateTransferViewModel extends ViewModel {
         mUserRepository = userRepository;
         mPrepaidCardRepository = prepaidCardRepository;
 
-        // initialize
+        // Initialize
+        initialize();
+    }
+
+    private void initialize() {
         mTransferAvailableFunds.setValue(Boolean.FALSE);
         mIsLoading.postValue(Boolean.TRUE);
         mIsCreateQuoteLoading.setValue(Boolean.FALSE);
@@ -165,30 +165,24 @@ public class CreateTransferViewModel extends ViewModel {
     public void init(@NonNull final String defaultAmount) {
         initialAmount = defaultAmount;
         isCardModel = ProgramModel.isCardModel(getProgramModel());
-        if (!mIsInitialized) {
-            mIsInitialized = true;
-            if (mSourceToken == null) {
-                loadTransferSource();
-            } else {
-                loadTransferSource(mSourceToken);
-            }
+        if (mSourceToken == null) {
+            loadTransferSource();
+        } else {
+            loadTransferSource(mSourceToken);
         }
     }
 
     /**
      * Refresh this view model please only call this when this view model is initialized
      * or else it will just do nothing
      */
-    public void refresh() {
+    public void refresh(String amount) {
         mTransferAmount.postValue(null);
         mTransferNotes.postValue(null);
-        if (!isTransferDestinationUnknown()
-                && !isTransferSourceTokenUnknown() && mIsInitialized) {
-            quoteAvailableTransferFunds(mSourceToken, mTransferDestination.getValue());
-        } else if (isTransferDestinationUnknown()
-                && !isTransferSourceTokenUnknown() && mIsInitialized) {
-            loadTransferDestination(mSourceToken);
-        }
+        mSourceToken = null;
+        // Re-Initialize
+        initialize();
+        init(amount);
     }
 
     public boolean isPortraitMode() {
diff --git a/transferui/src/test/java/com/hyperwallet/android/ui/transfer/viewmodel/CreateTransferViewModelTest.java b/transferui/src/test/java/com/hyperwallet/android/ui/transfer/viewmodel/CreateTransferViewModelTest.java
@@ -1157,10 +1157,9 @@ public void testRefresh_callsRefreshWithQuote() {
         // test
         CreateTransferViewModel viewModel = spy(factory.create(CreateTransferViewModel.class));
         doReturn(ProgramModel.CARD_ONLY_MODEL).when(viewModel).getProgramModel();
-        viewModel.init("0");
-        viewModel.refresh();
+        viewModel.refresh("0");
 
-        verify(mTransferRepository, times(2)).createTransfer(any(Transfer.class),
+        verify(mTransferRepository, times(1)).createTransfer(any(Transfer.class),
                 any(TransferRepository.CreateTransferCallback.class));
     }
 
@@ -1172,9 +1171,11 @@ public void testRefresh_callsRefreshWithoutQuote() {
 
         // test
         CreateTransferViewModel viewModel = factory.create(CreateTransferViewModel.class);
-        viewModel.refresh();
+        viewModel.refresh("0");
 
-        verify(mTransferRepository, never()).createTransfer(any(Transfer.class),
+        assertThat(viewModel, is(notNullValue()));
+        assertThat(viewModel.isTransferAllAvailableFunds().getValue(), is(false));
+        verify(mTransferRepository, times(1)).createTransfer(any(Transfer.class),
                 any(TransferRepository.CreateTransferCallback.class));
     }
 
