Penny test ready

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/adapter/accountlisting/AccountListingRvAdapter.java

@@ -5,6 +5,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.bumptech.glide.Glide;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisting.AutoDebitAccount;
 import com.gmeremit.online.gmeremittance_native.accountmanage.view.accountlisting.autodebitlisting.AccountAddRVViewHolder;
@@ -61,7 +62,11 @@ public class AccountListingRvAdapter extends RecyclerView.Adapter<RecyclerView.V
             AccountListingRVViewHolder holder = (AccountListingRVViewHolder) hold;
             AutoDebitAccount autoDebitAccount = data.get(hold.getAdapterPosition());
             holder.setBankName(autoDebitAccount.getBankName());
-            holder.getBankIconImageView().setImageResource(BankIconMapper.getBankIconFromBankCode(autoDebitAccount.getBankCode()));
+
+            Glide.with(holder.getBankIconImageView().getContext())
+                    .load(BankIconMapper.getBankIconFromBankCode(autoDebitAccount.getBankCode()))
+                    .into(holder.getBankIconImageView());
+
             holder.setAccNo(autoDebitAccount.getAccountNumMasked());
             if(autoDebitAccount.isInboundPennyTestRequested()) {
                 holder.getLinkAsInboundImageView().setVisibility(View.INVISIBLE);

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/adapter/accountlisting/InboundAccountListingRvAdapter.java

@@ -8,6 +8,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisting.InboundAccount;
 import com.gmeremit.online.gmeremittance_native.accountmanage.view.accountlisting.autodebitlisting.AccountAddRVViewHolder;
@@ -52,7 +53,11 @@ public class InboundAccountListingRvAdapter extends RecyclerView.Adapter<Recycle
             InboundAccount inboundAccount = inboundAccountList.get(i);
             ((InboundListingRVAdapter) viewHolder).setBankName(inboundAccount.getBank());
             ((InboundListingRVAdapter) viewHolder).setAccNo(inboundAccount.getAccountNo());
-            ((InboundListingRVAdapter) viewHolder).getBankIconImageView().setImageResource(BankIconMapper.getBankIconFromBankCode(inboundAccount.getBankCode()));
+
+            Glide.with( ((InboundListingRVAdapter) viewHolder).getBankIconImageView().getContext())
+                    .load(BankIconMapper.getBankIconFromBankCode(inboundAccount.getBankCode()))
+                    .into( ((InboundListingRVAdapter) viewHolder).getBankIconImageView());
+
             if(inboundAccount.getIsPennyTestSuccess())
             {
                 ((InboundListingRVAdapter) viewHolder).getLinkAsInboundImageView().setVisibility(View.GONE);

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/gateway/inboundaccountmanage/InboundAccountAddV2Gateway.java

@@ -18,8 +18,8 @@ public class InboundAccountAddV2Gateway extends PrivilegedGateway implements Inb
     }
 
     @Override
-    public Observable<ResponseBody> startPennyTest(String auth, String userId, InboundAccountAddRequestBody requestBody) {
-        return HttpClientV2.getInstance().startInboundPennyTestStart(auth,userId,requestBody);
+    public Observable<ResponseBody> startPennyTest(String auth, String userId, InboundAccountAddRequestBody requestBody,String resend) {
+        return HttpClientV2.getInstance().startInboundPennyTestStart(auth,userId,requestBody,resend);
     }
 
     @Override

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2InteractorInterface.java

@@ -14,7 +14,7 @@ public interface InboundAccountAddV2InteractorInterface extends BaseInteractorIn
     {
         Observable<ResponseBody> getKoreanBankList(String auth, String Uid);
 
-        Observable<ResponseBody> startPennyTest(String auth, String userId, InboundAccountAddRequestBody requestBody);
+        Observable<ResponseBody> startPennyTest(String auth, String userId, InboundAccountAddRequestBody requestBody,String resend);
 
         Observable<ResponseBody> submitPennyTest(String auth,String userId,String bankCode, String accountNo, String cerNumber);
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2Presenter.java

@@ -79,9 +79,9 @@ public class InboundAccountAddV2Presenter extends BasePresenter implements Inbou
     }
 
     @Override
-    public void requestForPennyTest() {
+    public void requestForPennyTest(String resend) {
         compositeDisposable.add(
-                this.gateway.startPennyTest(this.gateway.getAuth(), this.gateway.getUserIDNumber(), this.pennyTestRequestBody)
+                this.gateway.startPennyTest(this.gateway.getAuth(), this.gateway.getUserIDNumber(), this.pennyTestRequestBody,resend)
                         .doOnSubscribe(subs -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
@@ -157,7 +157,7 @@ public class InboundAccountAddV2Presenter extends BasePresenter implements Inbou
 
     @Override
     public void onBankDetailValidated() {
-        requestForPennyTest();
+        requestForPennyTest("Y");
     }
 
     public class PennyTestRequestObserver extends GenericApiObserverResponseV2<MessageResponseDataModel> {
@@ -201,7 +201,7 @@ public class InboundAccountAddV2Presenter extends BasePresenter implements Inbou
                     view.exitView();
                 });
             } else {
-                view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, null);
+                view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.onPennyTestSuccess());
             }
         }
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2PresenterInterface.java

@@ -20,7 +20,7 @@ public interface InboundAccountAddV2PresenterInterface extends BasePresenterInte
 
      void getRelatedData();
 
-     void requestForPennyTest();
+     void requestForPennyTest(String resend);
 
      void submitPennyTest(String depositReference);
 
@@ -49,5 +49,7 @@ public interface InboundAccountAddV2PresenterInterface extends BasePresenterInte
         void showInvalidDepositError(String errorMessage);
 
         void enableForm2Button(boolean action);
+
+        void onPennyTestSuccess();
     }
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/accountlisting/AccountListingV2Activity.java

@@ -87,7 +87,7 @@ public class AccountListingV2Activity extends BaseActivity implements AutoDebitA
                 break;
 
             case 2:
-                toolbarTitle.setText("Inbound Account");
+                toolbarTitle.setText(getString(R.string.inbound_title_text));
                 this.presenter.getInboundData();
                 accountTabLayoutContainer.setVisibility(View.GONE);
                 accountManageViewPager.setCurrentItem(1,true);
@@ -95,7 +95,7 @@ public class AccountListingV2Activity extends BaseActivity implements AutoDebitA
                 break;
 
             default:
-                toolbarTitle.setText("Manage Accounts");
+                toolbarTitle.setText(getString(R.string.auto_debit_title_text));
                 accountManageViewPager.setCurrentItem(0,true);
                 accountTabLayoutContainer.setVisibility(View.VISIBLE);
                 this.presenter.getAllAccountRelatedData();

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/accountlisting/inboundlisting/InboundAccountListingFragment.java

@@ -194,7 +194,7 @@ public class InboundAccountListingFragment extends BaseFragment implements View.
     public void deleteInboundAccount(InboundAccount inboundAccount) {
         AlertDialog.Builder alert = new AlertDialog.Builder(getActivity());
         alert.setTitle(getString(R.string.are_you_sure_text))
-                .setMessage("Are you sure want to delete inbound account!")
+                .setMessage(getString(R.string.delete_account_message_text))
                 .setPositiveButton(getString(R.string.yes_text), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAccountAddActivity.java

@@ -20,12 +20,15 @@ import com.gmeremit.online.gmeremittance_native.accountmanage.model.accountlisti
 import com.gmeremit.online.gmeremittance_native.accountmanage.presenter.inboundaccountmanage.InboundAccountAddV2Presenter;
 import com.gmeremit.online.gmeremittance_native.accountmanage.presenter.inboundaccountmanage.InboundAccountAddV2PresenterInterface;
 import com.gmeremit.online.gmeremittance_native.base.BaseActivity;
+import com.gmeremit.online.gmeremittance_native.homeV2.view.HomeActivityV2;
 
 import java.util.ArrayList;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
+import static com.gmeremit.online.gmeremittance_native.homeV2.view.HomeActivityV2.BUNDLE_ACTION_FETCH_ALL_DATA;
+
 public class InboundAccountAddActivity extends BaseActivity implements InboundAccountAddV2PresenterInterface.InboundAccountAddV2ContractInterface,InboundAccountAddActionListener {
 
     private static final String ACCOUNT_DATA_BUNDLE_KEY = "ACCOUNT_DATA_BUNDLE_KEY";
@@ -138,6 +141,15 @@ public class InboundAccountAddActivity extends BaseActivity implements InboundAc
         ((InboundAddAccountPennyTestFragment) fragments.get(1)).enableButton(action);
     }
 
+    @Override
+    public void onPennyTestSuccess() {
+        Intent a = new Intent(this, HomeActivityV2.class);
+        a.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        a.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        startActivity(a);
+        finish();
+    }
+
     @Override
     public InboundAccountAddV2PresenterInterface getPresenter() {
         return this.presenter;

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAddAccountPennyTestFragment.java

@@ -103,7 +103,7 @@ public class InboundAddAccountPennyTestFragment extends BaseFragment {
     @OnClick(R.id.resend_request)
     public void resendRequest()
     {
-        ((InboundAccountAddActionListener) getActivity()).getPresenter().requestForPennyTest();
+        ((InboundAccountAddActionListener) getActivity()).getPresenter().requestForPennyTest("N");
     }
 
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java

@@ -13,6 +13,7 @@ import androidx.annotation.RequiresApi;
 
 import com.gmeremit.online.gmeremittance_native.kycV2.view.pennytest.PennyTestActivity;
 import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.view.OutboundTransactionHistoryActivityV2;
+import com.gmeremit.online.gmeremittance_native.walletstatementV2.view.WalletStatementV2Activity;
 import com.google.android.material.navigation.NavigationView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -346,18 +347,14 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
 
     @Override
     public void showWalletStatment() {
-//        if (isNotificaitonViewActive())
-//            return;
-//        String unverifiedMessage = presenter.checkIfUserVerified();
-//        if (unverifiedMessage == null)
-//            launchActivity(new Intent(getApplicationContext(), WalletStatementV2Activity.class));
-//        else
-//            showPopUpMessage(unverifiedMessage, CustomAlertDialog.AlertType.ALERT, null);
-
-//        InboundAccountAddBottomSheetDialogFragment.newInstance().show( getSupportFragmentManager(),"Inbound add");
+        if (isNotificaitonViewActive())
+            return;
+        String unverifiedMessage = presenter.checkIfUserVerified();
+        if (unverifiedMessage == null)
+            startActivity(new Intent(getApplicationContext(), WalletStatementV2Activity.class));
+        else
+            showPopUpMessage(unverifiedMessage, CustomAlertDialog.AlertType.ALERT, null);
 
-        Intent startPennyTestIntent = new Intent(this, InboundAccountAddActivity.class);
-        startActivity(startPennyTestIntent);
     }
 
     @Override
@@ -463,7 +460,13 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
 
     @Override
     public void showLocalTopup() {
-        startActivity(new Intent(this, LocalTopUpActivity.class));
+        if (isNotificaitonViewActive())
+            return;
+        String unverifiedMessage = presenter.checkIfUserVerified();
+        if (unverifiedMessage == null)
+            startActivity(new Intent(getApplicationContext(), LocalTopUpActivity.class));
+        else
+            showPopUpMessage(unverifiedMessage, CustomAlertDialog.AlertType.ALERT, null);
     }
 
     @Override

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java

@@ -158,7 +158,7 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
 //        menuList.add(new MenuItem(getString(R.string.resend_money_text), R.drawable.ic_menu_resendmoney, 5));
         menuList.add(new MenuItem(getString(R.string.local_transfer_text), R.drawable.ic_menu_domestic, 7));
         menuList.add(new MenuItem(getString(R.string.gme_wallet_statement_text), R.drawable.ic_menu_wallet_statement, 4));
-        menuList.add(new MenuItem("Local Topup", R.drawable.ic_local_topup, 8));
+//        menuList.add(new MenuItem("Local Topup", R.drawable.ic_local_topup, 8));
         return menuList;
     }
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/inboundreceipt/presenter/InboundRemitReceiptPresenterImpl.java

@@ -84,7 +84,8 @@ public class InboundRemitReceiptPresenterImpl extends BasePresenter implements I
             {
                 inboundData=t.getData();
                 formatDataAndUpdateReceipt(t.getData());
-                view.showRequestToLinkInbound(!t.getData().isAccountReg());
+                view.showRequestToLinkInbound(!t.getData().isAccountReg(),t.getData().getStatus());
+//                view.showRequestToLinkInbound(false,"ASF");
 
             }
             else

app/src/main/java/com/gmeremit/online/gmeremittance_native/inboundreceipt/presenter/InboundRemitReceiptPresenterInterface.java

@@ -16,6 +16,6 @@ public interface InboundRemitReceiptPresenterInterface extends BasePresenterInte
     {
         void showReciept(InboundRemitReceiptActivity.TxnReceiptViewModel receiptViewModel);
 
-        void showRequestToLinkInbound(boolean action);
+        void showRequestToLinkInbound(boolean isAccountRegistered,String payoutStatus);
     }
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/inboundreceipt/view/InboundRemitReceiptActivity.java

@@ -12,9 +12,7 @@ import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.accountmanage.view.inboundaccountmanage.InboundAccountAddActivity;
 import com.gmeremit.online.gmeremittance_native.base.BaseActivity;
-import com.gmeremit.online.gmeremittance_native.customwidgets.banklistingdialog.BankIconMapper;
 import com.gmeremit.online.gmeremittance_native.customwidgets.exchangecountrylistingdialog.CountryFlagMapper;
-import com.gmeremit.online.gmeremittance_native.homeV2.view.HomeActivityV2;
 import com.gmeremit.online.gmeremittance_native.inboundreceipt.gateway.InboundRemitReceiptGateway;
 import com.gmeremit.online.gmeremittance_native.inboundreceipt.presenter.InboundRemitReceiptPresenterImpl;
 import com.gmeremit.online.gmeremittance_native.inboundreceipt.presenter.InboundRemitReceiptPresenterInterface;
@@ -23,6 +21,8 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
+import static android.view.View.GONE;
+
 public class InboundRemitReceiptActivity extends BaseActivity implements InboundRemitReceiptPresenterInterface.InboundRemitReceiptViewContract {
 
 
@@ -78,7 +78,10 @@ public class InboundRemitReceiptActivity extends BaseActivity implements Inbound
     View linkAccountButtonContainer;
 
     @BindView(R.id.view13)
-    ProgressPathView progressPathView;
+    ProgressPathView progressPathView2;
+
+    @BindView(R.id.view12)
+    ProgressPathView progressPathView1;
 
     @BindView(R.id.clockView)
     ImageView clockView;
@@ -87,7 +90,6 @@ public class InboundRemitReceiptActivity extends BaseActivity implements Inbound
     ImageView senderFlagImageview;
 
 
-
     private InboundRemitReceiptPresenterImpl presenter;
 
     public static final String INBOUND_TXN_ID_BUNDLE_KEY = "INBOUND_TXN_ID_BUNDLE_KEY";
@@ -111,10 +113,16 @@ public class InboundRemitReceiptActivity extends BaseActivity implements Inbound
 
     private void init() {
         this.presenter = new InboundRemitReceiptPresenterImpl(this, new InboundRemitReceiptGateway(), getIntent().getStringExtra(INBOUND_TXN_ID_BUNDLE_KEY));
+        clock = AnimatedVectorDrawableCompat.create(this, R.drawable.avd_clock);
+        clockView.setImageDrawable(clock);
     }
 
     private void performDefaultAction(Bundle savedInstanceState) {
         if (savedInstanceState == null) {
+            progressPathView1.setVisibility(View.INVISIBLE);
+            progressPathView2.setVisibility(View.INVISIBLE);
+            clockView.setVisibility(View.INVISIBLE);
+
             iv_cancel.setVisibility(View.INVISIBLE);
             toolbar_title.setText(getString(R.string.receipt_title_text));
             presenter.getReceiptData();
@@ -132,34 +140,62 @@ public class InboundRemitReceiptActivity extends BaseActivity implements Inbound
         tv_total_sent_amount.setText(receiptViewModel.getTotalSendAmount());
         tv_service_fee.setText(receiptViewModel.getServiceFee());
         tv_bank_name.setText(receiptViewModel.getBank());
-        bank_detail_txt.setText(receiptViewModel.getBank()+" "+receiptViewModel.getAccNo());
+        bank_detail_txt.setText(receiptViewModel.getBank() + "\n" + receiptViewModel.getAccNo());
         tv_acc_no.setText(receiptViewModel.getAccNo());
         senderFlagImageview.setImageResource(CountryFlagMapper.getFlagFromCountryCode(receiptViewModel.getSendingCountryCode()));
     }
 
     @Override
-    public void showRequestToLinkInbound(boolean action) {
-        if (action) {
+    public void showRequestToLinkInbound(boolean isAccountRegistered, String payoutStatus) {
+        linkAccountButtonContainer.setVisibility(GONE);
+        action_hint_txt.setVisibility(GONE);
+        btn_submit.setVisibility(View.VISIBLE);
+
+        if (!isAccountRegistered) {
+            action_hint_txt.setVisibility(View.VISIBLE);
+
             linkAccountButtonContainer.setVisibility(View.VISIBLE);
-            action_hint_txt.setText("You have to register account at GME");
-            btn_submit.setVisibility(View.GONE);
-            transfer_label.setText("Transfer Holding");
-            progressPathView.showDashedPath(true);
-            clock = AnimatedVectorDrawableCompat.create(this, R.drawable.avd_clock);
-            clockView.setImageDrawable(clock);
+            action_hint_txt.setText(getString(R.string.you_have_to_register_text));
+            btn_submit.setVisibility(GONE);
+            transfer_label.setText(getString(R.string.transfer_processing_text));
             clockView.setVisibility(View.VISIBLE);
+
+            progressPathView1.showDashedPath(false);
+            progressPathView2.showDashedPath(true);
+            progressPathView1.setVisibility(View.VISIBLE);
+            progressPathView2.setVisibility(View.VISIBLE);
             if (clock != null && !clock.isRunning())
                 clock.start();
-
-        } else {
-            progressPathView.showDashedPath(false);
-            linkAccountButtonContainer.setVisibility(View.GONE);
-            action_hint_txt.setText("asdfl");
+        } else if ("PAID".equalsIgnoreCase(payoutStatus)) {
             transfer_label.setText(getString(R.string.transfer_success_text));
-            btn_submit.setVisibility(View.VISIBLE);
-            clock =null;
-            clockView.setVisibility(View.GONE);
+
+            progressPathView2.showDashedPath(false);
+            progressPathView1.showDashedPath(false);
+            progressPathView1.setVisibility(View.VISIBLE);
+            progressPathView2.setVisibility(View.VISIBLE);
+            clockView.setVisibility(View.INVISIBLE);
+        } else if("CANCELLED".equalsIgnoreCase(payoutStatus)) {
+            transfer_label.setText(getString(R.string.transfer_canceled_text));
+
+            progressPathView2.showDashedPath(false);
+            progressPathView1.showDashedPath(false);
+            progressPathView1.setVisibility(View.INVISIBLE);
+            progressPathView2.setVisibility(View.INVISIBLE);
+            clockView.setVisibility(View.INVISIBLE);
+        }
+        else
+        {
+            transfer_label.setText(getString(R.string.transfer_processing_text));
+            progressPathView2.showDashedPath(true);
+            progressPathView1.showDashedPath(true);
+            progressPathView1.setVisibility(View.VISIBLE);
+            progressPathView2.setVisibility(View.VISIBLE);
+            clockView.setVisibility(View.VISIBLE);
+            if (clock != null && !clock.isRunning())
+                clock.start();
         }
+
+
     }
 
     @OnClick({R.id.iv_back, R.id.btn_submit, R.id.btn_cancel})

app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java

@@ -116,7 +116,7 @@ public class TransactionHistoryV2Presenter extends BasePresenter implements Tran
                 Observable.zip(
                         fetchDomesticTransactionHistory("","").subscribeOn(Schedulers.io()),
                         fetchInternationalOutboundTransactionHistory("", "").subscribeOn(Schedulers.io()),
-                        fetchInternationalInboundTransactionHistory("2019-07-01", "2019-10-11").subscribeOn(Schedulers.io()),
+                        fetchInternationalInboundTransactionHistory("", "").subscribeOn(Schedulers.io()),
                         AllTransactionDTO::new)
                         .doOnSubscribe(subs -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                         .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/international/InternationalInboundTransactionHistoryTypeFragmentV2.java

@@ -67,7 +67,6 @@ public class InternationalInboundTransactionHistoryTypeFragmentV2 extends BaseFr
     @Override
     public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
         super.onViewStateRestored(savedInstanceState);
-        Log.d("KYC_FRAG", "On View State Restored called frag 1");
 
     }
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/international/adapter/InternationalInboundTransactionHistoryRVAdapter.java

@@ -47,8 +47,6 @@ public class InternationalInboundTransactionHistoryRVAdapter extends RecyclerVie
 
         if ("PAID".equalsIgnoreCase(transactionItem.getStatus()))
             holder.setPayStatusBackground(R.drawable.rounded_bg_blue);
-        else if ("HOLD".equalsIgnoreCase(transactionItem.getStatus()))
-            holder.setPayStatusBackground(R.drawable.rounded_bg_turquoise);
         else
             holder.setPayStatusBackground(R.drawable.rounded_bg_red);
         holder.itemView.setOnClickListener(view ->

app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java

@@ -323,7 +323,7 @@ public interface ApiEndpoints {
 
     @POST(API_URL.INBOUND_PENNY_TEST_START)
     @Headers("Content-Type: application/json")
-    Observable<ResponseBody> startInboundPennyTestStart(@Header("Authorization") String token, @Path("userId") String userId, @Body()InboundAccountAddRequestBody requestBody);
+    Observable<ResponseBody> startInboundPennyTestStart(@Header("Authorization") String token, @Path("userId") String userId, @Body()InboundAccountAddRequestBody requestBody,@Query("reSendCode") String reSendCode);
 
 
 

app/src/main/res/layout/activity_inbound_remit_receipt.xml

@@ -40,6 +40,8 @@
                     android:id="@+id/view12"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/_1sdp"
+                    android:layout_marginStart="@dimen/_2sdp"
+                    android:layout_marginEnd="@dimen/_2sdp"
                     app:layout_constraintBottom_toBottomOf="@+id/gmeIconImageview"
                     app:layout_constraintEnd_toStartOf="@+id/gmeIconImageview"
                     app:layout_constraintHorizontal_bias="0.5"
@@ -60,6 +62,8 @@
                     android:id="@+id/view13"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/_1sdp"
+                    android:layout_marginStart="@dimen/_2sdp"
+                    android:layout_marginEnd="@dimen/_2sdp"
                     app:layout_constraintBottom_toBottomOf="@+id/receiverFlagImageview"
                     app:layout_constraintEnd_toStartOf="@+id/receiverFlagImageview"
                     app:layout_constraintHorizontal_bias="0.5"
@@ -105,7 +109,8 @@
 
                 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                     android:id="@+id/bank_detail_txt"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
+                    android:gravity="center_horizontal"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/_6sdp"
                     android:layout_marginEnd="@dimen/_6sdp"
@@ -229,7 +234,7 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@id/nameContainer"
                     android:padding="10dp"
-                    android:text="Sender"
+                    android:text="@string/sender_name_text"
                     android:textColor="@color/darkgray"
                     android:textSize="14sp" />
 
@@ -308,7 +313,7 @@
                             android:layout_height="match_parent"
                             android:gravity="center_vertical"
                             android:padding="10dp"
-                            android:text="@string/payout_agent_text"
+                            android:text="@string/bank_text"
                             android:textColor="@color/darkgray"
                             android:textSize="14sp" />
 
@@ -338,12 +343,12 @@
                             android:layout_height="wrap_content"
                             android:padding="10dp"
                             android:gravity="left"
-                            android:text="@string/total_sent_amount_text"
+                            android:text="@string/account_number_text"
                             android:textColor="@color/darkgray"
                             android:textSize="14sp" />
 
                         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                            android:id="@+id/tv_total_sent_amount"
+                            android:id="@+id/tv_acc_no"
                             android:layout_width="0dp"
                             android:layout_weight="1"
                             android:gravity="right"
@@ -375,12 +380,13 @@
                             android:layout_height="wrap_content"
                             android:gravity="left"
                             android:padding="10dp"
-                            android:text="@string/account_number_text"
+                            android:text="@string/received_amount_text"
+
                             android:textColor="@color/darkgray"
                             android:textSize="14sp" />
 
                         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                            android:id="@+id/tv_acc_no"
+                            android:id="@+id/tv_total_sent_amount"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -417,7 +423,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:padding="10dp"
-                        android:text="Service Fee"
+                        android:text="@string/service_fee_text"
                         android:textColor="@color/darkgray"
                         android:textSize="14sp" />
 

app/src/main/res/layout/auto_debit_account_list_item.xml

@@ -68,6 +68,7 @@
         android:layout_height="@dimen/_22sdp"
         android:layout_centerVertical="true"
         android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
         android:scaleType="centerCrop"
@@ -78,16 +79,16 @@
 
     <ImageView
         android:id="@+id/iv_link_acc"
-        android:layout_width="@dimen/_35sdp"
-        android:layout_height="@dimen/_35sdp"
+        android:layout_width="@dimen/_25sdp"
+        android:layout_height="@dimen/_25sdp"
         android:layout_centerVertical="true"
-        android:layout_marginStart="12dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
         android:scaleType="centerCrop"
-        android:src="@drawable/ic_bank_link"
+        android:src="@drawable/ic_register_inbound"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.32" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_inbound_account_penny_test.xml

@@ -56,7 +56,7 @@
         android:paddingTop="10dp"
         android:paddingEnd="15dp"
         android:paddingBottom="15dp"
-        android:text="Link your Korean Bank Account to recieve money from abroad."
+        android:text="@string/link_korean_bank_account"
         android:textSize="17sp"
         app:layout_constraintTop_toBottomOf="@+id/bankAccNoTxtView"
          />

app/src/main/res/layout/inbound_account_list_item.xml

@@ -34,7 +34,7 @@
         android:layout_marginEnd="12dp"
         android:gravity="start"
         android:padding="2dp"
-        android:text="Its very long text so don't mind at all if you have mind."
+        tools:text="Its very long text so don't mind at all if you have mind."
         android:textColor="@color/darkgray"
         android:textSize="16sp"
         app:layout_constraintBottom_toTopOf="@+id/accNo"
@@ -53,7 +53,7 @@
         android:layout_marginBottom="8dp"
         android:gravity="center|start"
         android:padding="2dp"
-        android:text="(12398123XXXXXXX)"
+        tools:text="(12398123XXXXXXX)"
         android:textColor="@color/darkgray2"
         android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="@+id/iv_front_image"

app/src/main/res/layout/tab_tran_history1.xml

@@ -1,5 +1,5 @@
 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView android:gravity="center"
-    android:text="Outbound"
+    android:text="@string/outbound_text"
     android:textSize="17sp"
     android:textColor="@color/colorAccent"
     app:txtfontName="@string/semibold"

app/src/main/res/layout/tab_tran_history2.xml

@@ -1,5 +1,5 @@
 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView android:gravity="center"
-    android:text="Inbound"
+    android:text="@string/inbound_text"
     android:textSize="17sp"
     android:textColor="@color/colorAccent"
     app:txtfontName="@string/semibold"

app/src/main/res/values/strings.xml

@@ -660,6 +660,17 @@
     <string name="fixed_top_up_text_hint_2">\u2022 Confirm cellphone number and recharge amount.</string>
     <string name="fixed_top_up_text_hint_1">\u2022 This is available for monthly fixed charge.</string>
     <string name="data_pack_top_up_text_hint_1">\u2022 Data can be recharged only for the customers of its telecom service  provider.</string>
+    <string name="inbound_title_text">Manage Inbound Account</string>
+    <string name="inbound_text">Inbound</string>
+    <string name="outbound_text">Outbound</string>
+    <string name="delete_account_message_text">Do you want to delete this account?</string>
+    <string name="you_have_to_register_text">You have to register account at GME</string>
+    <string name="transfer_holding_text">Transfer Holding</string>
+    <string name="transfer_canceled_text">Transfer Canceled</string>
+    <string name="transfer_processing_text">Transfer Processing</string>
+    <string name="link_korean_bank_account">Link your Korean Bank Account to receive money from abroad.</string>
+    <string name="sender_name_text">Sender Name</string>
+    <string name="received_amount_text">Received Amount</string>
 
 
 </resources>