diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index cf17dbf3..f2f76842 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -24,7 +24,7 @@
                                             <option name="values">
                                               <map>
                                                 <entry key="color" value="000000" />
-                                                <entry key="imagePath" value="/private/var/folders/k5/znryrgx56hv6cn9d7mdt2j280000gn/T/ic_android_black_24dp.xml" />
+                                                <entry key="imagePath" value="/private/var/folders/fq/rmfd4q755dnb8bpn1nvtgstm0000gn/T/ic_android_black_24dp.xml" />
                                               </map>
                                             </option>
                                           </PersistentState>
@@ -73,7 +73,7 @@
                                           <PersistentState>
                                             <option name="values">
                                               <map>
-                                                <entry key="imagePath" value="/private/var/folders/k5/znryrgx56hv6cn9d7mdt2j280000gn/T/ic_android_black_24dp.xml" />
+                                                <entry key="imagePath" value="/private/var/folders/fq/rmfd4q755dnb8bpn1nvtgstm0000gn/T/ic_android_black_24dp.xml" />
                                               </map>
                                             </option>
                                           </PersistentState>
@@ -85,7 +85,7 @@
                                             <option name="values">
                                               <map>
                                                 <entry key="color" value="000000" />
-                                                <entry key="imagePath" value="$USER_HOME$/Desktop/jme.png" />
+                                                <entry key="imagePath" value="$USER_HOME$/Downloads/image_2023_12_06T14_30_18_570Z.png" />
                                                 <entry key="scalingPercent" value="68" />
                                               </map>
                                             </option>
@@ -130,7 +130,7 @@
                                             <option name="values">
                                               <map>
                                                 <entry key="color" value="000000" />
-                                                <entry key="imagePath" value="/private/var/folders/k5/znryrgx56hv6cn9d7mdt2j280000gn/T/ic_android_black_24dp.xml" />
+                                                <entry key="imagePath" value="/private/var/folders/fq/rmfd4q755dnb8bpn1nvtgstm0000gn/T/ic_android_black_24dp.xml" />
                                               </map>
                                             </option>
                                           </PersistentState>
@@ -174,7 +174,7 @@
                                             <option name="values">
                                               <map>
                                                 <entry key="color" value="000000" />
-                                                <entry key="imagePath" value="/private/var/folders/k5/znryrgx56hv6cn9d7mdt2j280000gn/T/ic_android_black_24dp.xml" />
+                                                <entry key="imagePath" value="/private/var/folders/fq/rmfd4q755dnb8bpn1nvtgstm0000gn/T/ic_android_black_24dp.xml" />
                                               </map>
                                             </option>
                                           </PersistentState>
@@ -238,7 +238,7 @@
                                           <PersistentState>
                                             <option name="values">
                                               <map>
-                                                <entry key="imagePath" value="/private/var/folders/k5/znryrgx56hv6cn9d7mdt2j280000gn/T/ic_android_black_24dp.xml" />
+                                                <entry key="imagePath" value="/private/var/folders/fq/rmfd4q755dnb8bpn1nvtgstm0000gn/T/ic_android_black_24dp.xml" />
                                               </map>
                                             </option>
                                           </PersistentState>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 83479e52..ce511957 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,10 +4,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -16,6 +14,7 @@
             <option value="$PROJECT_DIR$/httpclient-release" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 4a03dfa4..f8599b83 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -127,8 +127,8 @@ android {
             signingConfig signingConfigs.debug
             // buildConfigField 'String', 'BASE_URL', '"http://202.166.220.36:8083/api/"'
             //buildConfigField 'String', 'BASE_URL', '"https://sandboxapi.japanremit.com:8083/api/"'
-            //buildConfigField 'String', 'BASE_URL', '"http://77.68.15.91:1082/api/"'
-            buildConfigField 'String', 'BASE_URL', '"https://mobile.imelondon.co.uk:2086/api/"'
+            buildConfigField 'String', 'BASE_URL', '"http://77.68.15.91:1082/api/"'
+            //buildConfigField 'String', 'BASE_URL', '"https://mobile.imelondon.co.uk:2086/api/"'
             buildConfigField 'String', 'API_VERSION', '"v1"'
             buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"'
             buildConfigField 'String', 'GME_TOKEN', '"39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru"'
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
index ce95739a..59a5d4ab 100644
Binary files a/app/src/main/ic_launcher-playstore.png and b/app/src/main/ic_launcher-playstore.png differ
diff --git a/app/src/main/java/com/remit/jmecustomer/features/appupdate/AppUpdateActivity.java b/app/src/main/java/com/remit/jmecustomer/features/appupdate/AppUpdateActivity.java
index c0097210..ecda5ac6 100644
--- a/app/src/main/java/com/remit/jmecustomer/features/appupdate/AppUpdateActivity.java
+++ b/app/src/main/java/com/remit/jmecustomer/features/appupdate/AppUpdateActivity.java
@@ -119,7 +119,7 @@ public class AppUpdateActivity extends AppCompatActivity  {
         for (ResolveInfo otherApp : otherApps) {
             // look for Google Play application
             if (otherApp.activityInfo.applicationInfo.packageName
-                    .contains("com.remit.jmecustomer")) {
+                    .contains("com.inficare.iremit.imelondon")) {
 
                 ActivityInfo otherAppActivity = otherApp.activityInfo;
                 ComponentName componentName = new ComponentName(
diff --git a/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt b/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt
index 6c42e299..3f5ec38f 100644
--- a/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt
+++ b/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt
@@ -329,6 +329,9 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
                 Constants.ENTERED_SENDING_AMOUNT = Utils.removeCommaFromAmount(
                     sendMoneyEditText?.text.toString().trim()
                 )
+                Constants.ENTERED_RECEIVING_AMOUNT = Utils.removeCommaFromAmount(
+                    recieveMoneyEditText?.text.toString().trim()
+                )
             }
 
             R.id.countrySelectionSpinner, R.id.recepientCurrencyTextView, R.id.iv_currency_2, R.id.cl_country -> showCountryListinDialog()
@@ -571,6 +574,7 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
                     // Toast.makeText(getContext(), "unfocus", Toast.LENGTH_SHORT).show();
                     presenter.setCalcByPayoutAmount(false)
                     presenter.calcExrate()
+                    Constants.SHOW_CALCULATED_BY_RECIPIENT = false
                 }
             }
 
@@ -580,6 +584,7 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
                     // Toast.makeText(getContext(), "unfocus", Toast.LENGTH_SHORT).show();
                     presenter.setCalcByPayoutAmount(true)
                     presenter.calcExrate()
+                    Constants.SHOW_CALCULATED_BY_RECIPIENT = true
                 }
             }
     }
diff --git a/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java
index 0e09fb40..0b2c6ddb 100644
--- a/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java
+++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java
@@ -179,7 +179,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements Payme
         this.recepientAmountTextWatcher = new RecipientAmountTextWatcher();
         interpolator = new AccelerateDecelerateInterpolator();
         setupRecyclerView();
-        registerTextWatchers(true);
+        //registerTextWatchers(true);
         viewmodel.fetchRewardsLiveData();
         viewmodel.subscribeToRewardsPoint().observe(getViewLifecycleOwner(), this::updateRewardDetails);
     }
@@ -192,6 +192,8 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements Payme
 //
 //        } else {
         sendMoneyEditText.setText(Constants.ENTERED_SENDING_AMOUNT);
+        shouldCaulatedByRecipient = Constants.SHOW_CALCULATED_BY_RECIPIENT;
+        recieveMoneyEditText.setText(Constants.ENTERED_RECEIVING_AMOUNT);
 //        }
 
         getForex();
@@ -289,6 +291,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements Payme
                 updateButtonToCalculate(true);
             }
             setDefaultAmount();
+            registerTextWatchers(true);
         });
 
         viewmodel.subscribeToExRateData().observe(getViewLifecycleOwner(), data -> {
diff --git a/app/src/main/java/com/remit/jmecustomer/utils/Constants.java b/app/src/main/java/com/remit/jmecustomer/utils/Constants.java
index 6134ac9c..7f1fba35 100644
--- a/app/src/main/java/com/remit/jmecustomer/utils/Constants.java
+++ b/app/src/main/java/com/remit/jmecustomer/utils/Constants.java
@@ -138,6 +138,8 @@ public class Constants {
     public static String CURRENT_COUNTRY_ID = "151";
 
     public static String ENTERED_SENDING_AMOUNT = "";
+    public static String ENTERED_RECEIVING_AMOUNT = "";
+    public static boolean SHOW_CALCULATED_BY_RECIPIENT = false;
 
     public static int UPDATE_DELETE_CODE = 2008;
 }
diff --git a/app/src/main/res/layout/activity_app_update.xml b/app/src/main/res/layout/activity_app_update.xml
index d81995cf..ae46930d 100644
--- a/app/src/main/res/layout/activity_app_update.xml
+++ b/app/src/main/res/layout/activity_app_update.xml
@@ -12,7 +12,7 @@
         android:layout_height="100dp"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
-        android:src="@drawable/ic_logo_white_large"
+        android:src="@drawable/ic_logo_london"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index e3a732a4..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 00000000..bda06c5c
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index 26d4faa1..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
new file mode 100644
index 00000000..fe2ad3f8
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 1ca7efcc..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..794c0ffd
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-ldpi/ic_launcher.png b/app/src/main/res/mipmap-ldpi/ic_launcher.png
deleted file mode 100644
index 78ad46cc..00000000
Binary files a/app/src/main/res/mipmap-ldpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 2336dddd..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 00000000..a26b28d9
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index 750bf9dc..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
new file mode 100644
index 00000000..eab76584
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index b89e2c6c..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..09d50f2a
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index d444a72b..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 00000000..f85a8b72
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 98660fdb..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
new file mode 100644
index 00000000..bf948003
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index b3f477de..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..89c3da98
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 9fe4feaa..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 00000000..bf840b11
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 1e29490a..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
new file mode 100644
index 00000000..feca3298
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index f1ac3764..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..f2bbc21f
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 4caa71c4..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 00000000..3ee667ab
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index a0cceea9..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
new file mode 100644
index 00000000..324c5e4c
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index e5e0735d..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..5f7752cf
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ