Rebranding started

app/src/main/java/com/swifttech/remit/android/features/domesticremit/receipt/presenter/DomesticRemitReceiptPresenterImpl.java

@@ -55,12 +55,12 @@ public class DomesticRemitReceiptPresenterImpl extends BasePresenter implements
     {
         DomesticRemitReceiptActivity.TxnReceiptViewModel txnReceiptViewModel=new DomesticRemitReceiptActivity.TxnReceiptViewModel();
         txnReceiptViewModel.setMobileNo(domesticRemitTxnReceiptDTO.getRContactNo());
-        txnReceiptViewModel.setpAmount(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getPayOutAmount())+" "+Constants.KRW_STRING);
+        txnReceiptViewModel.setpAmount(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getPayOutAmount())+" "+Constants.MNT_STRING);
         txnReceiptViewModel.setRecieverName(domesticRemitTxnReceiptDTO.getRFirstName());
-        txnReceiptViewModel.setServiceFee(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getServiceCharge())+" "+Constants.KRW_STRING);
+        txnReceiptViewModel.setServiceFee(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getServiceCharge())+" "+Constants.MNT_STRING);
         txnReceiptViewModel.setTxnDate(domesticRemitTxnReceiptDTO.getTrnsDate());
         txnReceiptViewModel.setTxnNo("GME Control No. " +domesticRemitTxnReceiptDTO.getTrnId());
-        txnReceiptViewModel.setTotalSendAmount(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getCollAmount())+" "+Constants.KRW_STRING);
+        txnReceiptViewModel.setTotalSendAmount(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getCollAmount())+" "+Constants.MNT_STRING);
         txnReceiptViewModel.setBank(domesticRemitTxnReceiptDTO.getPAgentBank());
         txnReceiptViewModel.setAccNo(domesticRemitTxnReceiptDTO.getAccountNo());
 

app/src/main/java/com/swifttech/remit/android/features/domesticremit/send/presenter/DomesticRemitPresenterImpl.java

@@ -347,7 +347,7 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti
                 else
                     serviceChargeOnBasisOnType = serviceChargeWallet;
 
-                String messageServiceCharge = getStringfromStringId(R.string.transfer_charge_text) + ": " + Utils.formatCurrencyWithoutTruncatingDecimal(serviceChargeOnBasisOnType) + " " + Constants.KRW_STRING;
+                String messageServiceCharge = getStringfromStringId(R.string.transfer_charge_text) + ": " + Utils.formatCurrencyWithoutTruncatingDecimal(serviceChargeOnBasisOnType) + " " + Constants.MNT_STRING;
                 view.updateServiceCharge(messageServiceCharge);
 
                 if (sendAmount != null && sendAmount.length() > 0)
@@ -666,7 +666,7 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti
 
                 domesticRemitDataValidator.setCurrentBalance(balance);
 
-                view.showCurrentBalance(getStringfromStringId(R.string.available_balance_text) + ": " + Utils.formatCurrencyWithoutTruncatingDecimal(balance) + " " + Constants.KRW_STRING);
+                view.showCurrentBalance(getStringfromStringId(R.string.available_balance_text) + ": " + Utils.formatCurrencyWithoutTruncatingDecimal(balance) + " " + Constants.MNT_STRING);
                 view.showCheckBalanceButton(false);
 
                 domesticRemitDataValidator.validateCurrentBalanceWithSendingAmount();

app/src/main/java/com/swifttech/remit/android/features/homeV2/presenter/HomeV2Presenter.java

@@ -231,7 +231,6 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
 
             String autoDebitBody = autoDebitBodyMasked.replaceAll("xx", dateDifference + "");
 
-            boolean shouldShowAutoDebitNotice = !shouldNotPromptAutoDebitAccountRenew && dateDifference <= AUTO_DEBIT_RENEWAL_TIME_LIMIT_IN_DAYS;
 
             boolean shouldShowKJBankNotice = checkIfShouldShowKJNotice();
 
@@ -243,7 +242,7 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
 
 
             homeRelatedMutableLiveData.setValue(new HomeViewRelatedDTOV2(fullName, userInfoModelV2.getAvailableBalance(), userInfoModelV2.getYearlyLimit(),
-                    userInfoModelV2.getRewardPoint(), shouldShowAutoDebitNotice, autoDebitTitle, autoDebitBody, shouldShowKJBankNotice,
+                    userInfoModelV2.getRewardPoint(), false, autoDebitTitle, autoDebitBody, shouldShowKJBankNotice,
                     userInfoModelV2.getPrimaryBankName(), userInfoModelV2.getWalletNumber(),
                     notificationViewDTO, shouldShowTermsAndCondition));
 

app/src/main/java/com/swifttech/remit/android/features/homeV2/view/HomeFragmentV2.java

@@ -177,9 +177,9 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
             waveProgressBarView.stopAnimation();
             updateInfo(homeViewRelatedDTOV2.getUserName(), homeViewRelatedDTOV2.getAvailableBalance(), homeViewRelatedDTOV2.getYearlyLimit(), homeViewRelatedDTOV2.getRewardPoint());
             setWalletNo(homeViewRelatedDTOV2.getWalletNo(), homeViewRelatedDTOV2.getBankName());
-            showAutoDebitNoticeViewIfRequiredInPopup(homeViewRelatedDTOV2.shouldShowAutoDebitNotice(), homeViewRelatedDTOV2.getAutoDebitNoticeTitle(), homeViewRelatedDTOV2.getAutoDebitNoticeBody(), () -> {
             showNotificationView(homeViewRelatedDTOV2.getHomeNotificationViewDTO());
-            });
+
+
 
             if (homeViewRelatedDTOV2.shouldShowTermsAndCondition())
                 TermsAndConditionAcitivity.startTermsAndCondition(getActivity());
@@ -350,57 +350,6 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
         }, 500);
     }
 
-    private void showKJBankNoticeIfRequired(boolean shouldShowAutoDebitNotice) {
-        if (shouldShowAutoDebitNotice) {
-            KJNoticeDialog kjNoticeDialog = new KJNoticeDialog();
-            kjNoticeDialog.setCancellable(false);
-            kjNoticeDialog.setListener(new KJNoticeDialog.KJNoticeDialogListener() {
-                @Override
-                public void onNegativeBtnPressed() {
-                    kjNoticeDialog.dismiss();
-                    ((HomeParentViewContractV2) getActivity()).getPresenter().skipKJBankNoticeForToday();
-                }
-
-                @Override
-                public void onPositiveBtnPressed() {
-                    kjNoticeDialog.dismiss();
-                }
-            });
-            if (!kjNoticeDialog.isAdded())
-                kjNoticeDialog.show(getActivity().getSupportFragmentManager(), "KJNotice");
-        }
-
-    }
-
-    private void showAutoDebitNoticeViewIfRequiredInPopup(boolean shouldShowAutoDebitNotice, String autoDebitNoticeTitle, String autoDebitNoticeBody, Runnable task) {
-        if (shouldShowAutoDebitNotice) {
-            GenericPromptDialog autoDebitRenewalPromptDialog = new GenericPromptDialog();
-            autoDebitRenewalPromptDialog.setBodyMessage(autoDebitNoticeBody);
-            autoDebitRenewalPromptDialog.setCancellable(false);
-            autoDebitRenewalPromptDialog.setIconsRes(R.drawable.ic_auto_debit_renew);
-            autoDebitRenewalPromptDialog.setPositiveBtnString(getString(R.string.renewal_text));
-            autoDebitRenewalPromptDialog.setNegativeBtnString(getString(R.string.later_text));
-            autoDebitRenewalPromptDialog.setTitleMessage(autoDebitNoticeTitle);
-            autoDebitRenewalPromptDialog.setListener(new GenericPromptDialog.GenericDialogPromptListener() {
-                @Override
-                public void onNegativeBtnPressed() {
-                    ((HomeParentViewContractV2) getActivity()).getPresenter().donotPromptAutoDebitRenewalForThisSession();
-                    if (task != null)
-                        new Handler().postDelayed(task, 200);
-                }
 
-                @Override
-                public void onPositiveBtnPressed() {
-                    ((HomeParentViewContractV2) getActivity()).getPresenter().donotPromptAutoDebitRenewalForThisSession();
-                    ((HomeParentViewContractV2) getActivity()).showAutoDebitListingView();
 
 }
-            });
-            if (!autoDebitRenewalPromptDialog.isAdded())
-                autoDebitRenewalPromptDialog.show(getActivity().getSupportFragmentManager(), "AUTODEBITRENEWAL");
-
-        } else if (task != null) {
-            task.run();
-        }
-    }
-}

app/src/main/java/com/swifttech/remit/android/features/inboundreceipt/presenter/InboundRemitReceiptPresenterImpl.java

@@ -55,12 +55,12 @@ public class InboundRemitReceiptPresenterImpl extends BasePresenter implements I
     {
         InboundRemitReceiptActivity.TxnReceiptViewModel txnReceiptViewModel=new InboundRemitReceiptActivity.TxnReceiptViewModel();
         txnReceiptViewModel.setMobileNo(domesticRemitTxnReceiptDTO.getMobileNo());
-        txnReceiptViewModel.setpAmount(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getReceivedAmount())+" "+Constants.KRW_STRING);
+        txnReceiptViewModel.setpAmount(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getReceivedAmount())+" "+Constants.MNT_STRING);
         txnReceiptViewModel.setSenderName(domesticRemitTxnReceiptDTO.getSenderName());
-        txnReceiptViewModel.setServiceFee(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getServiceFee())+" "+Constants.KRW_STRING);
+        txnReceiptViewModel.setServiceFee(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getServiceFee())+" "+Constants.MNT_STRING);
         txnReceiptViewModel.setTxnDate(domesticRemitTxnReceiptDTO.getTranDate());
         txnReceiptViewModel.setTxnNo(domesticRemitTxnReceiptDTO.getControlNo());
-        txnReceiptViewModel.setTotalSendAmount(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getReceivedAmount())+" "+Constants.KRW_STRING);
+        txnReceiptViewModel.setTotalSendAmount(Utils.formatCurrency(domesticRemitTxnReceiptDTO.getReceivedAmount())+" "+Constants.MNT_STRING);
         txnReceiptViewModel.setBank(domesticRemitTxnReceiptDTO.getBank());
         txnReceiptViewModel.setAccNo(domesticRemitTxnReceiptDTO.getAccountNo());
         txnReceiptViewModel.setSendingCountryCode(domesticRemitTxnReceiptDTO.getSendingCountryCode());

app/src/main/java/com/swifttech/remit/android/features/local/adapter/history/LocalTopUpHistoryAdapter.java

@@ -38,7 +38,7 @@ public class LocalTopUpHistoryAdapter extends RecyclerView.Adapter<LocalTopHisto
         holder.dateTxt.setText(localTopUpHistoryDTO.getRequestTime());
         holder.controlNo.setText(localTopUpHistoryDTO.getControllNo());
         holder.mobile.setText(localTopUpHistoryDTO.getPhoneNo());
-        holder.amount.setText(Constants.KOREAN_WON + " " + Utils.formatCurrencyWithoutTruncatingDecimal(localTopUpHistoryDTO.getProductPrice()));
+        holder.amount.setText(Constants.MONGOLIA_CURRENCY + " " + Utils.formatCurrencyWithoutTruncatingDecimal(localTopUpHistoryDTO.getProductPrice()));
 
         String orderStatus = localTopUpHistoryDTO.getStatus();
         if (orderStatus == null || orderStatus.length() < 1)

app/src/main/java/com/swifttech/remit/android/features/local/presenter/topup/LocalTopUpPresenter.java

@@ -565,7 +565,7 @@ public class LocalTopUpPresenter extends BasePresenter implements LocalTopUpPres
             this.selectedCarrierPlan = selectedCarrierPlan;
             if (selectedCarrierPlan != null && selectedCarrierPlan.getFacePrice() != null) {
                 //Show plan detail if any.
-                LocalTopUpDetailDTO localTopUpDetailDTO = new LocalTopUpDetailDTO(userMsisdn, selectedCarrierPlan.getCardName(), null, null, null, Constants.KOREAN_WON + " " + Utils.formatCurrencyWithoutTruncatingDecimal(selectedCarrierPlan.getFacePrice()));
+                LocalTopUpDetailDTO localTopUpDetailDTO = new LocalTopUpDetailDTO(userMsisdn, selectedCarrierPlan.getCardName(), null, null, null, Constants.MONGOLIA_CURRENCY + " " + Utils.formatCurrencyWithoutTruncatingDecimal(selectedCarrierPlan.getFacePrice()));
                 if (selectedCarrierPlan.getPlanInfo() != null) {
                     localTopUpDetailDTO.setData(selectedCarrierPlan.getPlanInfo().getData());
                     localTopUpDetailDTO.setVoice(selectedCarrierPlan.getPlanInfo().getVoice());
@@ -770,7 +770,7 @@ public class LocalTopUpPresenter extends BasePresenter implements LocalTopUpPres
 
     private void updateBalance(String balanceAmt) {
         userCurrentBalance = balanceAmt;
-        selectedPaymentSourceBalanceLiveData.setValue(getStringfromStringId(R.string.available_balance_text) + ": " + Utils.formatCurrencyWithoutTruncatingDecimal(userCurrentBalance) + " " + Constants.KRW_STRING);
+        selectedPaymentSourceBalanceLiveData.setValue(getStringfromStringId(R.string.available_balance_text) + ": " + Utils.formatCurrencyWithoutTruncatingDecimal(userCurrentBalance) + " " + Constants.MNT_STRING);
     }
 
 
@@ -785,7 +785,7 @@ public class LocalTopUpPresenter extends BasePresenter implements LocalTopUpPres
             PaymentConfirmationDTO paymentConfirmationDTO = new PaymentConfirmationDTO();
             paymentConfirmationDTO.paymentSource = paymentSource;
             if (accountBalance != null) {
-                paymentConfirmationDTO.accountBalance = Constants.KOREAN_WON + " " + Utils.formatCurrencyWithoutTruncatingDecimal(accountBalance);
+                paymentConfirmationDTO.accountBalance = Constants.MONGOLIA_CURRENCY + " " + Utils.formatCurrencyWithoutTruncatingDecimal(accountBalance);
                 double productAmountDouble;
                 double walletAmountDouble;
                 try {
@@ -799,14 +799,14 @@ public class LocalTopUpPresenter extends BasePresenter implements LocalTopUpPres
 
                 double deductedAmountDouble = walletAmountDouble - productAmountDouble;
 
-                paymentConfirmationDTO.deductedWalletAmount = Constants.KOREAN_WON + " " + Utils.formatCurrencyWithoutTruncatingDecimal(new BigDecimal(deductedAmountDouble).stripTrailingZeros().toPlainString());
+                paymentConfirmationDTO.deductedWalletAmount = Constants.MONGOLIA_CURRENCY + " " + Utils.formatCurrencyWithoutTruncatingDecimal(new BigDecimal(deductedAmountDouble).stripTrailingZeros().toPlainString());
 
             } else {
                 paymentConfirmationDTO.accountBalance = null;
                 paymentConfirmationDTO.deductedWalletAmount = null;
             }
 
-            paymentConfirmationDTO.productAmount = "- " + Constants.KOREAN_WON + " " + Utils.formatCurrencyWithoutTruncatingDecimal(productAmount);
+            paymentConfirmationDTO.productAmount = "- " + Constants.MONGOLIA_CURRENCY + " " + Utils.formatCurrencyWithoutTruncatingDecimal(productAmount);
 
 
             return paymentConfirmationDTO;

app/src/main/java/com/swifttech/remit/android/features/local/view/topup/services/regular/DenoListRvAdapter.java

@@ -59,7 +59,7 @@ public class DenoListRvAdapter extends RecyclerView.Adapter<DenoListVH> {
             denoListVH.denoTxtView.setBackgroundResource(R.drawable.deno_unselected_bg);
         }
 
-        denoListVH.denoTxtView.setText(Constants.KOREAN_WON +" "+ Utils.formatCurrencyWithoutTruncatingDecimal(selectedData.getPrice()));
+        denoListVH.denoTxtView.setText(Constants.MONGOLIA_CURRENCY +" "+ Utils.formatCurrencyWithoutTruncatingDecimal(selectedData.getPrice()));
     }
 
     @Override

app/src/main/java/com/swifttech/remit/android/features/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java

@@ -211,9 +211,8 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
         String name=recieptData.getRFirstName() + " " + middlName + recieptData.getRLastName();
         receiverNameTextView.setText(String.format("%s : %s", getString(R.string.to_text), name));
 
-        //        receiverNameTextView.setText(recieptData.getRFirstName());
         payoutAmountTextView.setText(recieptData.getPAmount());
-        gmeControlNumberTextView.setText(String.format("GME Control No. %s", recieptData.getControlNo()));
+        gmeControlNumberTextView.setText(String.format("Fast Remit Control No. %s", recieptData.getControlNo()));
         transactionDateTextView.setText(recieptData.getTrnDate());
         receiverTextView.setText(name);
         addressTextView.setText(recieptData.getRAddress());

app/src/main/java/com/swifttech/remit/android/features/transactionhistoryV2/view/international/adapter/InternationalInboundTransactionHistoryRVAdapter.java

@@ -35,7 +35,7 @@ public class InternationalInboundTransactionHistoryRVAdapter extends RecyclerVie
     @Override
     public void onBindViewHolder(@NonNull TransactionItemViewHolder holder, int position) {
         InternationalInboundTransactionHistoryItemModel transactionItem = transactionHistoryItemModels.get(holder.getAdapterPosition());
-        holder.setAmount(Utils.formatCurrency(transactionItem.getReceivedAmount()) + " " + Constants.KRW_STRING);
+        holder.setAmount(Utils.formatCurrency(transactionItem.getReceivedAmount()) + " " + Constants.MNT_STRING);
         holder.setDate(transactionItem.getTranDate());
         holder.setPaymentMode(transactionItem.getBank().toUpperCase());
 

app/src/main/java/com/swifttech/remit/android/features/user_profile/view/ProfileActivity.java

@@ -56,8 +56,7 @@ public class ProfileActivity extends AppCompatActivity implements UserProfileCon
     CircleImageView profileImage;
     @BindView(R.id.text_profile_image)
     ImageView textProfileImage;
-    @BindView(R.id.iv_edit_profile)
-    ImageView ivEditProfile;
+
     @BindView(R.id.tv_user_name)
     GmeTextView tvUserName;
     @BindView(R.id.tv_phone_number)
@@ -100,7 +99,7 @@ public class ProfileActivity extends AppCompatActivity implements UserProfileCon
         showWithdrawView(myPreferences.getBoolean(PrefKeys.USER_KYC_VERIFIED,false)&&myPreferences.getString(PrefKeys.USER_PENNY_TEST_STATUS,"").equalsIgnoreCase("2"));
     }
 
-    @OnClick({R.id.iv_back, R.id.iv_uploadImage, R.id.iv_edit_profile, R.id.tv_withdraw,R.id.txtEditProfile})
+    @OnClick({R.id.iv_back, R.id.iv_uploadImage, R.id.iv_edit_profile, R.id.tv_withdraw})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.iv_back:
@@ -130,9 +129,7 @@ public class ProfileActivity extends AppCompatActivity implements UserProfileCon
                 startActivityForResult(new Intent(ProfileActivity.this, WithdrawV2Activity.class),WITHDRAW_REQUEST_CODE);
                 break;
 
-            case R.id.txtEditProfile:
-                startActivity(new Intent(ProfileActivity.this, ProfileInfoListingActivity.class));
-                break;
+
         }
     }
 

app/src/main/java/com/swifttech/remit/android/utils/Constants.java

@@ -29,19 +29,18 @@ public class Constants {
     public static final String GET_ALL_SOURCE_OF_FUND = "GET_ALL_SOURCE_OF_FUND";
     public static final String KYC_SOURCE_OF_FUND = "KYC_SOURCE_OF_FUND";
 
-    public static final String REWARD_HOME = "REWARD_HOME";
-    public static final String REWARD_SHIPPING = "REWARD_SHIPPING";
 
 
-    public static final String DEFAULT_EXCHANGE_SEND_AMOUNT = "1000000";
+
+    public static final String DEFAULT_EXCHANGE_SEND_AMOUNT = "100000";
     public static final String CALC_BY_RECIPEINT = "p";
     public static final String CALC_BY_SENDER = "c";
     public static final String SUCCESS_CODE_V2 = "0";
     public static final String TRUE_STRING = "True";
-    public static final String KRW_STRING = "KRW";
+    public static final String MNT_STRING = "MNT";
 
 
-    public static String KOREAN_WON="￦";
+    public static String MONGOLIA_CURRENCY ="MNT";
 
 
 }

app/src/main/java/com/swifttech/remit/android/utils/https/GenericApiObserverResponse.java

@@ -1,7 +1,6 @@
 package com.swifttech.remit.android.utils.https;
 
 
-
 import java.io.IOException;
 import java.net.SocketTimeoutException;
 
@@ -10,6 +9,7 @@ import retrofit2.HttpException;
 
 /**
  * Discontinued, Start using GenericApiObserverResponseV2
+ *
  * @param <T>
  */
 public abstract class GenericApiObserverResponse<T> extends DisposableObserver<T> {
@@ -32,15 +32,15 @@ public abstract class GenericApiObserverResponse<T> extends DisposableObserver<T
     public void onError(Throwable e) {
         e.printStackTrace();
         if (e instanceof HttpException) {
-//            if (((HttpException) e).code() == 401)
-//                unauthorizedAccess(HTTPConstants.getErrorMessageFromCode(((HttpException) e).code()));
-//            else
+            if (((HttpException) e).code() == 401)
+                unauthorizedAccess(HTTPConstants.getErrorMessageFromCode(((HttpException) e).code()));
+            else
 //                onFailed(HTTPConstants.getErrorMessageFromCode(((HttpException) e).code()));
+            {
                 HttpException exception = (HttpException) e;
                 String message = exception.code() + " " + ((HttpException) e).response().raw().request().url().url().toString();
-
-
                 onFailed(message);
+            }
         } else if (e instanceof SocketTimeoutException) {
 
 //            onFailed(HTTPConstants.HTTP_RESPONSE_NO_INTERNET);

app/src/main/java/com/swifttech/remit/android/utils/https/GenericApiObserverResponseV2.java

@@ -62,13 +62,15 @@ public abstract class GenericApiObserverResponseV2<T> extends DisposableObserver
     @Override
     public void onError(Throwable e) {
         if (e instanceof HttpException) {
-//            if (((HttpException) e).code() == 401)
-//                unauthorizedAccess(HTTPConstants.getErrorMessageFromCode(((HttpException) e).code()));
-//            else
+            if (((HttpException) e).code() == 401)
+                unauthorizedAccess(HTTPConstants.getErrorMessageFromCode(((HttpException) e).code()));
+            else
 //                onFailed(HTTPConstants.getErrorMessageFromCode(((HttpException) e).code()));
+            {
                 HttpException exception = (HttpException) e;
                 String message = exception.code() + " " + ((HttpException) e).response().raw().request().url().url().toString();
                 onFailed(message);
+            }
         } else if (e instanceof SocketTimeoutException) {
 //            onFailed(HTTPConstants.HTTP_RESPONSE_NO_INTERNET);
             onFailed(e.getMessage());

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

@@ -94,21 +94,7 @@
                 <!--android:padding="12dp"-->
                 <!--android:src="@drawable/ic_change_password"/>-->
 
-                <com.swifttech.remit.android.common.customwidgets.GmeTextView
-                    android:id="@+id/txtEditProfile"
-                    android:padding="@dimen/_10sdp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/_9ssp"
-                    android:layout_marginEnd="@dimen/_8sdp"
-                    android:layout_marginTop="@dimen/_4sdp"
-                    android:text="@string/edit_text"
-                    android:gravity="center_vertical"
-                    android:textColor="@color/white"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentEnd="true"
-                    android:drawablePadding="@dimen/_5sdp"
-                    app:drawableStartCompat="@drawable/ic_edit_white"/>
+
 
             </RelativeLayout>
 
@@ -187,7 +173,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="9dp"
                     android:paddingLeft="4dp"
-                    android:text="@string/krw_text"
+                    android:text="@string/mnt_text"
                     android:textColor="@color/darkgray"
                     android:textSize="18sp"
                     app:layout_constraintStart_toEndOf="@+id/tv_wallet_no"

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

@@ -57,7 +57,7 @@
                     android:layout_marginTop="@dimen/_15sdp"
                     android:gravity="center_horizontal"
                     android:padding="2dp"
-                    android:text="Kwangju Bank (034)"
+                    android:text="Bank Account"
                     android:textSize="@dimen/_10ssp"
                     app:fontFamily="@string/bold"
                     app:layout_constraintEnd_toStartOf="@+id/verticalDivider"
@@ -102,10 +102,12 @@
                     android:text="@string/domestic_available_balance_text"
                     android:textSize="@dimen/_10ssp"
                     app:fontFamily="@string/bold"
+                    app:txtfontName="@string/bold"
+
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/verticalDivider"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:txtfontName="@string/bold" />
+                     />
 
                 <com.swifttech.remit.android.common.customwidgets.GmeTextView
                     android:id="@+id/tv_yearly_remaining"
@@ -117,13 +119,14 @@
                     android:text="@string/na_text"
                     android:textColor="@color/colorAccent"
                     android:textSize="@dimen/_15ssp"
+
                     app:layout_constraintBaseline_toBaselineOf="@+id/tv_wallet_no"
-                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.5"
                     app:layout_constraintHorizontal_chainStyle="packed"
-                    app:layout_constraintStart_toEndOf="@+id/tv_yearly_remaining_currency"
-
-                    app:layout_constraintTop_toBottomOf="@+id/tv_yearly_limit_label" />
+                    app:layout_constraintEnd_toStartOf="@+id/tv_yearly_remaining_currency"
+                    app:layout_constraintStart_toEndOf="@+id/verticalDivider"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_yearly_limit_label"
+                    />
 
                 <com.swifttech.remit.android.common.customwidgets.GmeTextView
                     android:id="@+id/tv_yearly_remaining_currency"
@@ -131,18 +134,21 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@id/tv_bank_name"
                     android:layout_centerHorizontal="true"
-                    android:paddingLeft="4dp"
-                    android:text="@string/korean_won_text"
+                    android:text="@string/mongolia_currency_text"
                     android:textColor="@color/darkgray"
                     android:textSize="@dimen/_15ssp"
                     android:visibility="visible"
+
                     app:layout_constraintBaseline_toBaselineOf="@+id/tv_yearly_remaining"
-                    app:layout_constraintEnd_toStartOf="@+id/tv_yearly_remaining"
-                    app:layout_constraintHorizontal_bias="0.5"
 
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/tv_yearly_remaining"
+
+
+                    app:layout_constraintHorizontal_bias="0.5"
                     app:layout_constraintHorizontal_chainStyle="packed"
 
-                    app:layout_constraintStart_toEndOf="@+id/verticalDivider" />
+                   />
 
 
                 <com.swifttech.remit.android.common.customwidgets.GmeTextView

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

@@ -53,8 +53,8 @@
     <string name="uzbek_language_text">O\'zbek</string>
     <string name="pakistan_language_text">پاکستان</string>
 
-    <string name="krw_text">KRW</string>
-    <string name="korean_won_text">￦</string>
+    <string name="mnt_text">MNT</string>
+    <string name="mongolia_currency_text">MNT</string>
     <string name="na_text">N/A</string>
     <string name="usd_text">USD</string>
     <string name="no_image_available_text">No image available</string>
@@ -69,7 +69,7 @@
     <string name="connect_local_community_text">Connect to local community</string>
     <string name="earn_reward_point_text">Earn reward points and get surprise gifts</string>
 
-    <string name="login_title_text">Welcome To Global Money Express</string>
+    <string name="login_title_text">Welcome To Fast Remit</string>
     <string name="login_subtitle_text">Login with your email city</string>
     <string name="login_user_id_text">User ID</string>
     <string name="user_Id_placeholder_text">Registered Email</string>
@@ -79,7 +79,7 @@
     <string name="login_register_here_text">Register Here</string>
     <string name="user_id_empty_error">User id cannot be empty</string>
 
-    <string name="register_title_text">Register to Global Money Express</string>
+    <string name="register_title_text">Register to Fast Remit</string>
     <string name="register_subtitle_text">Register with your email id</string>
     <string name="create_password_text">Create Password</string>
     <string name="confirm_password_text">Confirm Password</string>
@@ -118,9 +118,9 @@
     <string name="reward_point_text">Reward Point</string>
 
     <string name="available_balance_text">Your Available Balance</string>
-    <string name="gme_wallet_no_text">GME Wallet No.</string>
+    <string name="gme_wallet_no_text">Fast Remit Wallet No.</string>
     <string name="auto_debit_account_text">Auto Debit Account</string>
-    <string name="about_gme_text">About GME</string>
+    <string name="about_gme_text">About Fast Remit</string>
     <string name="settings_text">Settings</string>
     <string name="logout_text">Logout</string>
     <string name="logout_confirmation_title_text">Logout</string>
@@ -195,7 +195,7 @@
     <string name="service_charge_text">Service Charge</string>
     <string name="payout_agent_text">Payout Agent/Bank</string>
     <string name="i_have_read_to_text">I have read and agreed to</string>
-    <string name="gme_user_aggreement_text">1. GME Remittance User Agreement</string>
+    <string name="gme_user_aggreement_text">1. Fast Remit Remittance User Agreement</string>
     <string name="agree_and_send_text">Agree and Send</string>
     <string name="enter_login_password_text">Enter Your Login Password</string>
     <string name="enter_otp_password_text">Enter 4 Digit OTP Code</string>
@@ -216,8 +216,8 @@
     <string name="transfer_success_text">Transfer Successful</string>
     <string name="transfer_success_info_text">You have successfully transferred your money to </string>
     <string name="total_payout_amount_text">Total Payout Amount</string>
-    <string name="gme_control_no_text">GME Control No</string>
-    <string name="gme_control_security_text">Please keep this GME control no. very secure.</string>
+    <string name="gme_control_no_text">Fast Remit Control No</string>
+    <string name="gme_control_security_text">Please keep this Fast Remit control no. very secure.</string>
     <string name="share_party_text">Share with concerned party only</string>
     <string name="transaction_date_text">Transaction Date</string>
     <string name="receiver_text">Receiver</string>
@@ -429,11 +429,11 @@
 
     <string name="no_subject_error_text">Please write a subject</string>
     <string name="no_message_body_text">Please write a message body</string>
-    <string name="no_control_id_error_text">Gme Number not found</string>
+    <string name="no_control_id_error_text">Fast Remit Number not found</string>
     <string name="no_transaction_id_error_text">No transaction id found</string>
     <string name="subject_text">Subject</string>
     <string name="account_no_validation_error_text">Invalid account number (Only numbers and alphabets allowed)</string>
-    <string name="resend_search_hint_text">GME No / Receiver Name / Bank Name</string>
+    <string name="resend_search_hint_text">Fast Remit No / Receiver Name / Bank Name</string>
     <string name="resend_code_text">Try again in </string>
     <string name="referral_code_text">Referral Code (Optional)</string>
     <string name="fingerprint_auth_text">Fingerprint Authentication</string>
@@ -478,7 +478,7 @@
     <string name="reward_points_text">Reward Points</string>
     <string name="reward_note_text">Note: The reward points is valid for a year only.</string>
     <string name="select_branch_for_redeem_your_reward_text">Select branch to redeem your reward</string>
-    <string name="you_visit_nearest_gme_branch_to_redeem_text">You visit nearest GME branch to redeem you reward directly.</string>
+    <string name="you_visit_nearest_gme_branch_to_redeem_text">You visit nearest Fast Remit branch to redeem you reward directly.</string>
 
 
     <string name="bank_ac_text">Bank account number</string>
@@ -517,13 +517,13 @@
     <string name="retry_text">Retry</string>
     <string name="alien_no_error_text">Please provide your full Alien Registration Card number</string>
     <string name="national_no_error_text">Please provide your full National Id card number</string>
-    <string name="kyc_form_exit_confirmation_text">KYC information is required to use GME Services. Do you really want to exit?</string>
+    <string name="kyc_form_exit_confirmation_text">KYC information is required to use Fast Remit Services. Do you really want to exit?</string>
     <string name="token_renewal_confirm_text">Would you like to renew your token now? (It must be renewed once a year)</string>
     <string name="kftc_token_remind_message_text">Your auto debit token expires after xx days.</string>
     <string name="token_renewal_placeholder_text">Select Language for Token Renewal</string>
     <string name="later_text">Later</string>
     <string name="renewal_text">Renew</string>
-    <string name="userid_placeholder_text">Enter your ID for using GME</string>
+    <string name="userid_placeholder_text">Enter your ID for using Fast Remit</string>
     <string name="userid_error_text">ID must be in between 4 to 50 characters</string>
     <string name="live_chat_text">Live Chat</string>
     <string name="login_user_credential_title_text">User ID / Email / Mobile Number</string>
@@ -533,11 +533,11 @@
     <string name="kftc_token_title_message_text">Would you like to renew your token now?</string>
     <string name="userid_title_text">User ID</string>
     <string name="check_start_chat_title_text">Chat</string>
-    <string name="In_ChannelTalk_intro">Welcome to GME Remittance. 😄 How can I help you today?</string>
+    <string name="In_ChannelTalk_intro">Welcome to Fast Remit Remittance. 😄 How can I help you today?</string>
     <string name="placeholder_enter_city_text">Enter receiver\'s city</string>
     <string name="login_with_userId_text">Enter receiver\'s city</string>
     <string name="forgot_password_title_text">Need help with your password?</string>
-    <string name="forgot_password_subtitle_text">Reset your password using your User ID linked to your GME account</string>
+    <string name="forgot_password_subtitle_text">Reset your password using your User ID linked to your Fast Remit account</string>
 
     <!--Dynamic Reciever-->
     <string name="recipient_no_text">There are no recipients</string>
@@ -627,7 +627,7 @@
     <string name="no_native_country_found_text">No native country found</string>
 
 
-    <string name="autodebit_account_required_message">Please add your Auto Debit account to start using GME services.</string>
+    <string name="autodebit_account_required_message">Please add your Auto Debit account to start using Fast Remit services.</string>
 
 
     <!--Domestic Remit-->
@@ -669,7 +669,7 @@
     <string name="add_text">Add</string>
     <string name="inbound_text">Inbound</string>
     <string name="outbound_text">Outbound</string>
-    <string name="pennytest_information_text">We have sent 1 KRW to your Bank Account, Please check the statement and enter the 4 digit number display after GME.</string>
+    <string name="pennytest_information_text">We have sent 1 KRW to your Bank Account, Please check the statement and enter the 4 digit number display after Fast Remit.</string>
     <string name="resend_text">Resend</string>
     <string name="added_inbound_account_message_text">Added your inbound account</string>
     <string name="delete_account_text">Delete Account</string>
@@ -679,7 +679,7 @@
     <string name="inbound_receipt_text">Inbound Receipt</string>
     <string name="transfer_processing_text">Transfer Processing</string>
     <string name="transfer_canceled_text">Transfer Canceled</string>
-    <string name="you_have_to_register_text">You have to register account at GME</string>
+    <string name="you_have_to_register_text">You have to register account at Fast Remit</string>
     <string name="transaction_will_be_processed_text">Transaction will be process soon</string>
     <string name="link_korean_bank_account">Link your Mongolia Bank Account to receive money from abroad.</string>
     <string name="control_no_text">Control No.</string>
@@ -687,7 +687,7 @@
     <string name="received_amount_text">Received Amount</string>
     <string name="register_account_text">Register Account</string>
     <string name="local_top_up_text">Local Top up</string>
-    <string name="gme_wallet_text">GME Wallet</string>
+    <string name="gme_wallet_text">Fast Remit Wallet</string>
     <string name="regular_type_text">Regular</string>
     <string name="regular_type_information_text_1">\u2022 Confirm mobile phone number &amp; Recharge amount.</string>
     <string name="regular_type_information_text_2">\u2022 After completing recharge, refund is not available.</string>
@@ -708,8 +708,8 @@
     <string name="recharge_request_success_text">Recharge Request Success</string>
     <string name="waitinge_recent_request_text">You have a recent request for recharging. Wait for the results of this request.</string>
     <string name="recharge_payment_text">Recharge Payment</string>
-    <string name="expected_gme_wallet_balance_text">Expected GME Wallet Balance</string>
-    <string name="pay_using_gme_wallet_text">Pay Using GME Wallet</string>
+    <string name="expected_gme_wallet_balance_text">Expected Fast Remit Wallet Balance</string>
+    <string name="pay_using_gme_wallet_text">Pay Using Fast Remit Wallet</string>
     <string name="select_type_text">Select Type</string>
     <string name="select_plan_text">Select Plan</string>
     <string name="success_uppercase_text">SUCCESS</string>
@@ -721,7 +721,7 @@
     <!-- New REgistration -->
     <string name="terms_and_conditions_text">Terms And Conditions</string>
     <string name="terms_and_conditions_title_text">Please accept the terms and conditions.</string>
-    <string name="terms_and_conditions_content_text">In order to use GME\'s overseas remittances and domestic remittances smoothly, you need to agree to withdraw money from your account.  Withdrawal transfer will be made through open banking from the account you agreed to withdraw when using services such as overseas remittance and domestic remittance.</string>
+    <string name="terms_and_conditions_content_text">In order to use Fast Remit\'s overseas remittances and domestic remittances smoothly, you need to agree to withdraw money from your account.  Withdrawal transfer will be made through open banking from the account you agreed to withdraw when using services such as overseas remittance and domestic remittance.</string>
     <string name="personal_info_treatment_policy_text">Personal Information Treatment Policy</string>
     <string name="personal_info_usesage_text">Personal Information Collection and Usage Agreement</string>
     <string name="agreement_legal_text">Agreement of Legal Name Confirmation for Prohibiting Manipulation of the Law and Illegal Behavior</string>
@@ -757,7 +757,7 @@
     <string name="save_and_next_text">Save and Next</string>
     <string name="penny_test_code_error_text">Reference code must be of 4 digit</string>
     <string name="step2_content_text">Do you have a phone number registered with  Alien Registration Card under your name?</string>
-    <string name="registration_success_message_text">Thank you for registering for GME. We are verifying your information. Once approved, you will receive SMS.</string>
+    <string name="registration_success_message_text">Thank you for registering for Fast Remit. We are verifying your information. Once approved, you will receive SMS.</string>
     <string name="gps_off_text">GPS is not turned on</string>
     <string name="grant_permission_text">Please grant the required permissions.</string>
     <string name="location_not_available">Could not fetch location at the moment. Try again later.</string>