Flags added

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/exchangecountrylistingdialog/CountryFlagMapper.java

@@ -35,7 +35,27 @@ public class CountryFlagMapper {
             case "VN":
                 return R.drawable.flag_vietnam;
             case "RU":
-                return R.drawable.flag_vietnam;
+                return R.drawable.flag_russia;
+            case "AZ":
+                return R.drawable.flag_azerbaijan;
+            case "GE":
+                return R.drawable.flag_georgia;
+            case "KZ":
+                return R.drawable.flag_kazakhstan;
+            case "KG":
+                return R.drawable.flag_kyrgyzstan;
+            case "MD":
+                return R.drawable.flag_moldova;
+            case "TJ":
+                return R.drawable.flag_tajikistan;
+            case "TH":
+                return R.drawable.flag_thailand;
+            case "AE":
+                return R.drawable.flag_uae;
+            case "UZ":
+                return R.drawable.flag_uzbekistn;
+            case "BY":
+                return R.drawable.flag_belarus;
 
             default:
                 return -1;

app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/view/ExchangeMethodV2Activity.java

@@ -247,6 +247,14 @@ public class ExchangeMethodV2Activity extends BaseActivity implements PaymentMod
 
             //We are taking first item as default as we don't have any default item enlisted
             CountryPaymentService firstSelectedItem = countryPaymentServiceList.get(0);
+            for(CountryPaymentService item:countryPaymentServiceList)
+            {
+                if(item.getCountryCode().equalsIgnoreCase("NP")) {
+                    firstSelectedItem = item;
+                    break;
+                }
+            }
+
             showSelectedRecipient(firstSelectedItem.getCountryCode(), firstSelectedItem.getCurrency());
             showPaymentService(true, firstSelectedItem.getServiceAvailable());
             this.selectedCountryPaymentService = firstSelectedItem;

app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/gateway/SendMoneyTransactionCompleteV2Gateway.java

@@ -4,6 +4,7 @@ import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway;
 import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.SendMoneyTransactionCompleteModel;
 import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.SendMoneyTransactionCompleteV2ResponseBody;
 import com.gmeremit.online.gmeremittance_native.sendmoneyV2.presenter.SendMoneyTransactionCompleteV2InteractorInterface;
+import com.gmeremit.online.gmeremittance_native.utils.https.HttpClientV2;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
@@ -55,10 +56,10 @@ public class SendMoneyTransactionCompleteV2Gateway extends PrivilegedGateway imp
 
     @Override
     public Observable<SendMoneyTransactionCompleteV2ResponseBody> getReceiptData(String auth, String transactionId) {
-        SendMoneyTransactionCompleteV2ResponseBody mockedData;
-        Gson gson=new GsonBuilder().create();
-        mockedData=gson.fromJson(mockedReceiptData,SendMoneyTransactionCompleteV2ResponseBody.class);
+//        SendMoneyTransactionCompleteV2ResponseBody mockedData;
+//        Gson gson=new GsonBuilder().create();
+//        mockedData=gson.fromJson(mockedReceiptData,SendMoneyTransactionCompleteV2ResponseBody.class);
 
-        return Observable.just(mockedData);
+        return HttpClientV2.getInstance().getSendMoneyReceiptV2(auth,transactionId);
     }
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java

@@ -141,7 +141,7 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
     public void showReceiptData(SendMoneyTransactionCompleteModel recieptData) {
         receiverNameTextView.setText(recieptData.getRFirstName()+" "+recieptData.getRMiddleName()+" "+recieptData.getRLastName());
         payoutAmountTextView.setText(recieptData.getPAmount());
-        gmeControlNumberTextView.setText(recieptData.getControlNo());
+        gmeControlNumberTextView.setText("GME Control No. "+recieptData.getControlNo());
         transactionDateTextView.setText(recieptData.getTrnDate());
         transactionNumberTextView.setText(transactionId);
         receiverTextView.setText(recieptData.getRFirstName());
@@ -170,18 +170,15 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
                 break;
 
             case R.id.btn_submit:
-                onBackPressed();
+                Intent a = new Intent(this,HomeActivity.class);
+                a.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                startActivity(a);
+                finish();
                 break;
 
 
         }
     }
 
-    @Override
-    public void onBackPressed() {
-        Intent a = new Intent(this,HomeActivity.class);
-        a.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        startActivity(a);
-        finish();
-    }
+
 }

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

@@ -131,5 +131,6 @@ public class API_URL {
     public static final String SEND_MONEY_GET_BRANCHLIST_V2 = "mobile/sendmoney/load/branch/{countryCode}/{bankId}/";
     public static final String SEND_MONEY_AMOUNT_VALIDATION_V2 = "mobile/sendmoney/validation/account";
     public static final String SEND_MONEY_TRANSACTION_V2 = "mobile/sendmoney/dotransaction";
+    public static final String SEND_MONEY_GET_RECEIPT_V2 = "mobile/receipt/{tranId}";
 }
 

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

@@ -64,6 +64,7 @@ import com.gmeremit.online.gmeremittance_native.sendmoney.model.data.money_trans
 import com.gmeremit.online.gmeremittance_native.sendmoney.model.data.money_transfer_response.TransferResponseBank;
 import com.gmeremit.online.gmeremittance_native.sendmoney.model.data.money_transfer_response.TransferResponseCash;
 import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.SendMoneyAPIRequestBody;
+import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.SendMoneyTransactionCompleteV2ResponseBody;
 import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.SendMoneyTransactionResponseBody;
 import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.amountdetail.BranchListApiResponse;
 import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.AccountValidationApiResponse;
@@ -575,4 +576,8 @@ public interface ApiEndpoints {
     @Headers("Content-Type: application/json")
     Observable<SendMoneyTransactionResponseBody> performSendMoneyTransactionV2(@Header("Authorization") String token, @Body() SendMoneyAPIRequestBody requestBody);
 
+    @POST(API_URL.SEND_MONEY_GET_RECEIPT_V2)
+    @Headers("Content-Type: application/json")
+    Observable<SendMoneyTransactionCompleteV2ResponseBody> getSendMoneyReceiptV2(@Header("Authorization") String token, @Path("tranId") String tranId);
+
 }

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

@@ -120,7 +120,7 @@
                     android:layout_below="@id/payoutLayout"
                     android:layout_centerHorizontal="true"
                     android:padding="2dp"
-                    android:text="GME Control No. 12312345678"
+                    android:text=""
                     android:textColor="@color/white"
                     android:textSize="14sp"
                     app:txtfontName="@string/semibold" />