minor changes ui fixes and issue fixes

.idea/assetWizardSettings.xml

@@ -318,8 +318,8 @@
                         <option name="values">
                           <map>
                             <entry key="assetSourceType" value="FILE" />
-                            <entry key="outputName" value="reward_points" />
-                            <entry key="sourceFile" value="$USER_HOME$/Downloads/Icons_JME 2/reward_points.svg" />
+                            <entry key="outputName" value="ic_loyalty" />
+                            <entry key="sourceFile" value="$USER_HOME$/Downloads/rem_icons/Group 10907.svg" />
                           </map>
                         </option>
                       </PersistentState>

app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt

@@ -48,7 +48,7 @@ class BeneficiaryDetailActivity : BaseActivity() {
             override fun onItemClicked(paymentMethodV3Model: PaymentMethodV3Model) {
                 isPaymentSelected = true
                 receiverInfoModel?.paymentMethod = paymentMethodV3Model
-                receiverInfoModel?.receiverId = paymentMethodV3Model.agent.id
+                receiverInfoModel?.receiverId = paymentMethodV3Model.receiverId
                 receiverInfoModel?.agent = paymentMethodV3Model.agent
             }
 

app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt

@@ -132,7 +132,7 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
         val tab2: TabLayout.Tab =
             binding.tabLayout.newTab().setIcon(R.drawable.ic_transfers_unselected)
         val tab3: TabLayout.Tab =
-            binding.tabLayout.newTab().setIcon(R.drawable.ic_transfers_unselected)
+            binding.tabLayout.newTab().setIcon(R.drawable.profile_unselected)
 
 // Add tabs to the TabLayout
         binding.tabLayout.addTab(tab1)
@@ -148,12 +148,20 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
             }
 
             override fun onPageSelected(position: Int) {
+                if (viewModel?.notificationViewActive == true) {
+                    if (position == 1) {
+                        return
+                    }
+                }
                 if (viewModel?.notificationViewActive == true) {
                     if (binding.vpDashboard.currentItem == 0) {
                         homeFragmentV3.showNotification()
+                        homeFragmentV3.focusHome(false)
                     } else {
                         homeFragmentV3.removeNotification()
                     }
+                } else {
+                    homeFragmentV3.focusHome(true)
                 }
                 binding.tabLayout.selectTab(binding.tabLayout.getTabAt(position));
             }
@@ -166,6 +174,11 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
 
         binding.tabLayout.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
             override fun onTabSelected(tab: TabLayout.Tab) {
+                if (viewModel?.notificationViewActive == true) {
+                    if (tab.position == 1) {
+                        return
+                    }
+                }
                 when (tab.position) {
                     0 -> {
                         resetTabs()
@@ -179,7 +192,7 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
                     }
                     2 -> {
                         resetTabs()
-                        tab.setIcon(R.drawable.ic_transfers_selected)
+                        tab.setIcon(R.drawable.profile_selected)
                         binding.vpDashboard.currentItem = 2
                     }
                 }
@@ -201,7 +214,7 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
     fun resetTabs() {
         binding.tabLayout.getTabAt(0)?.setIcon(R.drawable.ic_home_unselected)
         binding.tabLayout.getTabAt(1)?.setIcon(R.drawable.ic_transfers_unselected)
-        binding.tabLayout.getTabAt(2)?.setIcon(R.drawable.ic_transfers_unselected)
+        binding.tabLayout.getTabAt(2)?.setIcon(R.drawable.profile_unselected)
     }
 
     override fun getContext(): AppCompatActivity {
@@ -325,15 +338,15 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
         if (!action) {
             viewGroupOverlay.clear()
         }
-        if (binding.vpDashboard.currentItem == 2) {
-            viewGroupOverlay.clear()
-        }
         this.notificationViewBoundry = notificationViewBoundry
         isNotificaitonViewActive = action
 
         if (isNotificaitonViewActive()) {
             viewModel?.notificationViewActive = true
         }
+        if (viewModel?.notificationViewActive == true) {
+            homeFragmentV3.focusHome(false)
+        }
     }
 
     override fun showBankDeposit() {
@@ -764,7 +777,7 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
         } else false
     }
 
-    private fun isNotificaitonViewActive(): Boolean {
+    public fun isNotificaitonViewActive(): Boolean {
         return isNotificaitonViewActive && notificationViewBoundry != null
     }
 }

app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt

@@ -25,6 +25,7 @@ import androidx.transition.AutoTransition
 import androidx.transition.Transition
 import androidx.transition.TransitionListenerAdapter
 import androidx.transition.TransitionManager
+import androidx.transition.Visibility
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.signature.ObjectKey
@@ -134,6 +135,9 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
         homeViewModel!!.subscribeToHomeRelatedDataEvent().observe(
             viewLifecycleOwner
         ) { homeViewRelatedDTOV2: HomeViewRelatedDTOV2 ->
+            if (binding.swiperefresh.isRefreshing) {
+                binding.swiperefresh.isRefreshing = false
+            }
             Glide.with(context!!)
                 .load(homeViewRelatedDTOV2.profileImage)
                 .apply(options.signature(ObjectKey(System.currentTimeMillis())))
@@ -141,12 +145,18 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
                 .placeholder(R.drawable.ic_user)
                 .into((requireActivity() as HomeActivityV3).binding.toolbarHead.ivProfileImage)
             setBannerData(homeViewRelatedDTOV2.bannerImages)
+            this.displayUserInfo(
+                homeViewRelatedDTOV2
+            )
             if (homeViewRelatedDTOV2.homeNotificationViewDTO != null) {
                 this.homeViewRelatedDTOV2 = homeViewRelatedDTOV2
                 showNotificationView(homeViewRelatedDTOV2.homeNotificationViewDTO)
             }
             homeViewModel?.showChangedNotification(homeViewRelatedDTOV2.notificationCount)
         }
+        binding.swiperefresh.setOnRefreshListener {
+            homeViewModel!!.getRequiredData()
+        }
     }
 
     fun showNotification() {
@@ -157,8 +167,12 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
         }
     }
 
-    fun focusHome(){
-
+    fun focusHome(focus: Boolean) {
+        if (!focus) {
+            binding.overlayLayout.visibility = View.VISIBLE
+        } else {
+            binding.overlayLayout.visibility = View.GONE
+        }
     }
 
     private fun setUpData() {
@@ -170,9 +184,9 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
         viewModel!!.subscribeToUserProfileInfoFetchEvent().observe(
             this
         ) { body: UserProfile? ->
-            this.displayUserInfo(
-                body!!
-            )
+//            this.displayUserInfo(
+//                body!!
+//            )
         }
     }
 
@@ -198,15 +212,15 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
         gestureDetector = GestureDetectorCompat(requireContext(), myViewGestureDetector)
     }
 
-    fun displayUserInfo(body: UserProfile) {
-        binding.tvAccNo.text = body.walletNumber
+    fun displayUserInfo(body: HomeViewRelatedDTOV2) {
+        binding.tvAccNo.text = body.referralCode
         binding.tvAvlBalance.text = body.availableBalance
         (requireActivity() as HomeActivityV3).binding.toolbarHead.tvProfileName.text =
-            "Hi " + body.firstName
+            "Hi " + body.userName
         binding.ivCopy.setOnClickListener {
             val clipboardManager =
                 requireActivity().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-            val clipData = ClipData.newPlainText("label", body.walletNumber)
+            val clipData = ClipData.newPlainText("label", body.referralCode)
             clipboardManager.setPrimaryClip(clipData)
             Toast.makeText(requireContext(), "Copied to clipboard", Toast.LENGTH_SHORT).show()
         }

app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt

@@ -3,6 +3,7 @@ package com.remit.jmecustomer.features.myTransfers.view
 import MyBeneficiariesAdapter
 import android.content.Intent
 import android.os.Bundle
+import android.os.Handler
 import android.os.Parcelable
 import android.text.Editable
 import android.view.LayoutInflater
@@ -21,6 +22,7 @@ import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog.Gen
 import com.remit.jmecustomer.databinding.FragmentMyTransfersBinding
 import com.remit.jmecustomer.features.beneficiaryDetail.BeneficiaryDetailActivity
 import com.remit.jmecustomer.features.home.presenter.HomeViewModel
+import com.remit.jmecustomer.features.homeV3.view.HomeActivityV3
 import com.remit.jmecustomer.features.myTransfers.adapters.RecentTransactionsAdapter
 import com.remit.jmecustomer.features.recipientmanagement.gateway.recipientlistingV3.RecipientListingV3Gateway
 import com.remit.jmecustomer.features.recipientmanagement.model.recipientModelV5.Receiver
@@ -67,9 +69,11 @@ class MyTransfersFragment : BaseFragment(),
     ): View? {
         _binding = FragmentMyTransfersBinding.inflate(inflater, container, false)
         init()
-        if (homeViewModel?.checkIfUserVerified() == null) {
-            performDefaultAction("151")
-        }
+        Handler().postDelayed({
+            if (!(requireActivity() as HomeActivityV3).isNotificaitonViewActive()) {
+                performDefaultAction("151")
+            }
+        }, 2000)
         setUpData()
         return binding.root
     }

app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/PaymentMethodV3Model.java

@@ -11,6 +11,9 @@ import java.util.List;
 
 public class PaymentMethodV3Model implements Parcelable {
 
+    @SerializedName("receiverId")
+    @Expose
+    private String receiverId;
     @SerializedName("id")
     @Expose
     private String id;
@@ -33,6 +36,14 @@ public class PaymentMethodV3Model implements Parcelable {
 
     boolean selected;
 
+    public String getReceiverId() {
+        return receiverId;
+    }
+
+    public void setReceiverId(String receiverId) {
+        this.receiverId = receiverId;
+    }
+
     public String getId() {
         return id;
     }
@@ -103,6 +114,7 @@ public class PaymentMethodV3Model implements Parcelable {
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(this.receiverId);
         dest.writeString(this.id);
         dest.writeString(this.name);
         dest.writeString(this.localizedName);
@@ -111,6 +123,7 @@ public class PaymentMethodV3Model implements Parcelable {
     }
 
     protected PaymentMethodV3Model(Parcel in) {
+        this.receiverId = in.readString();
         this.id = in.readString();
         this.name = in.readString();
         this.localizedName = in.readString();

app/src/main/java/com/remit/jmecustomer/features/userprofile/view/ProfileFragment.kt

@@ -32,7 +32,10 @@ import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog.Gen
 import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialogSingleButton
 import com.remit.jmecustomer.databinding.FragmentProfileBinding
 import com.remit.jmecustomer.features.aboutscreen.view.AboutJMERemit
-import com.remit.jmecustomer.features.changepassNPin.view.ChangePassNPinActivity
+import com.remit.jmecustomer.features.aboutscreen.viewModel.AboutUsPresenterInterface.AboutUsContractInterface
+import com.remit.jmecustomer.features.aboutscreen.viewModel.AboutUsViewModel
+import com.remit.jmecustomer.features.aboutscreen.viewModel.AboutUsViewModelFactory
+import com.remit.jmecustomer.features.changepassword.view.UserPasswordChangeV2Activity
 import com.remit.jmecustomer.features.changetxnpin.view.ChangeTxnPinActivity
 import com.remit.jmecustomer.features.customersupport.view.CustomerSupportFragment
 import com.remit.jmecustomer.features.depositinfo.view.DepositInfo
@@ -49,6 +52,7 @@ import com.remit.jmecustomer.features.security.RemitAuthManager1
 import com.remit.jmecustomer.features.security.RemitAuthManagerGateway
 import com.remit.jmecustomer.features.security.model.RemitAuthFailedResult
 import com.remit.jmecustomer.features.security.model.RemitAuthSuccessResult
+import com.remit.jmecustomer.features.sendmoney.view.verification.TermsAndConditionV2BrowserActivity
 import com.remit.jmecustomer.features.settings.gateway.LanguageSelectionGateway
 import com.remit.jmecustomer.features.settings.gateway.LanguageSelectionGatewayInterface
 import com.remit.jmecustomer.features.settings.view.FingerSetUpPasswordFragment
@@ -61,6 +65,8 @@ import com.remit.jmecustomer.features.userprofile.model.UserProfile
 import com.remit.jmecustomer.features.userprofile.presenter.UserProfilePresenterInterface
 import com.remit.jmecustomer.features.userprofile.presenter.UserProfilePresenterV2
 import com.remit.jmecustomer.features.walletstatement.view.WalletStatementV2Activity
+import com.remit.jmecustomer.features.webbrowser.WebBrowserV2Activity
+import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel
 import com.remit.jmecustomer.utils.Constants
 import com.remit.jmecustomer.utils.FileUtils
 import com.remit.jmecustomer.utils.Utils
@@ -72,7 +78,7 @@ import java.io.*
 
 class ProfileFragment : BaseFragment(), View.OnClickListener,
     UserProfilePresenterInterface.UserProfileContractInterface, RemitSucessFailureCallBack,
-    CompoundButton.OnCheckedChangeListener {
+    CompoundButton.OnCheckedChangeListener, AboutUsContractInterface {
     private var TAG: String? = "TAG"
     var selectedImagePath: String = ""
     var imgReport1: String = ""
@@ -95,6 +101,7 @@ class ProfileFragment : BaseFragment(), View.OnClickListener,
     var remitAuthManagerGateway: RemitAuthManagerGateway? = null
     val STORAGE_INTENT_REQUEST = 9992
     private var homeViewModel: HomeViewModel? = null
+    private var aboutUsViewModel: AboutUsViewModel? = null
 
 
     override fun onCreateView(
@@ -113,8 +120,13 @@ class ProfileFragment : BaseFragment(), View.OnClickListener,
         viewModel = ViewModelProvider(this, UserProfileViewModelFactory(this)).get(
             UserProfilePresenterV2::class.java
         )
-        binding.tvRewardPoint.setText(
-            RemitApplication.getStorage().getString(PrefKeys.REWARD_POINTS, "")
+        aboutUsViewModel =
+            ViewModelProvider(this, AboutUsViewModelFactory(this)).get(
+                AboutUsViewModel::class.java
+            )
+        binding.tvRewardPointRefer.setText(
+            RemitApplication.getStorage()
+                .getString(PrefKeys.REWARD_POINTS, "") + " " + "reward points"
         )
         homeViewModel = ViewModelProvider(requireActivity()).get(HomeViewModel::class.java)
         binding.llPaymentLayout.setOnClickListener(this)
@@ -130,6 +142,9 @@ class ProfileFragment : BaseFragment(), View.OnClickListener,
         binding.llLoyaltyPoints.setOnClickListener(this)
         binding.llRenewId.setOnClickListener(this)
         binding.llRewards.setOnClickListener(this)
+        binding.tvPrivacyPolicy.setOnClickListener(this)
+        binding.tvTermAndCondition.setOnClickListener(this)
+        binding.tvFraudGuarantee.setOnClickListener(this)
         viewModel!!.subscribeToUserProfileInfoFetchEvent().observe(
             this
         ) { body: UserProfile? ->
@@ -243,7 +258,7 @@ class ProfileFragment : BaseFragment(), View.OnClickListener,
                 takeUserImageData()
 
             R.id.ll_change_password -> {
-                startActivity(Intent(requireActivity(), ChangePassNPinActivity::class.java))
+                startActivity(Intent(requireActivity(), UserPasswordChangeV2Activity::class.java))
             }
 
             R.id.ll_refer_earn -> {
@@ -261,6 +276,18 @@ class ProfileFragment : BaseFragment(), View.OnClickListener,
             R.id.ll_rewards -> {
 //                startActivity(Intent(requireActivity(), RewardActivity::class.java))
             }
+
+            R.id.tv_term_and_condition -> {
+                aboutUsViewModel?.getWebRequestDataForTermsAndCondition()
+            }
+
+            R.id.tv_privacy_policy -> {
+                aboutUsViewModel?.getWebRequestDataForPrivacyPolicy()
+            }
+
+            R.id.tv_fraud_guarantee -> {
+                aboutUsViewModel?.getFraudGuaranteePolicy()
+            }
         }
     }
 
@@ -882,4 +909,31 @@ class ProfileFragment : BaseFragment(), View.OnClickListener,
         }
         return compressedBitmap
     }
+
+    override fun navigateToTermsAndCondition(webRequestModel: WebRequestModel?) {
+        val intent = Intent(requireActivity(), TermsAndConditionV2BrowserActivity::class.java)
+        intent.putExtra(WebBrowserV2Activity.WEB_BROWSWER_URL_BUNDLE_KEY, webRequestModel)
+        startActivity(intent)
+    }
+
+    override fun navigateToPrivacyAndPolicy(webRequestModel: WebRequestModel?) {
+        val intent = Intent(requireActivity(), TermsAndConditionV2BrowserActivity::class.java)
+        intent.putExtra(WebBrowserV2Activity.WEB_BROWSWER_URL_BUNDLE_KEY, webRequestModel)
+        startActivity(intent)
+    }
+
+
+    override fun navigateToFaceBookPage(webRequestModel: WebRequestModel?) {
+        val facebookIntent = Intent(Intent.ACTION_VIEW)
+        val facebookUrl = Utils.getFacebookPageURL(requireActivity())
+        facebookIntent.data = Uri.parse(facebookUrl)
+        startActivity(facebookIntent)
+    }
+
+
+    override fun navigateToFraudGuaranteePolicy(webRequestModel: WebRequestModel?) {
+        val intent = Intent(requireActivity(), TermsAndConditionV2BrowserActivity::class.java)
+        intent.putExtra(WebBrowserV2Activity.WEB_BROWSWER_URL_BUNDLE_KEY, webRequestModel)
+        startActivity(intent)
+    }
 }

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

@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M1.999,18.649v-5.8A1.474,1.474 0,0 1,3.132 11.419l2.3,-0.545a5.634,5.634 0,0 1,3.527 0.309l4.379,1.888a2.7,2.7 0,0 1,1.386 3.6h0l0.373,0.489 4.653,-1.661a1.666,1.666 0,0 1,2.16 1.034h0a1.666,1.666 0,0 1,-0.835 2.016l-4.623,2.328a3.887,3.887 0,0 1,-2.964 0.211l-6.14,-2.047a4.3,4.3 0,0 0,-2.7 -0.008l-1.472,0.481A0.9,0.9 0,0 1,1.999 18.649Z"
+      android:strokeAlpha="0.35"
+      android:fillColor="#2e89ff"
+      android:fillAlpha="0.35"/>
+  <path
+      android:pathData="M11.885,7.883c0.513,0.513 3.62,3.1 3.836,3.314h0a1.1,1.1 0,0 0,1.556 0h0c0.216,-0.216 3.323,-2.8 3.836,-3.314A3.025,3.025 0,1 0,16.499 4.019a3.022,3.022 0,1 0,-4.614 3.867Z"
+      android:fillColor="#2e89ff"/>
+</vector>

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

@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15.913,14.174L15.913,6.348A2.609,2.609 0,0 0,13.304 3.739L6.348,3.739A2.609,2.609 0,0 0,3.739 6.348v11.3a2.609,2.609 0,0 0,2.609 2.609h6.957a2.51,2.51 0,0 0,0.294 -0.03,3.473 3.473,0 1,0 2.315,-6.057Z"
+      android:strokeAlpha="0.35"
+      android:fillColor="#2e89ff"
+      android:fillAlpha="0.35"/>
+  <path
+      android:pathData="M9.826,10.261m-2.174,0a2.174,2.174 0,1 1,4.348 0a2.174,2.174 0,1 1,-4.348 0"
+      android:fillColor="#2e89ff"/>
+  <path
+      android:pathData="M10.922,14.174a5.992,5.992 0,0 0,-1.1 3.478L8.087,17.652a1.739,1.739 0,1 1,0 -3.478Z"
+      android:fillColor="#2e89ff"/>
+  <path
+      android:pathData="M9.317,2h1.019a1.229,1.229 0,0 1,1.23 1.23L11.566,4.249a1.229,1.229 0,0 1,-1.23 1.23L9.317,5.479A1.229,1.229 0,0 1,8.087 4.249L8.087,3.23A1.229,1.229 0,0 1,9.317 2Z"
+      android:fillColor="#2e89ff"/>
+  <path
+      android:pathData="M15.913,13.304A4.348,4.348 0,1 0,20.265 17.652,4.348 4.348,0 0,0 15.913,13.304ZM18.19,17.321L16.016,19.494a0.762,0.762 0,0 1,-1.077 0l-1.3,-1.3a0.761,0.761 0,1 1,1.076 -1.077l0.766,0.767 1.636,-1.637a0.762,0.762 0,0 1,1.077 1.077Z"
+      android:fillColor="#2e89ff"/>
+</vector>

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

@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:strokeAlpha="0.35"
+      android:fillColor="#2e89ff"
+      android:fillAlpha="0.35"/>
+  <path
+      android:pathData="M12,9m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+      android:fillColor="#2e89ff"/>
+  <path
+      android:pathData="M17.883,15.784A2.491,2.491 0,0 0,15.5 14h-7a2.491,2.491 0,0 0,-2.383 1.784,6.989 6.989,0 0,0 11.766,0Z"
+      android:fillColor="#2e89ff"/>
+</vector>

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

@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:strokeAlpha="0.35"
+      android:fillAlpha="0.35"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,9m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M17.883,15.784A2.491,2.491 0,0 0,15.5 14h-7a2.491,2.491 0,0 0,-2.383 1.784,6.989 6.989,0 0,0 11.766,0Z"/>
+</vector>

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

@@ -41,7 +41,7 @@
         app:tabPaddingStart="10dp"
         app:tabPaddingEnd="10dp"
         app:tabIndicatorHeight="2dp"
-        app:tabIndicatorColor="@color/colorPrimary"
+        app:tabIndicatorColor="@color/light_blue"
         />
 
   </LinearLayout>

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

@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.remit.jmecustomer.common.customwidgets.LockableScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/scrollViewHomeFragment"
+    android:id="@+id/swiperefresh"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#F7F7F7">
 
+
+    <com.remit.jmecustomer.common.customwidgets.LockableScrollView
+        android:id="@+id/scrollViewHomeFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/homeContainerView"
         android:layout_width="match_parent"
@@ -43,7 +49,7 @@
                     style="@style/TextStyle.VolteSemiBold12"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Account Number"
+                    android:text="@string/memberShipId_text"
                     android:textColor="@color/black_opacity_60"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -438,6 +444,19 @@
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
+            <FrameLayout
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:visibility="gone"
+                android:clickable="true"
+                android:focusable="true"
+                android:id="@+id/overlay_layout"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:background="@android:color/transparent"/>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</com.remit.jmecustomer.common.customwidgets.LockableScrollView>
+
+    </com.remit.jmecustomer.common.customwidgets.LockableScrollView>
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

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

@@ -231,7 +231,7 @@
                     android:gravity="center"
                     android:orientation="horizontal"
                     android:padding="@dimen/_13sdp"
-                    android:visibility="visible">
+                    android:visibility="gone">
 
                     <ImageView
                         android:id="@+id/ic_reward"
@@ -300,8 +300,8 @@
                         android:id="@+id/ic_loyalty_points"
                         android:layout_width="@dimen/_20sdp"
                         android:layout_height="@dimen/_20sdp"
-                        app:srcCompat="@drawable/icv_menu_loyalty_point"
-                        app:tint="@color/light_blue" />
+                        app:srcCompat="@drawable/ic_loyalty"
+                         />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -355,6 +355,16 @@
                             android:text="@string/refer_and_earn_text"
                             android:textColor="@color/black_opacity_87" />
 
+
+                        <TextView
+                            android:id="@+id/tv_reward_point_refer"
+                            style="@style/TextStyle.VolteSemiBold14"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/_4sdp"
+                            android:layout_marginRight="@dimen/_2sdp"
+                            android:textColor="@color/black_opacity_60" />
+
                     </LinearLayout>
                 </RelativeLayout>
 
@@ -435,7 +445,7 @@
                         android:id="@+id/ic_renew_id"
                         android:layout_width="@dimen/_20sdp"
                         android:layout_height="@dimen/_20sdp"
-                        app:srcCompat="@drawable/round_person_24px" />
+                        app:srcCompat="@drawable/ic_renew_id" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -790,15 +800,14 @@
                 </RelativeLayout>
 
                 <!-- Privacy Policy Layout Start -->
-                <RelativeLayout
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/_63sdp"
-                    android:layout_gravity="center"
                     android:background="@color/profile_background_color"
-                    android:gravity="center"
                     android:paddingTop="@dimen/_10sdp">
 
                     <TextView
+                        android:layout_marginLeft="@dimen/_10sdp"
                         android:id="@+id/tv_privacy_policy"
                         style="@style/TextStyle.VolteSemiBold12"
                         android:layout_width="wrap_content"
@@ -807,7 +816,7 @@
                         android:layout_marginRight="@dimen/_6sdp"
                         android:layout_toStartOf="@+id/dot_layout"
                         android:layout_toLeftOf="@+id/dot_layout"
-                        android:text="Privacy Policy"
+                        android:text="@string/privacyAndPolicy1_text"
                         android:textColor="@color/black_opacity_60" />
 
                     <ImageView
@@ -819,6 +828,8 @@
                         android:src="@drawable/blue_dot" />
 
                     <TextView
+                        android:layout_marginEnd="@dimen/_6sdp"
+                        android:layout_marginRight="@dimen/_6sdp"
                         android:id="@+id/tv_term_and_condition"
                         style="@style/TextStyle.VolteSemiBold12"
                         android:layout_width="wrap_content"
@@ -827,10 +838,32 @@
                         android:layout_marginLeft="@dimen/_6sdp"
                         android:layout_toEndOf="@+id/dot_layout"
                         android:layout_toRightOf="@+id/dot_layout"
-                        android:text="@string/terms_of_service_new"
+                        android:text="@string/terms_and_condition_title_text"
                         android:textColor="@color/black_opacity_60" />
 
-                </RelativeLayout>
+                    <ImageView
+                        android:layout_toEndOf="@+id/tv_term_and_condition"
+                        android:layout_toRightOf="@+id/tv_term_and_condition"
+                        android:id="@+id/dot_layout_2"
+                        android:layout_width="@dimen/_8sdp"
+                        android:layout_height="@dimen/_8sdp"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginTop="@dimen/_4sdp"
+                        android:src="@drawable/blue_dot" />
+
+                    <TextView
+                        android:id="@+id/tv_fraud_guarantee"
+                        style="@style/TextStyle.VolteSemiBold12"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="@dimen/_6sdp"
+                        android:layout_marginLeft="@dimen/_6sdp"
+                        android:layout_toEndOf="@+id/dot_layout_2"
+                        android:layout_toRightOf="@+id/dot_layout_2"
+                        android:text="@string/fraud_guarantee_policy_text"
+                        android:textColor="@color/black_opacity_60" />
+
+                </LinearLayout>
                 <!-- Privacy Policy Layout Start -->
 
             </LinearLayout>