Updated patch 2.8.1

.idea/assetWizardSettings.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="WizardSettings">
-    <option name="children">
-      <map>
-        <entry key="vectorWizard">
-          <value>
-            <PersistentState>
-              <option name="children">
-                <map>
-                  <entry key="vectorAssetStep">
-                    <value>
-                      <PersistentState>
-                        <option name="values">
-                          <map>
-                            <entry key="assetSourceType" value="FILE" />
-                            <entry key="outputName" value="ic_media" />
-                            <entry key="sourceFile" value="$USER_HOME$/Desktop/registration screenshots/ic_media.svg" />
-                          </map>
-                        </option>
-                      </PersistentState>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </PersistentState>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>

app/build.gradle

@@ -21,8 +21,8 @@ android {
         applicationId "com.gmeremit.online.gmeremittance_native"
         minSdkVersion 18
         targetSdkVersion 28
-        versionCode 26
-        versionName "2.8.0"
+        versionCode 27
+        versionName "2.8.1"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/model/bankaccountvalidation/BankInfo.java

@@ -1,9 +1,11 @@
 package com.gmeremit.online.gmeremittance_native.accountmanage.model.bankaccountvalidation;
 
+import com.gmeremit.online.gmeremittance_native.customwidgets.banklistingdialog.BankIconMapper;
+import com.gmeremit.online.gmeremittance_native.customwidgets.common.GenericImageWithTextListingDialog;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
-public class BankInfo {
+public class BankInfo implements GenericImageWithTextListingDialog.ImageWithDataDTOInterface {
 
     @SerializedName("RowId")
     @Expose
@@ -43,4 +45,14 @@ public class BankInfo {
     public String toString() {
         return bankName==null?"":bankName.toUpperCase();
     }
+
+    @Override
+    public String getDisplayName() {
+        return bankName==null?"":bankName.toUpperCase();
+    }
+
+    @Override
+    public int getResourceId() {
+        return BankIconMapper.getBankIconFromBankCode(bankCode);
+    }
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/bankaccountvalidation/BankAccountValidationV2Activity.java

@@ -3,6 +3,8 @@ package com.gmeremit.online.gmeremittance_native.accountmanage.view.bankaccountv
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+
+import com.gmeremit.online.gmeremittance_native.customwidgets.common.GenericImageWithTextListingDialog;
 import com.google.android.material.textfield.TextInputLayout;
 import android.view.View;
 import android.widget.EditText;
@@ -26,7 +28,7 @@ import butterknife.ButterKnife;
 public class BankAccountValidationV2Activity extends BaseActivity implements BankAccountValidationV2PresenterInterface.BankAccountValidationV2ContractInterface, View.OnClickListener {
 
     private GenericTextListingDialog<KeyValueData> genericTextListingLanguageSelectionDialog;
-    private GenericTextListingDialog<BankInfo> genericTextListingBankListingDialog;
+    private GenericImageWithTextListingDialog<BankInfo> genericTextListingBankListingDialog;
     private BankAccountValidationV2PresenterInterface presenter;
 
     public static final String BANK_VERIFICATION_RESULT_BUNDLE_KEY="bankVerificationResultBundleKey";
@@ -108,7 +110,7 @@ public class BankAccountValidationV2Activity extends BaseActivity implements Ban
     private void promptBankSelection()
     {
         List<BankInfo> bankList=this.presenter.getAvailableBanks();
-        genericTextListingBankListingDialog =new GenericTextListingDialog<>();
+        genericTextListingBankListingDialog =new GenericImageWithTextListingDialog<>();
         genericTextListingBankListingDialog.setData(bankList);
         genericTextListingBankListingDialog.setListener(selectedBank ->
         {

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/WaveProgressBarView.java

@@ -0,0 +1,245 @@
+package com.gmeremit.online.gmeremittance_native.customwidgets;
+
+import android.animation.Animator;
+import android.animation.ValueAnimator;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.BlurMaskFilter;
+import android.graphics.Canvas;
+import android.graphics.LinearGradient;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.Shader;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.animation.AccelerateDecelerateInterpolator;
+import android.view.animation.Interpolator;
+
+import androidx.core.content.ContextCompat;
+
+import com.gmeremit.online.gmeremittance_native.R;
+
+public class WaveProgressBarView extends View implements View.OnClickListener {
+
+    private Context context;
+
+    private Path curve1Path;
+    private Paint curve1Paint;
+    private Path curve2Path;
+    private Paint curve2Paint;
+    private float pixelToDen;
+
+    private ValueAnimator startingAnimator;
+
+    private StartAnimationListener startAnimationListener;
+
+    private float omega;
+
+    private float ampltiude1;
+    private float yOffset1;
+    private float verticalPhaseMul1;
+
+    private float ampltiude2;
+    private float yOffset2;
+    private float verticalPhaseMul2;
+
+
+    private static final Interpolator stoppinginterpolator = new AccelerateDecelerateInterpolator();
+    private boolean shouldStopAnimation = false;
+
+
+    public WaveProgressBarView(Context context) {
+        super(context);
+        init(context);
+    }
+
+    public WaveProgressBarView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public WaveProgressBarView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context);
+
+    }
+
+    @SuppressLint("NewApi")
+    public WaveProgressBarView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(context);
+    }
+
+    private void init(Context context) {
+        pixelToDen = context.getResources().getDisplayMetrics().density;
+        this.context = context;
+        startAnimationListener = new StartAnimationListener();
+        setLayerType(View.LAYER_TYPE_SOFTWARE,null);
+
+        initCurve1();
+//        initCurve2();
+        setOnClickListener(this);
+//        setBackgroundColor(ContextCompat.getColor(context,R.color.colorSelector));
+    }
+
+    @SuppressLint("DrawAllocation")
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+
+        int width = View.MeasureSpec.getSize(widthMeasureSpec);
+        int height = View.MeasureSpec.getSize(heightMeasureSpec);
+
+        height = width / 8;
+
+        omega = (float) (2 * Math.PI / width * .8f);
+
+        ampltiude1 = .08f * height;
+        yOffset1 = height * .8f;
+
+        ampltiude2 = ampltiude1;
+        yOffset2 = height / 1.5f;
+
+//        curve1Paint.setShader(new LinearGradient(0, 0, 0, height, ContextCompat.getColor(context, R.color.white), ContextCompat.getColor(context, R.color.gray1), Shader.TileMode.CLAMP));
+
+        setMeasuredDimension(width, height);
+
+
+    }
+
+
+    private void initCurve1() {
+        verticalPhaseMul1 = 0f;
+        curve1Path = new Path();
+        curve1Paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+
+        curve1Paint.setStrokeCap(Paint.Cap.ROUND);
+        curve1Paint.setColor(ContextCompat.getColor(context, R.color.gray));
+        curve1Paint.setStrokeWidth(pixelToDen * 1);
+        curve1Paint.setStyle(Paint.Style.FILL);
+        curve1Paint.setMaskFilter(new BlurMaskFilter(context.getResources().getDimension(R.dimen._4sdp), BlurMaskFilter.Blur.OUTER));
+
+
+    }
+
+    private void initCurve2() {
+        verticalPhaseMul2 = 0f;
+        curve2Path = new Path();
+        curve2Paint = new Paint();
+        curve2Paint.setAntiAlias(true);
+        curve2Paint.setStrokeCap(Paint.Cap.ROUND);
+        curve2Paint.setColor(ContextCompat.getColor(context, R.color.gray));
+        curve2Paint.setStrokeWidth(pixelToDen * 1);
+        curve2Paint.setStyle(Paint.Style.FILL);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        drawCurve1(canvas);
+
+//        drawCurve2(canvas);
+    }
+
+
+    private void drawCurve1(Canvas canvas) {
+//        curve1Paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
+
+        curve1Path.reset();
+        curve1Path.moveTo(0, getTop() + (float) getHeight() *.5f);
+        for (int i = 0; i <= getWidth(); i++) {
+            float x = (float) i;
+            float y = ampltiude1 * (float) Math.sin(omega * x + verticalPhaseMul1) + yOffset1;
+            curve1Path.lineTo(x, y);
+        }
+
+        curve1Path.lineTo(getWidth(), 0);
+        curve1Path.lineTo(0, 0);
+        curve1Path.close();
+        canvas.drawPath(curve1Path, curve1Paint);
+//        curve1Paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_OVER));
+
+    }
+
+    private void drawCurve2(Canvas canvas) {
+        curve2Path.reset();
+        curve2Path.moveTo(0, getTop() + (float) getHeight() *.75f);
+        for (int i = 0; i <= getWidth(); i++) {
+            float x = (float) i;
+            float y = ampltiude2 * (float) Math.sin(omega * x + verticalPhaseMul2) + yOffset2;
+            curve2Path.lineTo(x, y);
+        }
+
+        curve2Path.lineTo(getWidth(), 0);
+        curve2Path.lineTo(0, 0);
+        curve2Path.close();
+        canvas.drawPath(curve2Path, curve2Paint);
+    }
+
+
+    @Override
+    public void onClick(View v) {
+    }
+
+    public void startAnimatingPath() {
+        if (startingAnimator == null || !startingAnimator.isRunning()) {
+
+
+            verticalPhaseMul1 = 0f;
+            startingAnimator = ValueAnimator.ofFloat(0f, 1f);
+
+            startingAnimator.setDuration(200);
+
+            startingAnimator.setInterpolator(stoppinginterpolator);
+
+            startingAnimator.addUpdateListener(startAnimationListener);
+            startingAnimator.addListener(startAnimationListener);
+
+
+            startingAnimator.setRepeatMode(ValueAnimator.RESTART);
+            startingAnimator.setRepeatCount(ValueAnimator.INFINITE);
+
+            startingAnimator.start();
+        }
+    }
+
+    public void stopAnimation() {
+        if (startingAnimator != null && startingAnimator.isRunning()) {
+
+            shouldStopAnimation = true;
+        }
+
+    }
+
+
+    public class StartAnimationListener implements ValueAnimator.AnimatorUpdateListener, Animator.AnimatorListener {
+        @Override
+        public void onAnimationUpdate(ValueAnimator animation) {
+            verticalPhaseMul1 = (verticalPhaseMul1 % 6.2831f) + 0.07f;
+            verticalPhaseMul2 = (verticalPhaseMul2 % 6.2831f) + 0.12f;
+            invalidate();
+            if (shouldStopAnimation && (verticalPhaseMul1 > 6.1F && verticalPhaseMul1 <= 6.28F)) {
+                startingAnimator.cancel();
+                shouldStopAnimation = false;
+            }
+        }
+
+        @Override
+        public void onAnimationStart(Animator animation) {
+
+        }
+
+        @Override
+        public void onAnimationEnd(Animator animation) {
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+        }
+
+        @Override
+        public void onAnimationRepeat(Animator animation) {
+
+        }
+    }
+
+
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/banklistingdialog/BankIconMapper.java

@@ -42,7 +42,12 @@ public class BankIconMapper {
                 return R.drawable.ico_bank_keb;
             case "088":
                 return R.drawable.ico_bank_shinhan;
-
+            case "090":
+                return R.drawable.ico_bank_kakao;
+            case "089":
+                return R.drawable.ico_bank_kbank;
+            case "900":
+                return R.drawable.ico_bank_wsb;
             default:
                 return R.drawable.ic_bank;
         }

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/adapters/HomeMenuRvAdapterV2.java

@@ -31,10 +31,10 @@ public class HomeMenuRvAdapterV2 extends RecyclerView.Adapter<HomeMenuItemViewHo
     @Override
     public void onBindViewHolder(@NonNull HomeMenuItemViewHolderV2 holder, int position) {
 
-        MenuItem currentItem=data.get(holder.getAdapterPosition());
+        MenuItem currentItem=data.get(position);
         holder.setTitle(currentItem.getMenuTitle());
         holder.setImageResource(currentItem.getImage());
-        holder.itemView.setOnClickListener(view->listener.onMenuItemClicked(currentItem));
+        holder.itemView.setOnClickListener(view->listener.onMenuItemClicked(data.get(holder.getAdapterPosition())));
     }
 
     @Override

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/model/HomeViewRelatedDTOV2.java

@@ -2,6 +2,9 @@ package com.gmeremit.online.gmeremittance_native.homeV2.model;
 
 public class HomeViewRelatedDTOV2 {
 
+    private  String bankName;
+    private  String walletNo;
+    private  String yearlyLimit;
     private HomeNotificationViewDTO homeNotificationViewDTO;
 
     private String userName;
@@ -26,15 +29,18 @@ public class HomeViewRelatedDTOV2 {
         this.autoDebitNoticeBody = autoDebitBody;
     }
 
-    public HomeViewRelatedDTOV2(String userName, String availableBalance, String rewardPoint, boolean shouldShowAutoDebitNotice, String autoDebitTitle, String autoDebitBody, boolean shouldShowKJBankNotice, HomeNotificationViewDTO homeNotificationViewDTO) {
+    public HomeViewRelatedDTOV2(String userName, String availableBalance,String yearlyLimit, String rewardPoint, boolean shouldShowAutoDebitNotice, String autoDebitTitle, String autoDebitBody, boolean shouldShowKJBankNotice,String bankName,String walletNo, HomeNotificationViewDTO homeNotificationViewDTO) {
         this.userName = userName;
         this.availableBalance = availableBalance;
+        this.yearlyLimit=yearlyLimit;
         this.rewardPoint = rewardPoint;
         this.shouldShowAutoDebitNotice = shouldShowAutoDebitNotice;
         this.shouldShowKJBankNotice = shouldShowKJBankNotice;
         this.autoDebitNoticeTitle = autoDebitTitle;
         this.autoDebitNoticeBody = autoDebitBody;
         this.homeNotificationViewDTO =homeNotificationViewDTO;
+        this.bankName=bankName;
+        this.walletNo=walletNo;
     }
     public String getUserName() {
         return userName;
@@ -67,4 +73,16 @@ public class HomeViewRelatedDTOV2 {
     public HomeNotificationViewDTO getHomeNotificationViewDTO() {
         return homeNotificationViewDTO;
     }
+
+    public String getYearlyLimit() {
+        return yearlyLimit;
+    }
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public String getWalletNo() {
+        return walletNo;
+    }
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java

@@ -218,6 +218,7 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
 
             String fullName = userInfoModelV2.getFirstName();
 
+
             view.showInfoInDrawer(fullName, userInfoModelV2.getEmail(), userInfoModelV2.getYearlyLimit(), userInfoModelV2.getWalletNumber(), userInfoModelV2.getPrimaryBankName(), userInfoModelV2.getMobileNumber());
 
             long dateDifference = checkIfAutoDebitRenewIsRequired(userInfoModelV2.getAccessTokenRegTime(), userInfoModelV2.getAccessTokenExpTime());
@@ -233,8 +234,10 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
             HomeNotificationViewDTO notificationViewDTO = new HomeNotificationHandler(GmeApplication.getStringExtractor(), userInfoModelV2.getKyc(), userInfoModelV2.isVerified(), userInfoModelV2.getPennyTestStatus(), userInfoModelV2.getRedirectTo())
                     .generateAppropriateHomeNotificationViewDTO();
 
-                homeFragmentRelatedSubjectV2.onNext(new HomeViewRelatedDTOV2(fullName, userInfoModelV2.getAvailableBalance(),
-                        userInfoModelV2.getRewardPoint(), shouldShowAutoDebitNotice, autoDebitTitle, autoDebitBody, shouldShowKJBankNotice, notificationViewDTO));
+                homeFragmentRelatedSubjectV2.onNext(new HomeViewRelatedDTOV2(fullName, userInfoModelV2.getAvailableBalance(),userInfoModelV2.getYearlyLimit(),
+                        userInfoModelV2.getRewardPoint(), shouldShowAutoDebitNotice, autoDebitTitle, autoDebitBody, shouldShowKJBankNotice,
+                        userInfoModelV2.getPrimaryBankName(), userInfoModelV2.getWalletNumber(),
+                        notificationViewDTO));
 
             //If no notification is generated then we can show privileged Operation View
             view.showPrivilegedOperationView(notificationViewDTO == null || notificationViewDTO.shouldShowPrivilegedView());

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

@@ -594,7 +594,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
         View topupReportView = nav_drawer.findViewById(R.id.view_topup_report);
 
         if (action) {
-            withdrawView.setVisibility(View.VISIBLE);
+//            withdrawView.setVisibility(View.VISIBLE);
             manageAccountDivider.setVisibility(View.VISIBLE);
             manageAccountViewGroup.setVisibility(View.VISIBLE);
             transactionReportDivider.setVisibility(View.VISIBLE);
@@ -604,7 +604,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
             topupReportDivider.setVisibility(View.VISIBLE);
             topupReportView.setVisibility(View.VISIBLE);
         } else {
-            withdrawView.setVisibility(View.INVISIBLE);
+//            withdrawView.setVisibility(View.INVISIBLE);
             manageAccountDivider.setVisibility(View.GONE);
             manageAccountViewGroup.setVisibility(View.GONE);
             transactionReportDivider.setVisibility(View.GONE);

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

@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.Handler;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
@@ -16,6 +17,8 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -24,6 +27,7 @@ import android.widget.TextView;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
 import com.gmeremit.online.gmeremittance_native.customwidgets.LockableScrollView;
+import com.gmeremit.online.gmeremittance_native.customwidgets.WaveProgressBarView;
 import com.gmeremit.online.gmeremittance_native.customwidgets.common.GenericPromptDialog;
 import com.gmeremit.online.gmeremittance_native.customwidgets.kjnoticedialog.KJNoticeDialog;
 import com.gmeremit.online.gmeremittance_native.homeV2.HomeParentViewContractV2;
@@ -70,6 +74,9 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
     @BindView(R.id.tv_balance)
     TextView tv_balance;
 
+    @BindView(R.id.tv_yearly_remaining)
+    TextView tv_yearly_remaining;
+
     @BindView(R.id.notificationViewContainer)
     CardView notificationViewContainer;
 
@@ -85,6 +92,12 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
     @BindView(R.id.lb_rewardpoint)
     View lb_rewardpoint;
 
+    @BindView(R.id.waveProgressBarView)
+    WaveProgressBarView waveProgressBarView;
+
+    @BindView(R.id.tv_gme_wallet_no)
+    TextView tv_gme_wallet_no;
+
     @BindView(R.id.swiperefresh)
     SwipeRefreshLayout swiperefresh;
 
@@ -132,6 +145,7 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
         super.onStart();
 
         swiperefresh.setOnRefreshListener(() -> {
+//            waveProgressBarView.startAnimatingPath();
             HomeParentViewContractV2 parentView = ((HomeParentViewContractV2) getActivity());
             if (parentView != null)
                 parentView.getPresenter().getRequiredData();
@@ -204,16 +218,17 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
     }
 
 
-    public void updateInfo(String userName, String yearlyLimit, String rewardPoint) {
-            swiperefresh.setRefreshing(false);
-            tv_currency.setVisibility(View.VISIBLE);
+    public void updateInfo(String userName, String availableBalance, String yearlyLimit, String rewardPoint) {
+        swiperefresh.setRefreshing(false);
+        tv_currency.setVisibility(View.VISIBLE);
 
-            tv_rewardpoint.setText(Utils.formatCurrencyWithoutTruncatingDecimal(rewardPoint));
-            tv_rewardpoint.setVisibility(View.VISIBLE);
-            lb_rewardpoint.setVisibility(View.VISIBLE);
+        tv_rewardpoint.setText(Utils.formatCurrencyWithoutTruncatingDecimal(rewardPoint));
+        tv_rewardpoint.setVisibility(View.VISIBLE);
+        lb_rewardpoint.setVisibility(View.VISIBLE);
 
-            tv_namelabel.setText(userName);
-            tv_balance.setText(yearlyLimit);
+        tv_namelabel.setText(userName);
+        tv_yearly_remaining.setText(availableBalance);
+        tv_balance.setText(yearlyLimit);
     }
 
 
@@ -272,6 +287,18 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
         startActivityForResult(startPennyTestIntent, PENNY_REQUEST_FROM_HOME);
     }
 
+    public void setWalletNo(String walletNumber, String bankName) {
+        if (walletNumber == null || walletNumber.length() <= 0) {
+            walletNumber = getString(R.string.na_text);
+        }
+
+        if(bankName==null)
+            bankName="";
+
+        String gmeWalletNo = getString(R.string.gme_wallet_no_text);
+        tv_gme_wallet_no.setText(Html.fromHtml(gmeWalletNo + " <b><font color='#ed1c24'> " + walletNumber + "</font></b><br>" + bankName));
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -315,8 +342,9 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
 
         @Override
         protected void onSuccess(HomeViewRelatedDTOV2 homeViewRelatedDTOV2) {
-            if(isUIReady()) {
-                updateInfo(homeViewRelatedDTOV2.getUserName(), homeViewRelatedDTOV2.getAvailableBalance(), homeViewRelatedDTOV2.getRewardPoint());
+            if (isUIReady()) {
+                updateInfo(homeViewRelatedDTOV2.getUserName(), homeViewRelatedDTOV2.getAvailableBalance(), homeViewRelatedDTOV2.getYearlyLimit(), homeViewRelatedDTOV2.getRewardPoint());
+                setWalletNo(homeViewRelatedDTOV2.getWalletNo(),homeViewRelatedDTOV2.getBankName());
                 showAutoDebitNoticeViewIfRequiredInPopup(homeViewRelatedDTOV2.shouldShowAutoDebitNotice(), homeViewRelatedDTOV2.getAutoDebitNoticeTitle(), homeViewRelatedDTOV2.getAutoDebitNoticeBody(), () -> {
                     showNotificationView(homeViewRelatedDTOV2.getHomeNotificationViewDTO());
                 });
@@ -339,51 +367,53 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
         }
     }
 
+
+
     public void showNotificationView(HomeNotificationViewDTO notificationViewDTO) {
-            new Handler().postDelayed(() -> {
-                View notificationView = HomeNotificiationViewFactory.getNotificationView(notificationViewDTO, notificationViewContainer.getContext());
-                if (notificationView != null) {
-
-                    AutoTransition autoTransition = new AutoTransition();
-                    if (notificationViewDTO.isFocused()) {
-                        scrollViewHomeFragment.setEnableScrolling(false);
-                        autoTransition.addListener(new TransitionListenerAdapter() {
-                            @Override
-                            public void onTransitionEnd(@NonNull Transition transition) {
-                                super.onTransitionEnd(transition);
-
-                                int[] notificationViewContainerPos = new int[2];
-                                notificationViewContainer.getLocationInWindow(notificationViewContainerPos);
-                                Rect notificationViewContainerBoundry = new Rect(0, notificationViewContainerPos[0], notificationViewContainer.getWidth(), notificationViewContainerPos[1] + notificationView.getHeight());
-                                if(getActivity()!=null)
+        new Handler().postDelayed(() -> {
+            View notificationView = HomeNotificiationViewFactory.getNotificationView(notificationViewDTO, notificationViewContainer.getContext());
+            if (notificationView != null) {
+
+                AutoTransition autoTransition = new AutoTransition();
+                if (notificationViewDTO.isFocused()) {
+                    scrollViewHomeFragment.setEnableScrolling(false);
+                    autoTransition.addListener(new TransitionListenerAdapter() {
+                        @Override
+                        public void onTransitionEnd(@NonNull Transition transition) {
+                            super.onTransitionEnd(transition);
+
+                            int[] notificationViewContainerPos = new int[2];
+                            notificationViewContainer.getLocationInWindow(notificationViewContainerPos);
+                            Rect notificationViewContainerBoundry = new Rect(0, notificationViewContainerPos[0], notificationViewContainer.getWidth(), notificationViewContainerPos[1] + notificationView.getHeight());
+                            if (getActivity() != null)
                                 ((HomeParentViewContractV2) getActivity()).dimOutMenu(notificationViewContainerBoundry, true);
-                            }
+                        }
 
 
-                        });
+                    });
 
-                    } else {
-                        scrollViewHomeFragment.setEnableScrolling(true);
-                        if(getActivity()!=null)
+                } else {
+                    scrollViewHomeFragment.setEnableScrolling(true);
+                    if (getActivity() != null)
                         ((HomeParentViewContractV2) getActivity()).dimOutMenu(null, false);
 
-                    }
+                }
 
-                    TransitionManager.beginDelayedTransition(homeContainerView, autoTransition);
-                    if (notificationViewContainer.getChildCount() > 0)
-                        notificationViewContainer.removeAllViews();
-                    notificationViewContainer.addView(notificationView);
-                    notificationViewContainer.setVisibility(View.VISIBLE);
-                    notificationViewContainer.setOnClickListener(this);
-                } else {
-                    TransitionManager.beginDelayedTransition(homeContainerView);
-                    notificationViewContainer.setVisibility(View.GONE);
+                TransitionManager.beginDelayedTransition(homeContainerView, autoTransition);
+                if (notificationViewContainer.getChildCount() > 0)
                     notificationViewContainer.removeAllViews();
-                    notificationViewContainer.setOnClickListener(null);
-                    if(getActivity()!=null)
+                notificationViewContainer.addView(notificationView);
+                notificationViewContainer.setVisibility(View.VISIBLE);
+                notificationViewContainer.setOnClickListener(this);
+            } else {
+                TransitionManager.beginDelayedTransition(homeContainerView);
+                notificationViewContainer.setVisibility(View.GONE);
+                notificationViewContainer.removeAllViews();
+                notificationViewContainer.setOnClickListener(null);
+                if (getActivity() != null)
                     ((HomeParentViewContractV2) getActivity()).dimOutMenu(null, false);
-                }
-            }, 500);
+            }
+        }, 500);
     }
 
     private void showKJBankNoticeIfRequired(boolean shouldShowAutoDebitNotice) {

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view1/KYCView1Fragment.java

@@ -357,7 +357,7 @@ public class KYCView1Fragment extends BaseFragment implements View.OnClickListen
         List<Gender> data = new ArrayList<>();
         data.add(new Gender("M", getString(R.string.male_text)));
         data.add(new Gender("F", getString(R.string.female_text)));
-        data.add(new Gender("O", getString(R.string.other_text)));
+//        data.add(new Gender("O", getString(R.string.other_text)));
         genderSelectDialog.setData(data);
         genderSelectDialog.setListener(selectedGender ->
         {

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/adapter/RecipientListingV3RvAdapter.java

@@ -40,12 +40,16 @@ public class RecipientListingV3RvAdapter extends RecyclerView.Adapter<RecipientL
                 listener.onRecipientSelected(recipientInfo);
             }
         });
-        holder.itemView.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
-                listener.onRecipientLongPressed(recipientInfo);
-                return true;
-            }
+
+
+        holder.getDeleteButton().setOnClickListener(view->{
+            if(listener!=null)
+                listener.proceedToDeleteRecipient(data.get(holder.getAdapterPosition()));
+        });
+
+        holder.getEditButton().setOnClickListener(view->{
+            if(listener!=null)
+                listener.proceedToEditRecipient(data.get(holder.getAdapterPosition()));
         });
 
         String recieverName = recipientInfo.getFullName();
@@ -157,7 +161,9 @@ public class RecipientListingV3RvAdapter extends RecyclerView.Adapter<RecipientL
     public interface RecipientSelectionListener {
         void onRecipientSelected(ReceiverInfoV3Model recipientInfoModel);
 
-        void onRecipientLongPressed(ReceiverInfoV3Model recipientInfoModel);
+
+        void proceedToDeleteRecipient(ReceiverInfoV3Model receiverInfoV3Model);
+        void proceedToEditRecipient(ReceiverInfoV3Model receiverInfoV3Model);
 
         void onAllRecipientDeleted();
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientlistingV3/RecipientListRVViewholderV3.java

@@ -1,6 +1,7 @@
 package com.gmeremit.online.gmeremittance_native.recipientV3.view.recipientlistingV3;
 
 import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -33,6 +34,12 @@ public class RecipientListRVViewholderV3 extends RecyclerView.ViewHolder {
     @BindView(R.id.receiverNativeCountryFlagImageView)
     ImageView receiverNativeCountryFlagImageView;
 
+    @BindView(R.id.iv_remove)
+    ImageView iv_remove;
+
+    @BindView(R.id.iv_edit)
+    ImageView iv_edit;
+
 
     public RecipientListRVViewholderV3(View itemView) {
         super(itemView);
@@ -41,9 +48,6 @@ public class RecipientListRVViewholderV3 extends RecyclerView.ViewHolder {
     }
 
 
-
-
-
     public TextView getReceiverNameTxtView() {
         return receiverNameTxtView;
     }
@@ -63,6 +67,7 @@ public class RecipientListRVViewholderV3 extends RecyclerView.ViewHolder {
     public TextView getDetail4TxtView() {
         return detail4TxtView;
     }
+
     public TextView getDetail5TxtView() {
         return detail5TxtView;
     }
@@ -70,4 +75,12 @@ public class RecipientListRVViewholderV3 extends RecyclerView.ViewHolder {
     public ImageView getReceiverNativeCountryFlagImageView() {
         return receiverNativeCountryFlagImageView;
     }
+
+    public ImageView getEditButton() {
+        return iv_edit;
+    }
+
+    public ImageView getDeleteButton() {
+        return iv_remove;
+    }
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientlistingV3/RecipientListingV3Activity.java

@@ -3,11 +3,17 @@ package com.gmeremit.online.gmeremittance_native.recipientV3.view.recipientlisti
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+
+import com.gmeremit.online.gmeremittance_native.domesticremit.send.view.RecipientConfirmDialog;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.appbar.CollapsingToolbarLayout;
+
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
 import android.os.Bundle;
+
 import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.View;
 import android.widget.EditText;
 import android.widget.FrameLayout;
@@ -109,10 +115,9 @@ public class RecipientListingV3Activity extends BaseActivity implements Recipien
         iv_back.setOnClickListener(null);
     }
 
-    private void init()
-    {
-        this.presenter=new RecipientListingV3Presenter(this,new RecipientListingV3Gateway());
-        searchEditTextTextWatcher=new SearchEditTextTextWatcher();
+    private void init() {
+        this.presenter = new RecipientListingV3Presenter(this, new RecipientListingV3Gateway());
+        searchEditTextTextWatcher = new SearchEditTextTextWatcher();
         setupRecyclerView();
 
     }
@@ -122,21 +127,19 @@ public class RecipientListingV3Activity extends BaseActivity implements Recipien
 //        recipientListRv.addItemDecoration(new SelectedRedBorderDecoration(getActivity()));
 //        recipientListRv.setItemAnimator(new DefaultItemAnimator());
         recipientListRv.setAdapter(recipientListingRvAdapter);
-        recipientListRv.addItemDecoration(new LineDividerItemDecoration(this,LineDividerItemDecoration.VERTICAL_LIST));
+        recipientListRv.addItemDecoration(new LineDividerItemDecoration(this, LineDividerItemDecoration.VERTICAL_LIST));
     }
 
-    private void performDefaultAction(Bundle savedInstance)
-    {
+    private void performDefaultAction(Bundle savedInstance) {
         iv_cancel.setVisibility(View.INVISIBLE);
         toolbarTitle.setText(getString(R.string.recipient_listing_title_text));
         this.presenter.getAllRecipientList(null);
     }
 
 
-
     @Override
-    public void showAllRecipientToUser(List<ReceiverInfoV3Model> recipientInfoModelList,boolean changeLayoutBehavior) {
-        if(changeLayoutBehavior) {
+    public void showAllRecipientToUser(List<ReceiverInfoV3Model> recipientInfoModelList, boolean changeLayoutBehavior) {
+        if (changeLayoutBehavior) {
             if (recipientInfoModelList != null && recipientInfoModelList.size() > 0) {
                 recipientHintTextViewContainer.setVisibility(View.VISIBLE);
 
@@ -173,28 +176,25 @@ public class RecipientListingV3Activity extends BaseActivity implements Recipien
 
     @Override
     public void showNoRecipientFoundView(boolean action) {
-            if(action)
-            {
-                recipientListRv.setVisibility(View.INVISIBLE);
-                noDataFoundTextView.setVisibility(View.VISIBLE);
-            }
-            else
-            {
-                recipientListRv.setVisibility(View.VISIBLE);
-                noDataFoundTextView.setVisibility(View.INVISIBLE);
+        if (action) {
+            recipientListRv.setVisibility(View.INVISIBLE);
+            noDataFoundTextView.setVisibility(View.VISIBLE);
+        } else {
+            recipientListRv.setVisibility(View.VISIBLE);
+            noDataFoundTextView.setVisibility(View.INVISIBLE);
 
 
-            }
+        }
     }
 
     @Override
-    public void promptToSendMoney(GenericPromptDialog.GenericDialogPromptListener listener,String message) {
-            GenericPromptDialog genericPromptDialog=new GenericPromptDialog();
-            genericPromptDialog.setTitleMessage(getString(R.string.important_text));
-            genericPromptDialog.setBodyMessage(message);
-            genericPromptDialog.setIconsRes(-1);
-            genericPromptDialog.setCancellable(true);
-            genericPromptDialog.setListener(listener);
+    public void promptToSendMoney(GenericPromptDialog.GenericDialogPromptListener listener, String message) {
+        GenericPromptDialog genericPromptDialog = new GenericPromptDialog();
+        genericPromptDialog.setTitleMessage(getString(R.string.important_text));
+        genericPromptDialog.setBodyMessage(message);
+        genericPromptDialog.setIconsRes(-1);
+        genericPromptDialog.setCancellable(true);
+        genericPromptDialog.setListener(listener);
         if (!genericPromptDialog.isAdded())
             genericPromptDialog.show(getSupportFragmentManager(), "PROMPTSENDMONEY");
     }
@@ -207,8 +207,8 @@ public class RecipientListingV3Activity extends BaseActivity implements Recipien
     }
 
     @Override
-    public void promptToEditRecipient(GenericPromptDialog.GenericDialogPromptListener genericDialogPromptListener,String message) {
-        GenericPromptDialog genericPromptDialog=new GenericPromptDialog();
+    public void promptToEditRecipient(GenericPromptDialog.GenericDialogPromptListener genericDialogPromptListener, String message) {
+        GenericPromptDialog genericPromptDialog = new GenericPromptDialog();
         genericPromptDialog.setTitleMessage(getString(R.string.important_text));
         genericPromptDialog.setBodyMessage(message);
         genericPromptDialog.setIconsRes(-1);
@@ -225,26 +225,12 @@ public class RecipientListingV3Activity extends BaseActivity implements Recipien
         this.presenter.saveSelectedRecipientInfomation(recipientInfoModel);
     }
 
-
-
     @Override
-    public void onRecipientLongPressed(ReceiverInfoV3Model recipientInfoModel) {
-        CharSequence[] charSequences = new CharSequence[]{getString(R.string.delete_text), getString(R.string.edit_text)};
-        AlertDialog.Builder alert = new AlertDialog.Builder(this);
-        alert.setItems(charSequences, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialogInterface, int i) {
-                if (i == 0) {
-                    presenter.deleteRecipient(recipientInfoModel.getReceiverId());
-                } else {
-                    proceedToEditRecipient(recipientInfoModel);
-                }
-            }
-        });
-        alert.create();
-        alert.show();
+    public void proceedToDeleteRecipient(ReceiverInfoV3Model receiverInfoV3Model) {
+        presenter.deleteRecipient(receiverInfoV3Model.getReceiverId());
     }
 
+
     @Override
     public void onAllRecipientDeleted() {
 
@@ -252,22 +238,22 @@ public class RecipientListingV3Activity extends BaseActivity implements Recipien
 
     @Override
     public void showPaymentSourceSelection(List<AutoDebitAccount> autoDebitAccountList) {
-        if(autoDebitAccountList==null||autoDebitAccountList.size()<1)
+        if (autoDebitAccountList == null || autoDebitAccountList.size() < 1)
             return;
 
-        if(autoDebitAccountListingDialog==null)
-            autoDebitAccountListingDialog =new AutoDebitAccountListingDialog();
+        if (autoDebitAccountListingDialog == null)
+            autoDebitAccountListingDialog = new AutoDebitAccountListingDialog();
 
         autoDebitAccountListingDialog.setAccountData(autoDebitAccountList);
         autoDebitAccountListingDialog.setListener(new AccountListingRvAdapter.AccountSelectionListener() {
             @Override
             public void onAccountSelected(AutoDebitAccount selectedAccount) {
-                SendMoneyRequiredDataV3 sendMoneyRequiredData=presenter.getSendMoneyRequiredData(selectedAccount);
+                SendMoneyRequiredDataV3 sendMoneyRequiredData = presenter.getSendMoneyRequiredData(selectedAccount);
                 Intent intent = new Intent(RecipientListingV3Activity.this, SendMoneyV2Activity.class);
                 intent.putExtra(RecipientAddV2Activity.RECIPIENT_INFO_BUNDLE_KEY, sendMoneyRequiredData);
                 startActivity(intent);
 
-                if(autoDebitAccountListingDialog !=null&& autoDebitAccountListingDialog.isAdded())
+                if (autoDebitAccountListingDialog != null && autoDebitAccountListingDialog.isAdded())
                     autoDebitAccountListingDialog.dismiss();
             }
 
@@ -294,10 +280,9 @@ public class RecipientListingV3Activity extends BaseActivity implements Recipien
     @Override
     public void onClick(View v) {
 
-        switch (v.getId())
-        {
+        switch (v.getId()) {
             case R.id.addReceipient:
-                startActivityForResult(new Intent(this, RecipientAddEditV3Activity.class),RecipientAddEditV3Activity.RECIPIENT_INFO_ACTION_EDIT_REQUEST_CODE);
+                startActivityForResult(new Intent(this, RecipientAddEditV3Activity.class), RecipientAddEditV3Activity.RECIPIENT_INFO_ACTION_EDIT_REQUEST_CODE);
                 break;
 
             case R.id.iv_back:
@@ -309,13 +294,13 @@ public class RecipientListingV3Activity extends BaseActivity implements Recipien
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == RecipientAddEditV3Activity.RECIPIENT_INFO_ACTION_EDIT_REQUEST_CODE && resultCode == RESULT_OK) {
             presenter.onRecipentUpdatedSucesss(data.getStringExtra(RecipientAddEditV3Activity.RECIPIENT_UPDATED_ID_BUNDLE_KEY));
         }
     }
 
-    class SearchEditTextTextWatcher extends TextWatcherAdapter
-    {
+    class SearchEditTextTextWatcher extends TextWatcherAdapter {
         @Override
         public void onTextUpdated(String text) {
             presenter.searchForReciever(text);

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientlistingV3/RecipientModifyPromptDialog.java

@@ -0,0 +1,94 @@
+package com.gmeremit.online.gmeremittance_native.recipientV3.view.recipientlistingV3;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
+import com.gmeremit.online.gmeremittance_native.R;
+import com.gmeremit.online.gmeremittance_native.topup.local.view.topup.ConfirmRechargePaymentBottomSheetDialog;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+public class RecipientModifyPromptDialog extends DialogFragment {
+
+    private RecipientModifyPromptDialogListener listener;
+
+
+
+    public static RecipientModifyPromptDialog showRecipientModifyPromptDialog(RecipientModifyPromptDialogListener listener) {
+        RecipientModifyPromptDialog confirmRechargePaymentBottomSheetDialog = new RecipientModifyPromptDialog();
+
+        confirmRechargePaymentBottomSheetDialog.setListener(listener);
+        return confirmRechargePaymentBottomSheetDialog;
+    }
+
+    private void setListener(RecipientModifyPromptDialogListener listener) {
+        this.listener = listener;
+    }
+
+//    @Override
+//    public void onCreate(Bundle savedInstanceState) {
+//        super.onCreate(savedInstanceState);
+//        setStyle(STYLE_NORMAL, R.style.AppBottomSheetDialogTheme);
+//    }
+
+//    @Override
+//    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+//                             Bundle savedInstanceState) {
+//        // Inflate the layout for this fragment
+//        View v = inflater.inflate(R.layout.confirm_recipient_modify_bottom_sheet, container, false);
+//        ButterKnife.bind(this, v);
+//
+//        return v;
+//
+//    }
+
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        View view = getActivity().getLayoutInflater().inflate(R.layout.confirm_recipient_modify_bottom_sheet, null);
+        ButterKnife.bind(this, view);
+        builder.setView(view);
+
+
+        return builder.create();
+
+    }
+
+    @OnClick(R.id.tv_edit)
+    public void onEdit() {
+        this.dismiss();
+        if (listener != null)
+            listener.redirectToRecipientEdit();
+    }
+
+
+    @OnClick(R.id.tv_delete)
+    public void onDelete() {
+        this.dismiss();
+        if (listener != null)
+            listener.redirectToRecipientDelete();
+    }
+
+
+    @OnClick(R.id.img_close)
+    public void closeView() {
+       this.dismiss();
+    }
+
+
+    public interface RecipientModifyPromptDialogListener {
+        void redirectToRecipientEdit();
+        void redirectToRecipientDelete();
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/user_profile/model/data/UserProfile.java

@@ -85,6 +85,7 @@ public class UserProfile {
     @Expose
     public String nickName;
 
+
     public UserProfile() {
         this.availableBalance="0";
         this.yearlyLimit ="0";

app/src/main/java/com/gmeremit/online/gmeremittance_native/user_profile/presenter/UserProfilePresenter.java

@@ -89,6 +89,7 @@ public class UserProfilePresenter implements UserProfileContract.UserProfilePres
         userProfile.walletNumber=storage.getString(PrefKeys.USER_WALLET_NUMBER,"");
         userProfile.primaryBankName=storage.getString(PrefKeys.USER_PRIMARY_BANK_NAME,"");
         userProfile.verified=storage.getBoolean(PrefKeys.USER_KYC_VERIFIED,false);
+        userProfile.yearlyLimit=storage.getString(PrefKeys.USER_YEARLY_REMAINING_LIMIT,"");
 
         userProfileView.onSuccessUpdateUI(userProfile);
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/user_profile/view/ProfileActivity.java

@@ -71,6 +71,8 @@ public class ProfileActivity extends AppCompatActivity implements UserProfileCon
     GmeTextView tvWalletNumber;
     @BindView(R.id.tv_withdraw)
     GmeTextView tv_withdraw;
+    @BindView(R.id.tv_yearly_remaining)
+    GmeTextView tv_yearly_remaining;
     Uri imageoutputUri;
     private ProgressDialog dialog;
     private PersistenceStorageManager persistenceStorageManager;
@@ -238,10 +240,10 @@ public class ProfileActivity extends AppCompatActivity implements UserProfileCon
     }
 
     public void showWithdrawView(Boolean action) {
-        if(action)
-            tv_withdraw.setVisibility(View.VISIBLE);
-        else
-            tv_withdraw.setVisibility(View.INVISIBLE);
+//        if(action)
+//            tv_withdraw.setVisibility(View.VISIBLE);
+//        else
+//            tv_withdraw.setVisibility(View.INVISIBLE);
 
 
     }
@@ -287,45 +289,14 @@ public class ProfileActivity extends AppCompatActivity implements UserProfileCon
         tvEmail.setText(body.email);
         updateBalance(body.availableBalance);
         setWalletNo(body.walletNumber, body.primaryBankName);
-//        if (body.dpUrl != null && body.dpUrl.length() > 1) {
-////            Glide.with(ProfileActivity.this).load(body.dpUrl).diskCacheStrategy(DiskCacheStrategy.ALL).into(profileImage);
-////            Utility.showImageFromServer(this, profileImage, body.dpUrl);
-////            String image = body.dpUrl;
-//            Target target = new Target() {
-//                @Override
-//                public void onBitmapLoaded(Bitmap bitmap, Picasso.LoadedFrom from) {
-//                    profileImage.setImageBitmap(bitmap);
-//                }
-//
-//                @Override
-//                public void onBitmapFailed(Exception e, Drawable errorDrawable) {
-//                    profileImage.setImageDrawable(errorDrawable);
-//                }
+        tv_yearly_remaining.setText(body.yearlyLimit);
 //
-//                @Override
-//                public void onPrepareLoad(Drawable placeHolderDrawable) {
-//                    profileImage.setImageDrawable(placeHolderDrawable);
-//                }
-//            };
-////            Picasso.get().load(body.dpUrl).memoryPolicy(MemoryPolicy.NO_CACHE,MemoryPolicy.NO_STORE).into(target);
-//            Picasso.get().load(body.dpUrl).memoryPolicy(MemoryPolicy.NO_CACHE,MemoryPolicy.NO_STORE).into(profileImage);
-////            Glide.with(this).load(body.dpUrl).into(profileImage);
-//            textProfileImage.setVisibility(View.GONE);
-//        } else {
-//            if (body.firstName != null && body.firstName.length() > 0) {
-//                TextDrawable drawable = TextDrawable.builder().buildRound(String.valueOf(body.firstName.toUpperCase().charAt(0)), getResources().getColor(R.color.blue));
-//                textProfileImage.setImageDrawable(drawable);
-//            }
-//        }
 
         if (body.firstName != null && body.firstName.length() > 0) {
             TextDrawable drawable = TextDrawable.builder().buildRound(String.valueOf(body.firstName.toUpperCase().charAt(0)), getResources().getColor(R.color.blue));
             textProfileImage.setImageDrawable(drawable);
         }
-//        if (body.verified) {
-//            ivEditProfile.setVisibility(View.VISIBLE);
-//        }
-//        ivEditProfile.setVisibility(View.VISIBLE);
+//
 
     }
 

app/src/main/res/drawable/vd_edit.xml

@@ -0,0 +1,9 @@
+<vector android:height="@dimen/_25sdp" android:viewportHeight="480"
+    android:viewportWidth="480" android:width="@dimen/_25sdp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000"
+        android:pathData="M145,433c-78,-41 -115,-103 -115,-193 0,-128 82,-210 210,-210 128,0 210,82 210,210 0,90 -37,152 -112,191 -47,24 -150,25 -193,2zM343,377c100,-76 85,-238 -29,-292 -52,-25 -132,-17 -177,18 -99,75 -85,235 25,291 50,25 136,17 181,-17z" android:strokeColor="#00000000"/>
+    <path android:fillColor="#000000"
+        android:pathData="M130,240l0,-110 65,0c36,0 65,4 65,8 0,18 -26,32 -57,32l-33,0 0,70 0,70 70,0 70,0 0,-33c0,-31 14,-57 32,-57 4,0 8,29 8,65l0,65 -110,0 -110,0 0,-110z" android:strokeColor="#00000000"/>
+    <path android:fillColor="#000000"
+        android:pathData="M180,277c0,-33 116,-149 144,-145 41,6 29,41 -35,106 -67,68 -109,82 -109,39z" android:strokeColor="#00000000"/>
+</vector>

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

@@ -6,6 +6,7 @@
     android:clickable="true"
     android:id="@+id/rootView"
     android:layout_width="match_parent"
+    android:background="@color/bright_gray"
     android:focusable="true">
 
 <LinearLayout

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

@@ -37,7 +37,8 @@
                     android:layout_height="match_parent"
                     android:layout_centerHorizontal="true"
                     android:layout_centerVertical="true"
-                    android:src="@drawable/ic_gme_home_logo" />
+                    android:src="@drawable/ic_gme_home_logo"
+                    />
 
                 <ImageView
                     android:layout_alignParentRight="true"

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

@@ -1,88 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
     android:background="@color/background_gray"
-   >
-    <include layout="@layout/layout_sendmoney_toolbar"/>
+    android:layout_height="match_parent">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
-        <RelativeLayout
+        android:orientation="vertical"
+        >
+        <include layout="@layout/layout_sendmoney_toolbar"/>
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="226dp"
-            android:layout_margin="10dp"
-            android:background="@drawable/ic_recharge_share_background">
-            <de.hdodenhof.circleimageview.CircleImageView
-                android:id="@+id/profile_image"
-                android:layout_width="70dp"
-                android:layout_height="70dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginRight="2dp"
-                android:layout_centerHorizontal="true"
-                />
-            <ImageView
-                android:id="@+id/text_profile_image"
-                android:layout_width="70dp"
-                android:layout_height="70dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginRight="2dp"
-                android:layout_centerHorizontal="true"
-                />
-            <ImageView
-                android:visibility="invisible"
-                android:id="@+id/iv_uploadImage"
-                android:layout_toRightOf="@id/profile_image"
-                android:layout_marginLeft="-26dp"
-                android:padding="10dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBottom="@id/profile_image"
-                android:src="@drawable/ic_profile_camera"
-                />
-            <ImageView
-                android:id="@+id/iv_edit_profile"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_edit"
-                tools:visibility="invisible"
-                android:visibility="gone"
-                android:layout_alignParentRight="true"
-                android:padding="14dp"/>
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/tv_user_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/profile_image"
-                android:layout_centerHorizontal="true"
-                android:textSize="18sp"
-                app:txtfontName="@string/semibold"
-                android:padding="6dp"
-                android:textColor="@color/white"/>
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/tv_phone_number"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/tv_user_name"
-                android:layout_centerHorizontal="true"
-                android:textSize="14sp"
-                android:padding="4dp"
-                android:textColor="@color/white"/>
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/tv_email"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/tv_phone_number"
-                tools:text=""
-                android:layout_centerHorizontal="true"
-                android:textSize="14sp"
-                android:padding="4dp"
-                android:textColor="@color/white"/>
-            <!--<ImageView-->
+            android:layout_height="wrap_content"
+            android:paddingBottom="10dp"
+            android:orientation="vertical">
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="226dp"
+                android:layout_margin="10dp"
+                android:background="@drawable/ic_recharge_share_background">
+                <de.hdodenhof.circleimageview.CircleImageView
+                    android:id="@+id/profile_image"
+                    android:layout_width="70dp"
+                    android:layout_height="70dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginRight="2dp"
+                    android:layout_centerHorizontal="true"
+                    />
+                <ImageView
+                    android:id="@+id/text_profile_image"
+                    android:layout_width="70dp"
+                    android:layout_height="70dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginRight="2dp"
+                    android:layout_centerHorizontal="true"
+                    />
+                <ImageView
+                    android:visibility="invisible"
+                    android:id="@+id/iv_uploadImage"
+                    android:layout_toRightOf="@id/profile_image"
+                    android:layout_marginLeft="-26dp"
+                    android:padding="10dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignBottom="@id/profile_image"
+                    app:srcCompat="@drawable/ic_profile_camera"
+                    />
+                <ImageView
+                    android:id="@+id/iv_edit_profile"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:visibility="invisible"
+                    android:visibility="gone"
+                    android:layout_alignParentRight="true"
+                    android:padding="14dp"/>
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_user_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/profile_image"
+                    android:layout_centerHorizontal="true"
+                    android:textSize="18sp"
+                    app:txtfontName="@string/semibold"
+                    android:padding="6dp"
+                    android:textColor="@color/white"/>
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_phone_number"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/tv_user_name"
+                    android:layout_centerHorizontal="true"
+                    android:textSize="14sp"
+                    android:padding="4dp"
+                    android:textColor="@color/white"/>
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_email"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/tv_phone_number"
+                    tools:text=""
+                    android:layout_centerHorizontal="true"
+                    android:textSize="14sp"
+                    android:padding="4dp"
+                    android:textColor="@color/white"/>
+                <!--<ImageView-->
                 <!--android:id="@+id/iv_change_password"-->
                 <!--android:layout_width="wrap_content"-->
                 <!--android:layout_height="wrap_content"-->
@@ -90,138 +93,193 @@
                 <!--android:layout_alignParentBottom="true"-->
                 <!--android:padding="12dp"-->
                 <!--android:src="@drawable/ic_change_password"/>-->
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:layout_width="wrap_content"
-                android:id="@+id/iv_change_password"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_alignParentBottom="true"
-                android:padding="12dp"
-                android:text="@string/change_password_text"
-                android:textColor="@color/white"
-                android:textSize="12sp" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:layout_width="wrap_content"
+                    android:id="@+id/iv_change_password"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_alignParentBottom="true"
+                    android:padding="12dp"
+                    android:text="@string/change_password_text"
+                    android:textColor="@color/white"
+                    android:textSize="12sp" />
 
 
-        </RelativeLayout>
+            </RelativeLayout>
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/ic_rectangle_white_corners"
-            android:layout_margin="6dp"
-            android:visibility="gone"
-            android:padding="8dp">
-            <ImageView
-                android:id="@+id/verify_image"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:src="@drawable/ic_kyc_non_verified_userstatus"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/verify_label"
-                android:layout_width="wrap_content"
+            <RelativeLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="14sp"
-                android:paddingLeft="10dp"
-                android:paddingBottom="2dp"
-                android:paddingTop="4dp"
-                android:layout_toRightOf="@id/verify_image"
-                android:textColor="@color/colorAccent"
-                android:text="Verify your account"/>
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:layout_below="@id/verify_label"
-                android:layout_width="wrap_content"
+                android:background="@drawable/ic_rectangle_white_corners"
+                android:layout_margin="6dp"
+                android:visibility="gone"
+                android:padding="8dp">
+                <ImageView
+                    android:id="@+id/verify_image"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    android:src="@drawable/ic_kyc_non_verified_userstatus"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/verify_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="14sp"
+                    android:paddingLeft="10dp"
+                    android:paddingBottom="2dp"
+                    android:paddingTop="4dp"
+                    android:layout_toRightOf="@id/verify_image"
+                    android:textColor="@color/colorAccent"
+                    android:text="Verify your account"/>
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:layout_below="@id/verify_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="10sp"
+                    android:paddingLeft="10dp"
+                    android:paddingTop="2dp"
+                    android:paddingRight="4dp"
+                    android:layout_toRightOf="@id/verify_image"
+                    android:textColor="@color/darkgray"
+                    android:text="@string/verify_account_text"/>
+
+            </RelativeLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/relativeLayout"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="10sp"
-                android:paddingLeft="10dp"
-                android:paddingTop="2dp"
-                android:paddingRight="4dp"
-                android:layout_toRightOf="@id/verify_image"
-                android:textColor="@color/darkgray"
-                android:text="@string/verify_account_text"/>
-
-        </RelativeLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/relativeLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:background="@drawable/ic_rectangle_white_extra_corners">
+                android:layout_margin="10dp"
+                android:background="@drawable/ic_rectangle_white_extra_corners">
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_balance_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginTop="13dp"
+                    android:padding="2dp"
+                    android:text="@string/available_balance_text"
+                    android:textColor="@color/darkgray"
+                    android:textSize="13sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_balance"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="0"
+                    android:textColor="@color/colorAccent"
+                    android:textSize="24sp"
+                    app:layout_constraintBaseline_toBaselineOf="@+id/tv_currency"
+                    app:layout_constraintStart_toStartOf="@+id/tv_balance_label" />
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/tv_balance_label"
-                android:layout_width="wrap_content"
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_currency"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="9dp"
+                    android:paddingLeft="4dp"
+                    android:text="@string/krw_text"
+                    android:textColor="@color/darkgray"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toEndOf="@+id/tv_balance"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_balance_label" />
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_withdraw"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:background="@drawable/ic_rounded_gray"
+                    android:paddingBottom="6dp"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp"
+                    android:paddingTop="6dp"
+                    android:text="@string/withdraw_text"
+                    android:textColor="@color/darkgray"
+                    android:textSize="12sp"
+                    android:visibility="visible"
+                    app:layout_constraintBottom_toBottomOf="@+id/tv_currency"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:txtfontName="@string/semibold" />
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_wallet_number"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginBottom="13dp"
+                    android:paddingBottom="10dp"
+                    android:paddingTop="10dp"
+                    android:textColor="@color/darkgray"
+                    android:textSize="15sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="@+id/tv_balance_label"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_balance" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
-                android:layout_marginTop="13dp"
-                android:padding="2dp"
-                android:text="@string/available_balance_text"
-                android:textColor="@color/darkgray"
-                android:textSize="13sp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/tv_balance"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="0"
-                android:textColor="@color/colorAccent"
-                android:textSize="24sp"
-                app:layout_constraintBaseline_toBaselineOf="@+id/tv_currency"
-                app:layout_constraintStart_toStartOf="@+id/tv_balance_label" />
-
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/tv_currency"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="9dp"
-                android:paddingLeft="4dp"
-                android:text="KRW"
-                android:textColor="@color/darkgray"
-                android:textSize="18sp"
-                app:layout_constraintStart_toEndOf="@+id/tv_balance"
-                app:layout_constraintTop_toBottomOf="@+id/tv_balance_label" />
-
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/tv_withdraw"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:background="@drawable/ic_rounded_gray"
-                android:paddingBottom="6dp"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
-                android:paddingTop="6dp"
-                android:text="@string/withdraw_text"
-                android:textColor="@color/darkgray"
-                android:textSize="12sp"
-                android:visibility="visible"
-                app:layout_constraintBottom_toBottomOf="@+id/tv_currency"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:txtfontName="@string/semibold" />
-
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/tv_wallet_number"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_marginTop="3dp"
-                android:layout_marginBottom="13dp"
+                android:layout_marginEnd="10dp"
                 android:paddingBottom="10dp"
-                android:paddingTop="10dp"
-                android:textColor="@color/darkgray"
-                android:textSize="15sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="@+id/tv_balance_label"
-                app:layout_constraintTop_toBottomOf="@+id/tv_balance" />
+                android:background="@drawable/ic_rectangle_white_extra_corners">
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_yearly_remaining_label"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginTop="13dp"
+                    android:padding="2dp"
+                    android:gravity="start"
+                    android:text="@string/remaining_limit_text"
+                    android:textColor="@color/darkgray"
+                    android:textSize="13sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_yearly_remaining"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="0"
+                    android:textColor="@color/colorAccent"
+                    android:textSize="24sp"
+                    android:layout_marginBottom="13dp"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_yearly_remaining_label"
+                    app:layout_constraintBaseline_toBaselineOf="@+id/tv_yearly_remaining_currency"
+                    app:layout_constraintStart_toStartOf="@+id/tv_yearly_remaining_label"
+                    app:layout_constraintBottom_toBottomOf="parent"/>
 
-    </LinearLayout>
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_yearly_remaining_currency"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="9dp"
+                    android:paddingLeft="4dp"
+                    android:text="@string/usd_text"
+                    android:textColor="@color/darkgray"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toEndOf="@+id/tv_yearly_remaining"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_yearly_remaining_label" />
 
 
-</LinearLayout>
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+</ScrollView>

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/bright_gray"
     android:orientation="vertical">
 
     <include layout="@layout/layout_sendmoney_toolbar" />

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

@@ -78,10 +78,7 @@
             app:contentInsetRight="0dp"
             app:contentInsetStart="0dp"
             app:layout_collapseMode="pin">
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+
                 <LinearLayout
                     android:id="@+id/searchViewContainer"
                     android:layout_width="match_parent"
@@ -119,20 +116,7 @@
 
 
                 </LinearLayout>
-                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:id="@+id/recipientHintTextView"
-                    android:padding="@dimen/_8sdp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:background="@null"
-                    android:enabled="false"
-                    android:gravity="center"
-                    android:hint="@string/edit_delete_hint_android_text"
-                    android:imeActionLabel="Done"
-                    android:inputType="textMultiLine"
-                    android:textSize="14sp"/>
-            </LinearLayout>
+
         </androidx.appcompat.widget.Toolbar>
 
 

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    >
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/img_close"

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

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:paddingTop="@dimen/_8sdp"
+    android:paddingBottom="@dimen/_8sdp"
+    android:layout_height="match_parent">
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/img_close"
+            android:visibility="gone"
+            android:padding="@dimen/_5sdp"
+            android:layout_marginStart="@dimen/_8sdp"
+            android:layout_marginBottom="@dimen/_2sdp"
+            android:layout_width="@dimen/_22sdp"
+            android:layout_height="@dimen/_22sdp"
+            app:layout_constraintBottom_toBottomOf="@+id/txt_header"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/txt_header"
+            app:srcCompat="@drawable/vd_close" />
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+        android:orientation="horizontal"
+    android:layout_marginStart="@dimen/_25sdp"
+    android:layout_marginEnd="@dimen/_25sdp">
+        <androidx.appcompat.widget.AppCompatImageView
+            android:layout_gravity="center_vertical"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+
+                app:srcCompat="@drawable/vd_edit"/>
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+            android:id="@+id/tv_edit"
+            android:layout_marginStart="@dimen/_8sdp"
+            android:paddingTop="@dimen/_10sdp"
+            android:paddingBottom="@dimen/_10sdp"
+            android:textColor="@color/black"
+            android:textSize="@dimen/_12ssp"
+            android:layout_width="match_parent"
+            android:gravity="start|bottom"
+            android:text="@string/edit_text"
+            android:layout_height="wrap_content"/>
+</LinearLayout>
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:layout_marginStart="@dimen/_25sdp"
+    android:layout_marginEnd="@dimen/_25sdp">
+        <androidx.appcompat.widget.AppCompatImageView
+            android:layout_gravity="center_vertical"
+            android:layout_width="24dp"
+            app:tint="@color/black"
+            app:tintMode="src_in"
+            android:layout_height="24dp"
+                app:srcCompat="@drawable/ic_delete"/>
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+            android:id="@+id/tv_delete"
+            android:layout_marginStart="@dimen/_8sdp"
+            android:paddingTop="@dimen/_10sdp"
+            android:paddingBottom="@dimen/_10sdp"
+            android:textColor="@color/black"
+            android:textSize="@dimen/_12ssp"
+            android:layout_width="match_parent"
+            android:gravity="start|bottom"
+            android:text="@string/delete_text"
+            android:layout_height="wrap_content"/>
+</LinearLayout>
+      
+
+</LinearLayout>

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

@@ -3,20 +3,21 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/swiperefresh"
+    android:background="@color/white"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.LockableScrollView
         android:id="@+id/scrollViewHomeFragment"
-        android:background="@color/background_gray"
         android:scrollbars="none"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
+            android:descendantFocusability="blocksDescendants"
             android:id="@+id/homeContainerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent">
             <androidx.cardview.widget.CardView
                 app:cardUseCompatPadding="false"
                 android:visibility="gone"
@@ -29,38 +30,68 @@
                 android:layout_height="wrap_content"/>
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:background="@color/white"
                 android:id="@+id/headerViewContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="@color/white"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/notificationViewContainer">
 
                 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:layout_marginTop="@dimen/_9sdp"
-                    android:id="@+id/tv_balance_label"
+                    android:id="@+id/tv_gme_wallet_no"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_centerHorizontal="true"
+                    android:layout_marginTop="@dimen/_15sdp"
                     android:gravity="center_horizontal"
                     android:padding="2dp"
-                    android:text="@string/available_balance_text"
-                    android:textSize="13sp"
+                    android:textSize="@dimen/_12ssp"
                     app:fontFamily="@string/bold"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
+                    app:txtfontName="@string/semibold"
+                    tools:text="GME Wallet No : 212234532312312312123123123123" />
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.WaveProgressBarView
+                    android:id="@+id/waveProgressBarView"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/_50sdp"
+                    android:layout_marginTop="@dimen/_8sdp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/dividerView"
+                    app:layout_constraintVertical_bias="0.3" />
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_balance_label"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="@dimen/_15sdp"
+                    android:gravity="center_horizontal"
+                    android:padding="2dp"
+                    android:text="@string/remaining_limit_text"
+                    android:textSize="@dimen/_10ssp"
+                    app:fontFamily="@string/bold"
+                    app:layout_constraintEnd_toStartOf="@+id/verticalDivider"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_gme_wallet_no"
                     app:txtfontName="@string/bold" />
 
                 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:layout_marginTop="@dimen/_4sdp"
                     android:id="@+id/tv_balance"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingStart="@dimen/_3sdp"
+                    android:paddingEnd="@dimen/_3sdp"
                     android:text="@string/na_text"
                     android:textColor="@color/colorAccent"
-                    android:textSize="24sp"
+                    android:textSize="@dimen/_15ssp"
+                    app:layout_constraintBottom_toTopOf="@id/dividerView"
                     app:layout_constraintEnd_toStartOf="@+id/tv_currency"
                     app:layout_constraintHorizontal_bias="0.5"
                     app:layout_constraintHorizontal_chainStyle="packed"
@@ -74,76 +105,138 @@
                     android:layout_below="@id/tv_balance_label"
                     android:layout_centerHorizontal="true"
                     android:paddingLeft="4dp"
-                    android:text="@string/krw_text"
+                    android:text="@string/usd_text"
                     android:textColor="@color/darkgray"
-                    android:textSize="18sp"
+                    android:textSize="@dimen/_15ssp"
                     android:visibility="visible"
                     app:layout_constraintBaseline_toBaselineOf="@+id/tv_balance"
-                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/verticalDivider"
                     app:layout_constraintHorizontal_bias="0.5"
                     app:layout_constraintStart_toEndOf="@+id/tv_balance" />
 
                 <View
-                    android:layout_margin="@dimen/_4sdp"
                     android:id="@+id/dividerView"
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    app:layout_constraintTop_toBottomOf="@id/tv_balance"
-                    android:background="@color/gray" />
+                    android:layout_marginTop="@dimen/_4sdp"
+                    android:background="@android:color/transparent"
+                    app:layout_constraintTop_toBottomOf="@id/tv_balance" />
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_yearly_limit_label"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="@dimen/_15sdp"
+                    android:gravity="center_horizontal"
+                    android:padding="2dp"
+                    android:text="@string/available_balance_text"
+
+                    android:textSize="@dimen/_10ssp"
+                    app:fontFamily="@string/bold"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/verticalDivider"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_gme_wallet_no"
+                    app:txtfontName="@string/bold" />
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_yearly_remaining"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingStart="@dimen/_3sdp"
+                    android:paddingEnd="@dimen/_3sdp"
+                    android:text="@string/na_text"
+                    android:textColor="@color/colorAccent"
+                    android:textSize="@dimen/_15ssp"
+                    app:layout_constraintBottom_toTopOf="@id/dividerView"
+                    app:layout_constraintEnd_toStartOf="@+id/tv_yearly_remaining_currency"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintHorizontal_chainStyle="packed"
+                    app:layout_constraintStart_toEndOf="@+id/verticalDivider"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_yearly_limit_label" />
+
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/tv_yearly_remaining_currency"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/tv_balance_label"
+                    android:layout_centerHorizontal="true"
+                    android:paddingLeft="4dp"
+                    android:text="@string/krw_text"
+                    android:textColor="@color/darkgray"
+                    android:textSize="@dimen/_15ssp"
+                    android:visibility="visible"
+                    app:layout_constraintBaseline_toBaselineOf="@+id/tv_yearly_remaining"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toEndOf="@+id/tv_yearly_remaining" />
+
 
                 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                     android:id="@+id/tv_namelabel"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/_3sdp"
+                    android:layout_marginBottom="@dimen/_15sdp"
+                    android:gravity="start"
                     android:paddingLeft="4dp"
-                    android:paddingTop="6dp"
+                    android:paddingTop="@dimen/_3sdp"
                     android:paddingRight="4dp"
                     android:paddingBottom="4dp"
-                    android:textSize="12sp"
-                    app:txtfontName="@string/semibold"
+                    android:textSize="@dimen/_9ssp"
                     android:visibility="visible"
-                    android:gravity="start"
                     app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/lb_rewardpoint"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/dividerView"
-                    app:layout_constraintEnd_toStartOf="@+id/lb_rewardpoint"
+                    app:txtfontName="@string/semibold"
                     tools:text="Some  very very very long text name goes here, the name is so long that it cannot be described. It is beyond the comprehension that such long name could also exist. Mind blown!!" />
 
 
-
                 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/lb_rewardpoint"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:layout_constraintTop_toBottomOf="@id/dividerView"
-                    app:layout_constraintEnd_toStartOf="@+id/tv_rewardpoint"
                     android:paddingRight="4dp"
-                    android:paddingTop="6dp"
                     android:text="@string/reward_points_text"
-                    android:id="@+id/lb_rewardpoint"
+                    android:textSize="@dimen/_9ssp"
                     android:visibility="visible"
-                    tools:text="Reward Points"
-                    android:textSize="12sp" />
-
+                    app:layout_constraintBaseline_toBaselineOf="@id/tv_rewardpoint"
+                    app:layout_constraintEnd_toStartOf="@+id/tv_rewardpoint"
+                    tools:layout_editor_absoluteY="123dp"
+                    tools:text="Reward Points" />
 
 
                 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    app:layout_constraintEnd_toEndOf="parent"
                     android:id="@+id/tv_rewardpoint"
                     android:layout_width="wrap_content"
                     android:layout_height="17sp"
-                    app:layout_constraintTop_toBottomOf="@id/dividerView"
-                    android:layout_marginTop="6dp"
+                    android:layout_marginEnd="@dimen/_3sdp"
                     android:background="@drawable/ic_rounded_background_red_coloured"
                     android:gravity="center"
                     android:paddingLeft="10dp"
                     android:paddingRight="10dp"
                     android:textColor="@color/white"
-                    android:textSize="12sp"
-                    tools:text="10"
+                    android:textSize="@dimen/_9ssp"
                     android:visibility="visible"
-                    android:layout_marginEnd="@dimen/_3sdp"
-                    />
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="@+id/tv_namelabel"
+                    tools:text="10" />
+
+
+                <View
+                    android:id="@+id/verticalDivider"
+                    android:layout_width="@dimen/_1sdp"
+                    android:layout_height="0dp"
+                    android:layout_marginTop="@dimen/_6sdp"
+                    android:layout_marginBottom="@dimen/_6sdp"
+                    android:background="@color/gray"
+                    app:layout_constraintBottom_toTopOf="@+id/dividerView"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_gme_wallet_no" />
+
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -46,7 +46,7 @@
                 android:id="@+id/iv_edit_profile"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_edit"
+                android:src="@drawable/vd_edit"
                 tools:visibility="visible"
                 android:visibility="gone"
                 android:layout_alignParentRight="true"

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

@@ -44,7 +44,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textColor="@color/cs_red"
-                        android:textSize="18sp" />
+                        android:textSize="@dimen/_14ssp" />
 
                     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                         android:id="@+id/txt_contact"
@@ -52,7 +52,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="14dp"
                         android:textColor="@color/darkgray"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/_10ssp" />
 
                     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                         android:id="@+id/txt_user_email"
@@ -60,7 +60,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="6dp"
                         android:textColor="@color/darkgray"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/_10ssp" />
 
                 </LinearLayout>
 
@@ -84,11 +84,13 @@
             </LinearLayout>
 
             <View
+                android:visibility="gone"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="@color/divider" />
 
             <LinearLayout
+                android:visibility="gone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="12dp"
@@ -102,7 +104,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/remaining_limit_text"
                     android:textColor="@color/darkgray"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/_10ssp" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -149,7 +151,7 @@
                         android:textSize="15sp" />
                     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                         android:layout_gravity="bottom"
-                        android:visibility="visible"
+                        android:visibility="gone"
                         android:id="@+id/btn_withdraw"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -201,7 +203,7 @@
                         android:layout_marginStart="12dp"
                         android:text="@string/auto_debit_account_text"
                         android:textColor="@color/darkgray"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/_10ssp" />
 
                 </LinearLayout>
                 <View
@@ -229,7 +231,7 @@
                         android:layout_marginStart="12dp"
                         android:text="@string/inbound_accounts_text"
                         android:textColor="@color/darkgray"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/_10ssp" />
 
                 </LinearLayout>
                 <View
@@ -258,7 +260,7 @@
                         android:layout_marginStart="14dp"
                         android:text="@string/transaction_report_text"
                         android:textColor="@color/darkgray"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/_10ssp" />
 
                 </LinearLayout>
                 <View
@@ -287,7 +289,7 @@
                         android:layout_marginStart="14dp"
                         android:text="@string/recharge_history_text"
                         android:textColor="@color/darkgray"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/_10ssp" />
 
                 </LinearLayout>
 
@@ -317,7 +319,7 @@
                         android:layout_marginStart="14dp"
                         android:text="@string/about_gme_text"
                         android:textColor="@color/darkgray"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/_10ssp" />
 
                 </LinearLayout>
 
@@ -348,7 +350,7 @@
                         <!--android:layout_marginStart="14dp"-->
                         <!--android:text="Support"-->
                         <!--android:textColor="@color/darkgray"-->
-                        <!--android:textSize="14sp" />-->
+                        <!--android:textSize="@dimen/_10ssp" />-->
 
                 <!--</LinearLayout>-->
 
@@ -377,7 +379,7 @@
                         android:layout_marginStart="14dp"
                         android:text="@string/settings_text"
                         android:textColor="@color/darkgray"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/_10ssp" />
 
                 </LinearLayout>
 
@@ -406,7 +408,7 @@
                         android:layout_marginStart="14dp"
                         android:text="@string/logout_text"
                         android:textColor="@color/darkgray"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/_10ssp" />
 
                 </LinearLayout>
 

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

@@ -6,119 +6,150 @@
     android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/_4sdp"
     android:layout_marginTop="@dimen/_5sdp"
-    android:padding="@dimen/_4sdp"
     android:layout_marginEnd="@dimen/_4sdp"
-    android:layout_marginBottom="@dimen/_5sdp">
+    android:layout_marginBottom="@dimen/_5sdp"
+    android:padding="@dimen/_4sdp">
 
     <ImageView
         android:id="@+id/receiverNativeCountryFlagImageView"
         android:layout_width="@dimen/_40sdp"
         android:layout_height="@dimen/_34sdp"
+        android:layout_marginStart="@dimen/_15sdp"
         android:scaleType="centerCrop"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/guideline"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
         android:id="@+id/receiverNameTxtView"
-        android:layout_width="276dp"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/_15sdp"
         android:layout_weight="1"
-        android:gravity="left"
+        android:gravity="start"
         android:maxLines="3"
         android:singleLine="false"
         android:textColor="@color/darkgray"
         android:textSize="@dimen/_12ssp"
         app:layout_constraintBottom_toTopOf="@+id/detail1TxtView"
+        app:layout_constraintEnd_toStartOf="@+id/iv_edit"
+        app:layout_constraintStart_toEndOf="@+id/receiverNativeCountryFlagImageView"
         app:layout_constraintTop_toTopOf="parent"
         app:txtfontName="@string/semibold"
-        tools:layout_editor_absoluteX="95dp"
-        app:layout_constraintStart_toEndOf="@+id/guideline"
-        app:layout_constraintEnd_toEndOf="parent"
-        tools:text="N/A" />
+        tools:layout_editor_absoluteX="95dp" />
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
         android:id="@+id/detail1TxtView"
-        android:layout_width="276dp"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/_15sdp"
         android:layout_weight="1"
-        android:gravity="left"
+        android:gravity="start"
         android:textColor="@color/darkgray"
-        android:textSize="@dimen/_11sdp"
+        android:textSize="@dimen/_11ssp"
         app:layout_constraintBottom_toTopOf="@+id/detail2TxtView"
+        app:layout_constraintEnd_toStartOf="@+id/iv_edit"
+        app:layout_constraintStart_toEndOf="@+id/receiverNativeCountryFlagImageView"
         app:layout_constraintTop_toBottomOf="@+id/receiverNameTxtView"
-        app:layout_constraintStart_toEndOf="@+id/guideline"
-        app:layout_constraintEnd_toEndOf="parent"
         app:txtfontName="@string/regular"
         tools:layout_editor_absoluteX="95dp"
         tools:text="Closing Balance" />
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
         android:id="@+id/detail2TxtView"
-        android:layout_width="276dp"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/_15sdp"
         android:layout_weight="1"
-        android:gravity="left"
+        android:gravity="start"
         android:textColor="@color/darkgray"
-        android:textSize="@dimen/_11sdp"
+        android:textSize="@dimen/_11ssp"
         app:layout_constraintBottom_toTopOf="@+id/detail3TxtView"
-        app:layout_constraintStart_toEndOf="@+id/guideline"
+        app:layout_constraintEnd_toStartOf="@+id/iv_edit"
+        app:layout_constraintStart_toEndOf="@+id/receiverNativeCountryFlagImageView"
         app:layout_constraintTop_toBottomOf="@+id/detail1TxtView"
-        app:layout_constraintEnd_toEndOf="parent"
         app:txtfontName="@string/regular"
         tools:text="Closing Balance" />
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
         android:id="@+id/detail3TxtView"
-        android:layout_width="276dp"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/_15sdp"
         android:layout_weight="1"
-        android:gravity="left"
+        android:gravity="start"
         android:textColor="@color/darkgray"
-        android:textSize="@dimen/_11sdp"
+        android:textSize="@dimen/_11ssp"
         app:layout_constraintBottom_toTopOf="@+id/detail4TxtView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/guideline"
+        app:layout_constraintEnd_toStartOf="@+id/iv_edit"
+        app:layout_constraintStart_toEndOf="@+id/receiverNativeCountryFlagImageView"
         app:layout_constraintTop_toBottomOf="@+id/detail2TxtView"
         app:txtfontName="@string/regular"
         tools:text="Closing Balance" />
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
         android:id="@+id/detail4TxtView"
-        android:layout_width="276dp"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/_15sdp"
         android:layout_weight="1"
-        android:gravity="left"
+        android:gravity="start"
         android:textColor="@color/darkgray"
-        android:textSize="@dimen/_11sdp"
+        android:textSize="@dimen/_11ssp"
         app:layout_constraintBottom_toTopOf="@+id/detail5TxtView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/guideline"
+        app:layout_constraintEnd_toStartOf="@+id/iv_edit"
+        app:layout_constraintStart_toEndOf="@+id/receiverNativeCountryFlagImageView"
         app:layout_constraintTop_toBottomOf="@+id/detail3TxtView"
         app:txtfontName="@string/regular"
         tools:text="Closing Balance" />
-        tools:text="Closing Balance" />
+
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
         android:id="@+id/detail5TxtView"
-        android:layout_width="276dp"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/_15sdp"
         android:layout_weight="1"
-        android:gravity="left"
+        android:gravity="start"
         android:textColor="@color/darkgray"
-        android:textSize="@dimen/_11sdp"
+        android:textSize="@dimen/_11ssp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/guideline"
+        app:layout_constraintEnd_toStartOf="@+id/iv_edit"
+        app:layout_constraintStart_toEndOf="@+id/receiverNativeCountryFlagImageView"
         app:layout_constraintTop_toBottomOf="@+id/detail4TxtView"
         app:txtfontName="@string/regular"
         tools:text="Closing Balance " />
 
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.29" />
+
+
+    <ImageView
+        android:id="@+id/iv_remove"
+        android:layout_width="@dimen/_25sdp"
+        android:layout_height="@dimen/_25sdp"
+        android:layout_centerVertical="true"
+        android:layout_marginTop="@dimen/_8sdp"
+        android:layout_marginEnd="@dimen/_8sdp"
+        android:layout_marginBottom="@dimen/_8sdp"
+        android:scaleType="centerCrop"
+        android:src="@drawable/ic_delete"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+         />
+
+    <ImageView
+        android:id="@+id/iv_edit"
+        android:layout_width="@dimen/_25sdp"
+        android:layout_height="@dimen/_25sdp"
+        android:layout_centerVertical="true"
+        android:layout_marginTop="@dimen/_8sdp"
+        android:layout_marginBottom="@dimen/_8sdp"
+        android:layout_marginEnd="@dimen/_12sdp"
+        android:scaleType="centerCrop"
+        app:srcCompat="@drawable/vd_edit"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/iv_remove"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -507,7 +507,7 @@
     <string name="payment_mode_placeholder_text">Выберите способ оплаты</string>
     <string name="bank_placeholder_text">Выберите Тип Карты или банк</string>
     <string name="branch_placeholder_text">Выберите филиал</string>
-    <string name="account_placeholder_text">Номер банковской карты</string>
+    <string name="account_placeholder_text">Номер банковской карты (Счет)</string>
     <string name="first_name_placeholder_text">Введите имя</string>
     <string name="middle_name_placeholder_text">Введите отчество</string>
     <string name="last_name_placeholder_text">Введите фамилию</string>

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

@@ -8,7 +8,9 @@
     <color name="colorAccent">#ed1c24</color>
     <color name="white">#ffffff</color>
     <color name="gray">#E0E0E0</color>
+    <color name="gray1">#EEEEEE</color>
     <color name="bright_gray">#FAFAFA</color>
+    <color name="bright_gray2">#FEFEFE</color>
     <color name="faded_red">#E4E5EE</color>
     <!--<color name="background_gray">#e7edf2</color>-->
     <color name="background_gray">#F6F6F6</color>