MOSIP-30791added new android and ios test cases and readme file (#1131)

* MOSIP-30791 Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in> * change in readme file Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in> --------- Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>
2026-01-10 05:58:01 -05:00 · 2024-01-02 18:33:34 +05:30
parent 49b6eb34bc
commit bb4f2c6527
61 changed files with 1558 additions and 527 deletions
--- a/injitest/README.md
+++ b/injitest/README.md
@@ -0,0 +1,28 @@
+# inji automation
+
+## Overview
+Automated scenario for ios & android covering positive and negative scenarios.
+
+## Setup
+###for appium setup follow `https://appium.io/docs/en/2.2/quickstart/install/`
+
+
+## Build
+1. Build jar `mvn clean package -DskipTests=true`
+2. jar will be in target 
+3.use `zip-with-dependencies` for deviceFarmRun,
+
+## Configurations
+1. Update `Config>>kernal.properites` to change the environment.
+2.Update below keys from `src/main/java>>inji.utils>>TestDataReader.java`
+`uin`,`uin2`,`aid` for env changes.
+3. Update `Config>>config.properties`,update value for this keys `nodePath`,`appiumServerExecutable`.
+4. Update `Config>>DesiredCapabilies.json`update value for this keys `appium:udid`,`appium:app`.
+5.If the run is on devicefarm also update `isDeviceFarmRun` as true.
+6.To run it in IDE run `testng.xml` file.
+
+
+## Reports
+This project reports will be in `test-output>>emailableReports`
+
+
--- a/injitest/src/main/java/inji/constants/StringUtilConstants.java
+++ b/injitest/src/main/java/inji/constants/StringUtilConstants.java
@@ -1,2 +0,0 @@
-package inji.constants;public enum StringUtilConstants {
-}
--- a/injitest/src/main/java/inji/driver/DriverManager.java
+++ b/injitest/src/main/java/inji/driver/DriverManager.java
@@ -40,13 +40,13 @@ public class DriverManager {
        if (isDeviceFarmRun) {
            DesiredCapabilities desiredCapabilities = new DesiredCapabilities();
            try {
-                appiumDriver.set(new AndroidDriver(new URL("http://127.0.0.1:4723/wd/hub"), desiredCapabilities));
+                appiumDriver.set(new IOSDriver(new URL("http://127.0.0.1:4723/wd/hub"), desiredCapabilities));
            } catch (MalformedURLException e) {
                throw new RuntimeException(e);
            }
        } else {
            DesiredCapabilities desiredCapabilities = CapabilitiesReader.getDesiredCapabilities("iosDevice", "src/main/resources/DesiredCapabilities.json");
-            appiumDriver.set(new AndroidDriver(service.getUrl(), desiredCapabilities));
+            appiumDriver.set(new IOSDriver(service.getUrl(), desiredCapabilities));
        }
        return appiumDriver.get();
    }
--- a/injitest/src/main/java/inji/pages/AboutInjiPage.java
+++ b/injitest/src/main/java/inji/pages/AboutInjiPage.java
@@ -2,26 +2,32 @@ package inji.pages;

 import io.appium.java_client.AppiumDriver;
 import io.appium.java_client.pagefactory.AndroidFindBy;
+import io.appium.java_client.pagefactory.iOSXCUITFindBy;
+
 import org.openqa.selenium.WebElement;

 public class AboutInjiPage extends BasePage {
    @AndroidFindBy(accessibility = "aboutInji")
+    @iOSXCUITFindBy(accessibility = "aboutInji")
    private WebElement aboutInjiHeader;
    
-    @AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Copy\")")
+    @AndroidFindBy(accessibility = "CopyText")
+    @iOSXCUITFindBy(accessibility = "CopyText")
    private WebElement copy;
    
-    @AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Copied\")")
+    @AndroidFindBy(uiAutomator = "CopyText")
+    @iOSXCUITFindBy(accessibility = "CopiedText")
    private WebElement copied;
    
-    @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"iconIcon\")")
+    @AndroidFindBy(accessibility = "arrowLeft")
+    @iOSXCUITFindBy(accessibility = "arrowLeft")
    private WebElement backButton;
    
    public AboutInjiPage(AppiumDriver driver) {
        super(driver);
    }

-    public boolean isaboutInjiHeaderDisplayed() {
+    public boolean isAboutInjiHeaderDisplayed() {
        return this.isElementDisplayed(aboutInjiHeader, "ABOUT INJI");
    }
    
--- a/injitest/src/main/java/inji/pages/AddNewCardPage.java
+++ b/injitest/src/main/java/inji/pages/AddNewCardPage.java
@@ -15,18 +15,32 @@ public class AddNewCardPage extends BasePage{
    @iOSXCUITFindBy(accessibility = "issuerHeading-Mosip")
    private WebElement downloadViaUin;
    
-    @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"iconIcon\")")
+    @AndroidFindBy(accessibility = "goBack")
+    @iOSXCUITFindBy(accessibility = "goBack")
    private WebElement backButton;
    
    @AndroidFindBy(accessibility = "issuer-ESignet")
+    @iOSXCUITFindBy(accessibility = "issuerHeading-ESignet")
    private WebElement downloadViaEsignet;
    
-    @AndroidFindBy(accessibility = "goBack")
-    private WebElement gobackButton;
-    
    @AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Please choose your preferred issuer from the options below to add a new card.\")")
    private WebElement addNewCardGuideMessage;
    
+    @AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Mangyaring piliin ang iyong gustong tagabigay mula sa mga opsyon sa ibaba upang magdagdag ng bagong card.\")")
+    private WebElement addNewCardGuideMessageInFillpino;
+    
+    @AndroidFindBy(accessibility = "issuerDescription-Mosip")
+    @iOSXCUITFindBy(accessibility = "issuerDescription-Mosip")
+    private WebElement issuerDescriptionMosip;
+    
+    @AndroidFindBy(accessibility = "issuerDescription-ESignet")
+    @iOSXCUITFindBy(accessibility = "issuerDescription-ESignet")
+    private WebElement issuerDescriptionEsignet;
+    
+    @AndroidFindBy(className = "android.widget.EditText")
+    @iOSXCUITFindBy(accessibility = "issuerSearchBar")
+    private WebElement issuerSearchBar;
+    
    public AddNewCardPage(AppiumDriver driver) {
        super(driver);
    }
@@ -57,8 +71,43 @@ public class AddNewCardPage extends BasePage{
        return this.isElementDisplayed(downloadViaEsignet, "Download via e-Signet");
    }
    
+    public boolean isDownloadViaEsignetDisplayedinFillpino() {
+        return this.isElementDisplayed(downloadViaEsignet, "I-download sa pamamagitan ng e-Signet");
+    }
+    
    public EsignetLoginPage clickOnDownloadViaEsignet(){
        clickOnElement(downloadViaEsignet);
        return new EsignetLoginPage(driver);
    }
+    
+    public boolean isBackButtonDisplayed() {
+        return backButton.isDisplayed() ;
+    }
+    
+    public boolean isAddNewCardGuideMessageDisplayedInFillopin() {
+        return this.isElementDisplayed(addNewCardGuideMessageInFillpino, "Mangyaring piliin ang iyong gustong tagabigay mula sa mga opsyon sa ibaba upang magdagdag ng bagong card.");
+    }
+    
+    public boolean isIssuerDescriptionMosipDisplayed() {
+        return this.isElementDisplayed(issuerDescriptionMosip, "Enter your national ID to download your card.");
+    }
+    
+    public boolean isIssuerDescriptionEsignetDisplayed() {
+        return this.isElementDisplayed(issuerDescriptionEsignet, "Enter your national ID to download your card.");
+    }
+    
+    public boolean isIssuerSearchBarDisplayed() {
+    	return this.isElementDisplayed(issuerSearchBar, "Search by Issuer’s name");
+    }
+    
+    public boolean isIssuerSearchBarDisplayedInFilipino() {
+    	return this.isElementDisplayed(issuerSearchBar, "Maghanap ayon sa pangalan ng Nag-isyu");
+    }
+    
+    public AddNewCardPage IssuerSearchBar(String env) {
+    	clearTextBoxAndSendKeys(issuerSearchBar, env, "issuer search bar");
+        return this;
+    }
+
+
 }
--- a/injitest/src/main/java/inji/pages/BasePage.java
+++ b/injitest/src/main/java/inji/pages/BasePage.java
@@ -46,6 +46,17 @@ public class BasePage {
        }
    }
    
+    protected boolean isElementDisplayed(WebElement element,int waitTime, String elementName) {
+        try {
+            waitForElementToBeVisible(element,waitTime);
+            ExtentLogger.pass(elementName + " is displayed");
+            return true;
+        } catch (Exception e) {
+            //ExtentLogger.fail(elementName + " is not displayed");
+            return false;
+        }
+    }
+    
    protected boolean isElementInvisibleYet(WebElement element, String elementName) {
        try {
        	waitForElementToBeInvisible(element);
@@ -57,6 +68,16 @@ public class BasePage {
        }
    }

+    protected boolean WaitTillElementVisible(WebElement element,int waitTime, String elementName) {
+        try {
+        	waitForElementToBeInvisible(element,waitTime);
+            ExtentLogger.pass(elementName + " is displayed");
+            return false;
+        } catch (Exception e) {
+            //ExtentLogger.fail(elementName + " is not displayed");
+            return true;
+        }
+        }
    protected void clickOnElement(WebElement element) {
        waitForElementToBeVisible(element);
        element.click();
@@ -71,11 +92,21 @@ public class BasePage {
        wait.until(ExpectedConditions.visibilityOf(element));
    }
    
+    private void waitForElementToBeVisible(WebElement element,int waitTime) {
+        WebDriverWait wait = new WebDriverWait(driver, ofSeconds(waitTime));
+        wait.until(ExpectedConditions.visibilityOf(element));
+    }
+    
    private void waitForElementToBeInvisible(WebElement element) {
    	  WebDriverWait wait = new WebDriverWait(driver, ofSeconds(30));
    	  wait.until(ExpectedConditions.invisibilityOf(element));
    	}
    
+    private void waitForElementToBeInvisible(WebElement element,int waitTime) {
+  	  WebDriverWait wait = new WebDriverWait(driver, ofSeconds(waitTime));
+  	  wait.until(ExpectedConditions.invisibilityOf(element));
+  	}
+    
    protected boolean isElementEnabled(WebElement element) {
        try {
            waitForElementToBeVisible(element);
--- a/injitest/src/main/java/inji/pages/ChooseLanguagePage.java
+++ b/injitest/src/main/java/inji/pages/ChooseLanguagePage.java
@@ -3,9 +3,12 @@ package inji.pages;
 import io.appium.java_client.AppiumDriver;
 import io.appium.java_client.pagefactory.AndroidFindBy;
 import io.appium.java_client.pagefactory.iOSXCUITFindBy;
-import inji.utils.CommonMethods;
+
+import org.openqa.selenium.Point;
 import org.openqa.selenium.WebElement;

+import inji.utils.AndroidUtil;
+

 public class ChooseLanguagePage extends BasePage {

@@ -17,6 +20,11 @@ public class ChooseLanguagePage extends BasePage {
    @iOSXCUITFindBy(accessibility = "savePreference")
    private WebElement savePreferenceText;

+    
+    @AndroidFindBy(accessibility = "unlockApplication")
+    private WebElement unlockApplications;
+    
+    
    public ChooseLanguagePage(AppiumDriver driver) {
        super(driver);
    }
@@ -24,7 +32,7 @@ public class ChooseLanguagePage extends BasePage {
    public boolean isChooseLanguagePageLoaded() {
        boolean temp = isElementDisplayed(chooseLanguageText, "Choose language page");
        if (!temp) {
-            CommonMethods.invokeAppFromBackGroundAndroid();
+            AndroidUtil.invokeAppFromBackGroundAndroid();
        }
        return true;
    }
@@ -33,4 +41,13 @@ public class ChooseLanguagePage extends BasePage {
        clickOnElement(savePreferenceText);
        return new WelcomePage(driver);
    }
+    
+    public ChooseLanguagePage clickOnUnlockApplication() {
+     	 clickOnElement(unlockApplications);
+          return this;
+     }
+   
+   public boolean isUnlockApplicationDisplayed() {
+       return this.isElementDisplayed(unlockApplications, "Unlock Application");
+   }
 }
--- a/injitest/src/main/java/inji/pages/ConfirmPasscode.java
+++ b/injitest/src/main/java/inji/pages/ConfirmPasscode.java
@@ -8,13 +8,13 @@ import org.openqa.selenium.WebElement;

 public class ConfirmPasscode extends BasePage {

-    @iOSXCUITFindBy(accessibility = "confirmPasscode")
+	@iOSXCUITFindBy(accessibility = "confirmPasscodeHeader")
    @AndroidFindBy(xpath = "//*[contains(@text,'Confirm passcode')]")
    private WebElement confirmPasscode;
    
    
    @AndroidFindBy(xpath = "//*[contains(@text,'Passcode did not match.')]")
-    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`label == \"Passcode did not match.\"`]")
+    @iOSXCUITFindBy(accessibility = "Passcode did not match.")
    private WebElement invalidPasscode;

    public ConfirmPasscode(AppiumDriver driver) {
--- a/injitest/src/main/java/inji/pages/CredentialRegistryPage.java
+++ b/injitest/src/main/java/inji/pages/CredentialRegistryPage.java
@@ -2,29 +2,44 @@ package inji.pages;

 import io.appium.java_client.AppiumDriver;
 import io.appium.java_client.pagefactory.AndroidFindBy;
+import io.appium.java_client.pagefactory.iOSXCUITFindBy;
+
 import org.openqa.selenium.WebElement;

 public class CredentialRegistryPage extends BasePage {
 	
-	@AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Edit Credential Registry\")")
+	@AndroidFindBy(accessibility = "credentialRegistryLabel")
+	@iOSXCUITFindBy(accessibility = "credentialRegistryLabel")
    public WebElement credentialRegistryTextBoxHeader;
 	
-	@AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Edit Esignet Host\")")
+	@AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Palitan ang Credential Registry\")")
+    public WebElement credentialRegistryTextBoxHeaderInFilipino;
+	
+	@AndroidFindBy(accessibility = "esignetHostLabel")
+	@iOSXCUITFindBy(accessibility = "esignetHostLabel")
    public WebElement credentialRegistryEsignetTextBoxHeader;
 	
-	@AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"RNE__Input__text-input\")")
+	@AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Palitan ang esignethosturl\")")
+    public WebElement credentialRegistryEsignetTextBoxHeaderInFilipino;
+	
+	@AndroidFindBy(accessibility = "credentialRegistryInputField")
+	@iOSXCUITFindBy(accessibility = "credentialRegistryInputField")
 	public WebElement credentialRegistryTextBox;
 	
-	@AndroidFindBy(xpath = "(//android.widget.EditText[@resource-id=\"RNE__Input__text-input\"])[2]")
+	@AndroidFindBy(accessibility = "esignetHostInputField")
+	@iOSXCUITFindBy(accessibility = "esignetHostInputField")
 	public WebElement credentialRegistryEsignetTextBox;
 	
-	@AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Save\")")
+	@AndroidFindBy(accessibility = "save")
+	@iOSXCUITFindBy(accessibility = "save")
    public WebElement saveButton;
 	
-	@AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Cancel\")")
+	@AndroidFindBy(accessibility = "cancel")
+    @iOSXCUITFindBy(accessibility = "cancel")
    public WebElement cancelButton;
 	
 	@AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"iconIcon\")")
+	@iOSXCUITFindBy(accessibility = "arrowLeft")
    public WebElement backArrow;
 	
    public CredentialRegistryPage(AppiumDriver driver) {
@@ -35,12 +50,20 @@ public class CredentialRegistryPage extends BasePage {
        return this.isElementDisplayed(credentialRegistryTextBoxHeader, "Credential Registry Text heder is visible");
    }
    
+    public boolean isCredentialRegistryTextBoxHeaderInFilipinoDisplayed() {
+        return this.isElementDisplayed(credentialRegistryTextBoxHeaderInFilipino, "Palitan ang Credential Registry");
+    }
+    
+    public boolean isCredentialRegistryTextBoxHeaderForEsignetInFilipinoDisplayed() {
+        return this.isElementDisplayed(credentialRegistryEsignetTextBoxHeader, "Palitan ang esignethosturl");
+    }
+    
    public CredentialRegistryPage setEnterIdTextBox(String env) {
    	clearTextBoxAndSendKeys(credentialRegistryTextBox, env, "Credential Registry env");
        return this;
    }
    
-    public CredentialRegistryPage EnterUrlToEsignetHostTextBox(String env) {
+    public CredentialRegistryPage enterUrlToEsignetHostTextBox(String env) {
    	clearTextBoxAndSendKeys(credentialRegistryEsignetTextBox, env, "Credential Registry env");
        return this;
    }
--- a/injitest/src/main/java/inji/pages/DetailedVcViewPage.java
+++ b/injitest/src/main/java/inji/pages/DetailedVcViewPage.java
@@ -7,8 +7,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;

 public class DetailedVcViewPage extends BasePage{
-    @AndroidFindBy(xpath = "//*[contains(@text,'ID Details')]")
-    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`label == \"ID Details\"`]")
+    @AndroidFindBy(accessibility = "idDetailsHeader")
+    @iOSXCUITFindBy(accessibility = "idDetailsHeader")
    private WebElement detailedVcViewPageTitle;

    @AndroidFindBy(accessibility = "fullNameValue")
@@ -59,23 +59,28 @@ public class DetailedVcViewPage extends BasePage{
    @iOSXCUITFindBy(accessibility = "close")
    private WebElement crossIcon;
    
-    @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"iconIcon\")")
-    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeOther[`label == \"\uE5CD\"`][2]")
+    @AndroidFindBy(accessibility = "qrCodeCloseIcon")
+    @iOSXCUITFindBy(accessibility = "qrCodeCloseIcon")
    private WebElement qrCloseIcon;

-    @AndroidFindBy(xpath = "//android.widget.ScrollView/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup[1]/android.view.ViewGroup[1]/android.view.ViewGroup[1]/android.view.ViewGroup[1]/android.view.ViewGroup[1]/android.view.ViewGroup/android.view.ViewGroup")
+    @AndroidFindBy(accessibility = "qrCodePressable")
+    @iOSXCUITFindBy(accessibility = "qrCodePressable")
    private WebElement detailedVcViewPageQr;
    
    @AndroidFindBy(accessibility = "qrCodeHeader")
+    @iOSXCUITFindBy(accessibility = "qrCodeHeader")
    private WebElement qrCodeHeader;
    
    @AndroidFindBy(accessibility = "credentialRegistry")
+    @iOSXCUITFindBy(accessibility = "credentialRegistry")
    private WebElement credentialRegistryText;
    
    @AndroidFindBy(accessibility = "credentialRegistryValue")
+    @iOSXCUITFindBy(accessibility = "credentialRegistryValue")
    private WebElement credentialRegistryValue;
    
    @AndroidFindBy(accessibility = "esignet-logo")
+    @iOSXCUITFindBy(xpath = "(//XCUIElementTypeImage)[3]")
    private WebElement esignetLogo;

    public DetailedVcViewPage(AppiumDriver driver) {
@@ -155,11 +160,11 @@ public class DetailedVcViewPage extends BasePage{
    }
    
    public boolean isCredentialRegistryTextDisplayed() {
-        return this.isElementDisplayed(credentialRegistryText, "credentialRegistry");
+        return this.isElementDisplayed(credentialRegistryText, "Credential Registry");
    }
    
-    public boolean isCredentialRegistryValueDisplayed() {
-    	return this.isElementDisplayed(credentialRegistryValue, "https://api.qa-trinity.mosip.net");
+    public String getCredentialRegistryValue() {
+        return getTextFromLocator(credentialRegistryValue);
    }
    
    public boolean isEsignetLogoDisplayed() {
--- a/injitest/src/main/java/inji/pages/EsignetLoginPage.java
+++ b/injitest/src/main/java/inji/pages/EsignetLoginPage.java
@@ -7,7 +7,15 @@ import org.openqa.selenium.WebElement;

 public class EsignetLoginPage extends BasePage{
    
+	
+	 @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`label == \"“Inji” Wants to Use “mosip.net” to Sign In\"`]")
+	    private WebElement iosSignInPermissionPopup;
+	 
+	 @iOSXCUITFindBy(accessibility = "Continue")
+	    private WebElement iosContinueButton;
+	 
    @AndroidFindBy(xpath = "//*[contains(@text,'Login with OTP')]")
+    @iOSXCUITFindBy(accessibility = "enterPasscode")
    private WebElement esignetLoginButton;
    
    @AndroidFindBy(xpath = "//*[contains(@text,'Login with e-Signet')]")
--- a/injitest/src/main/java/inji/pages/GenerateUinOrVidPage.java
+++ b/injitest/src/main/java/inji/pages/GenerateUinOrVidPage.java
@@ -11,11 +11,11 @@ public class GenerateUinOrVidPage extends BasePage {
    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`label == \"Retrieve your UIN/VID\"`]")
    private WebElement retrieveUinVidText;

-    @AndroidFindBy(className = "android.widget.EditText")
-    @iOSXCUITFindBy(accessibility = "RNE__Input__text-input")
+    @AndroidFindBy(accessibility = "getIdInputModalIndividualId")
+    @iOSXCUITFindBy(accessibility = "getIdInput")
    private WebElement applicationIdTextBox;

-    @AndroidFindBy(xpath = "//*[contains(@text,'Get UIN/VID')]")
+    @AndroidFindBy(accessibility = "getIdButton")
    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeButton[`label == \"Get UIN/VID\"`]")
    private WebElement getUinOrVidButton;

--- a/injitest/src/main/java/inji/pages/HassleFreeAuthenticationPage.java
+++ b/injitest/src/main/java/inji/pages/HassleFreeAuthenticationPage.java
@@ -7,15 +7,16 @@ import org.openqa.selenium.WebElement;

 public class HassleFreeAuthenticationPage extends BasePage {

-    @AndroidFindBy(xpath = "//*[contains(@text,'Hassle free authentication')]")
+    @AndroidFindBy(accessibility = "introTitle")
    @iOSXCUITFindBy(iOSNsPredicate = "label == \"Hassle free authentication\"")
    private WebElement hassleFreeAuthenticationText;

-    @AndroidFindBy(xpath = "(//*[@class='android.widget.TextView'])[3]")
+    @AndroidFindBy(accessibility = "introText")
    @iOSXCUITFindBy(xpath = "//*[contains(@value,'Authenticate yourself')]")
    private WebElement hassleFreeAuthenticationDescription;
    
-    @AndroidFindBy(xpath = "//*[contains(@text,'Go Back')]")
+    @AndroidFindBy(accessibility = "getStarted")
+    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeButton[`label == \"Back\"`][4]")
    public WebElement goBackButton;

    public HassleFreeAuthenticationPage(AppiumDriver driver) {
--- a/injitest/src/main/java/inji/pages/HelpPage.java
+++ b/injitest/src/main/java/inji/pages/HelpPage.java
@@ -16,9 +16,14 @@ public class HelpPage extends BasePage {
    private WebElement crossIcon;
    
    @AndroidFindBy(uiAutomator = "new UiScrollable(new UiSelector()).scrollIntoView(text(\"What happens when Android keystore biometric is changed?\"));")
+    @iOSXCUITFindBy(accessibility = "How to add a card?")
    public WebElement biometricIsChangeTextdHeader;
+    
+    @AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"The Android keystore holds important information like private keys \")")
+    private WebElement biometricIsChangeTextdDiscription;

    @AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"How to add a card?\")")
+    @iOSXCUITFindBy(accessibility = "How to add a card?")
    public WebElement helpPageContent;
    
    public HelpPage(AppiumDriver driver) {
@@ -41,4 +46,8 @@ public class HelpPage extends BasePage {
    	return helpPageContent.getText().isBlank();
    }
    
+    public boolean isBiometricIsChangeTextdDiscription() {
+        return this.isElementDisplayed(biometricIsChangeTextdDiscription, "The Android keystore holds important information like private keys for identity proofs. When you change your biometrics, old keys are no longer safe. To keep things secure, we remove identity proofs signed by those old keys. You can simply download your identity proofs again, and they will be signed with the latest, safer keys.");
+    }
+    
 }
--- a/injitest/src/main/java/inji/pages/HistoryPage.java
+++ b/injitest/src/main/java/inji/pages/HistoryPage.java
@@ -17,13 +17,22 @@ public class HistoryPage extends BasePage {
    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeOther[`label == \"History\"`][5]")
    private WebElement historyHeader;

-    @AndroidFindBy(xpath = "//*[contains(@text,'No history available yet')]")
-    @iOSXCUITFindBy(accessibility = "No history available yet")
+    @AndroidFindBy(accessibility = "noHistory")
+    @iOSXCUITFindBy(accessibility = "noHistory")
    private WebElement noHistoryAvailable;
+    
+    @AndroidFindBy(className = "android.widget.TextView")
+    @iOSXCUITFindBy(className = "android.widget.TextView")
+    private WebElement activityLogHeader;
+    

    public HistoryPage(AppiumDriver driver) {
        super(driver);
    }
+    
+    public String getUinInActivityLogHeader() {
+        return getTextFromLocator(activityLogHeader);
+    }

    public boolean isHistoryPageLoaded() {
        return this.isElementDisplayed(historyHeader, "History page");
@@ -39,6 +48,21 @@ public class HistoryPage extends BasePage {
        return this.isElementDisplayed(locator, "Downloaded VC in android");
    }
    
+    private boolean verifyActivityHeaderAndroid(String vcNumber) {
+        By locator = By.xpath("//*[contains(@text,'" + vcNumber + "')]");
+        return this.isElementDisplayed(locator, "Downloaded VC in android");
+    }
+    
+    private boolean verifyPinHistoryAndroid(String vcNumber) {
+        By locator = By.xpath("//*[contains(@text,'" + vcNumber + " pined')]");
+        return this.isElementDisplayed(locator, "pined VC in android");
+    }
+    
+    private boolean verifyPinHistoryIos(String vcNumber) {
+        By locator = By.xpath("//*[contains(@text,'" + vcNumber + " pined')]");
+        return this.isElementDisplayed(locator, "pined VC in android");
+    }
+    
    private boolean verifyDeleteHistoryAndroid(String vcNumber) {
        By locator = By.xpath("//*[contains(@text,'" + vcNumber + " Removed from wallet')]");
        return this.isElementDisplayed(locator, "Delete VC in android");
@@ -71,6 +95,24 @@ public class HistoryPage extends BasePage {
        return false;
    }
    
+    public boolean verifyActivityLogHeader(String vcNumber, Target os) {
+        switch (os) {
+            case ANDROID:
+                return verifyActivityHeaderAndroid(vcNumber);
+        }
+        return false;
+    }
+    
+    public boolean verifyPinHistory(String vcNumber, Target os) {
+        switch (os) {
+            case ANDROID:
+                return verifyPinHistoryAndroid(vcNumber);
+            case IOS:
+                return verifyPinHistoryIos(vcNumber);
+        }
+        return false;
+    }
+    
    public int getNumberOfRecordsInHistory(String vcNumber, Target os) throws InterruptedException {
        switch (os) {
            case ANDROID:
--- a/injitest/src/main/java/inji/pages/HomePage.java
+++ b/injitest/src/main/java/inji/pages/HomePage.java
@@ -7,24 +7,24 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;

 public class HomePage extends BasePage {
-    @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"downloadIcon\")")
-    @iOSXCUITFindBy(accessibility = "downloadIcon")
+    @AndroidFindBy(accessibility = "plusIcon")
+    @iOSXCUITFindBy(accessibility = "downloadCardButton")
    private WebElement downloadCardButton;

-    @AndroidFindBy(xpath = "//*[contains(@text,'Home')]")
-    @iOSXCUITFindBy(accessibility = "Home, tab, 1 of 3")
+    @AndroidFindBy(accessibility = "home")
+    @iOSXCUITFindBy(accessibility = "home")
    private WebElement homeButton;

-    @AndroidFindBy(xpath = "//*[@resource-id=\"iconIcon\"]")
-    @iOSXCUITFindBy(accessibility = "\uE09A")
+    @AndroidFindBy(accessibility = "settings")
+    @iOSXCUITFindBy(accessibility = "settings")
    private WebElement settingButton;

-    @AndroidFindBy(xpath = "(//*[@class=\"android.widget.ImageView\"])[2]")
-    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeNavigationBar[`name == \"RNSScreen\"`]/XCUIElementTypeOther[2]")
+    @AndroidFindBy(accessibility = "help")
+    @iOSXCUITFindBy(accessibility = "help")
    private WebElement helpButton;

-    @AndroidFindBy(xpath = "//*[contains(@text,'History')]")
-    @iOSXCUITFindBy(accessibility = "History, tab, 3 of 3")
+    @AndroidFindBy(accessibility = "history")
+    @iOSXCUITFindBy(accessibility = "history")
    private WebElement historyButton;

    @iOSXCUITFindBy(accessibility = "ellipsis")
@@ -52,19 +52,23 @@ public class HomePage extends BasePage {
    private WebElement bringYourDigitalIdentity;

    @AndroidFindBy(accessibility = "errorTitle")
+    @iOSXCUITFindBy(accessibility = "errorTitle")
    private WebElement noInternetConnection;

-    @AndroidFindBy(xpath = "//*[contains(@text,'Scan')]")
-    @iOSXCUITFindBy(accessibility = "Scan, tab, 2 of 3")
+    @AndroidFindBy(accessibility = "scan")
+    @iOSXCUITFindBy(accessibility = "scan")
    private WebElement scanButton;

    @AndroidFindBy(accessibility = "nationalCard")
    @iOSXCUITFindBy(accessibility = "nationalCard")
    private WebElement idTypeValue;
    
-    @AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Try again\")")
+    @AndroidFindBy(accessibility = "tryAgain")
+    @iOSXCUITFindBy(accessibility = "errorTitle")
    private WebElement tryAgainButton;
-
+    
+    @AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Subukan muli\")")
+    private WebElement tryAgainButtonInFillpino;

    public HomePage(AppiumDriver driver) {
        super(driver);
@@ -74,9 +78,9 @@ public class HomePage extends BasePage {
        /*if (isElementDisplayed(secureKeyStoragePopup, "secure key storage popup")) {
            clickOnElement(riskItButton);
        }*/
-        if (isElementDisplayed(securityFeatureUnavailablePopup, "security features will be unavailable popup")) {
-            clickOnElement(okButton);
-        }
+//        if (isElementDisplayed(securityFeatureUnavailablePopup, "security features will be unavailable popup")) {
+//            clickOnElement(okButton);
+//        }
        return this.isElementDisplayed(homeButton, "Home page");
    }

@@ -87,7 +91,7 @@ public class HomePage extends BasePage {

    public boolean isNameDisplayed(String name) {
        By fullName = By.xpath("//*[contains(@value,'" + name + "') or contains(@text,'" + name + "')]");
-        return this.isElementDisplayed(fullName, 60, "Name on downloaded card");
+        return this.isElementDisplayed(fullName, 120, "Name on downloaded card");
    }
    
   public boolean isSecondNameDisplayed(String name) {
@@ -127,14 +131,24 @@ public class HomePage extends BasePage {
        return this.isElementDisplayed(pinIcon, "pin icon");
    }
    
-    
    public boolean isNoVCDownloaded() {
        return this.isElementDisplayed(bringYourDigitalIdentity, "Bring your digital identity");
    }
+    
+    public boolean isNoVCDownloadedInFilipino() {
+        return this.isElementDisplayed(bringYourDigitalIdentity, "Dalhin ang Iyong Digital ID");
+    }

    public boolean isNoInternetConnectionDisplayed() {
        return this.isElementDisplayed(noInternetConnection, "No internet connection");
    }
+    
+    public boolean isNoInternetConnectionDisplayedInTamil() {
+        return this.isElementDisplayed(noInternetConnection, "இணைய இணைப்பு இல்லை");
+    }
+    public boolean isNoInternetConnectionDisplayedFlillpino() {
+        return this.isElementDisplayed(noInternetConnection, "Pakisuri ang iyong koneksyon at subukang muli");
+    }

    public ScanPage clickOnScanButton(){
        clickOnElement(scanButton);
@@ -144,6 +158,18 @@ public class HomePage extends BasePage {
        return this.isElementDisplayed(idTypeValue, "Name on downloaded card");
    }
    
+    public boolean isTryAgainButtonDisplayedInFlillpino() {
+        return this.isElementDisplayed(tryAgainButtonInFillpino, "Subukan muli");
+    }
+    
+    public boolean isTryAgainButtonDisplayedInTamil() {
+        return this.isElementDisplayed(tryAgainButton, "மீண்டும் முயற்சி செய்");
+    }
+    
+    public boolean isTryAgainButtonNotDisplayedInFlillpino() {
+        return this.isElementInvisibleYet(tryAgainButtonInFillpino, "Subukan muli");
+    }
+    
    public boolean isTryAgainButtonDisplayed() {
        return this.isElementDisplayed(tryAgainButton, "Try again");
    }
@@ -156,4 +182,10 @@ public class HomePage extends BasePage {
    	 clickOnElement(tryAgainButton);
         return this;
    }
+    
+    public HomePage clickOnTryAgainButtonInFlillpino() {
+   	 clickOnElement(tryAgainButtonInFillpino);
+        return this;
+   }
+    
 }
--- a/injitest/src/main/java/inji/pages/MoreOptionsPage.java
+++ b/injitest/src/main/java/inji/pages/MoreOptionsPage.java
@@ -15,6 +15,10 @@ public class MoreOptionsPage extends BasePage {
    @iOSXCUITFindBy(accessibility = "kebabTitle")
    private WebElement moreOptionsText;

+    @AndroidFindBy(accessibility = "viewActivityLog")
+    @iOSXCUITFindBy(accessibility = "viewActivityLog")
+    private WebElement viewActivityLogButton;
+    
    @AndroidFindBy(accessibility = "pinOrUnPinCard")
    @iOSXCUITFindBy(accessibility = "pinOrUnPinCard")
    private WebElement pinOrUnPinCardButton;
@@ -32,6 +36,7 @@ public class MoreOptionsPage extends BasePage {
    private WebElement closeButton;

    @AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Something is wrong. Please try again later!\")")
+    @iOSXCUITFindBy(iOSClassChain ="**/XCUIElementTypeOther[`label == \"Something is wrong. Please try again later!\"`]")
    public WebElement somthingIsWrongPopup;

    public MoreOptionsPage(AppiumDriver driver) {
@@ -50,6 +55,11 @@ public class MoreOptionsPage extends BasePage {
    public void clickOnPinOrUnPinCard() {
        clickOnElement(pinOrUnPinCardButton);
    }
+    
+    public HistoryPage clickOnViewActivityLog() {
+        clickOnElement(viewActivityLogButton);
+        return new HistoryPage(driver);
+    }

    public PleaseConfirmPopupPage clickOnActivationPending() {
        clickOnElement(activationPending);
--- a/injitest/src/main/java/inji/pages/OtpVerificationPage.java
+++ b/injitest/src/main/java/inji/pages/OtpVerificationPage.java
@@ -8,12 +8,12 @@ import org.openqa.selenium.WebElement;

 public class OtpVerificationPage extends BasePage {

-    @AndroidFindBy(xpath = "//*[contains(@text,'OTP Verification')]")
-    @iOSXCUITFindBy(accessibility = "OTP Verification")
+    @AndroidFindBy(accessibility = "otpVerificationHeader")
+    @iOSXCUITFindBy(accessibility = "otpVerificationHeader")
    private WebElement otpVerificationText;

-    @AndroidFindBy(xpath = "//*[contains(@text,'OTP is invalid')]")
-    @iOSXCUITFindBy(accessibility = "OTP is invalid")
+    @AndroidFindBy(accessibility = "otpVerificationError")
+    @iOSXCUITFindBy(accessibility = "otpVerificationError")
    private WebElement invalidOtpMessage;

    @AndroidFindBy(xpath = "//*[contains(@text,'Something is wrong. Please try again later!')]")
@@ -21,16 +21,33 @@ public class OtpVerificationPage extends BasePage {
    private WebElement invalidOtpMessageInVcActivation;

    @AndroidFindBy(xpath = "//*[contains(@text,'Cancel')]")
-    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeButton[`label == \"Cancel\"`]")
+    @iOSXCUITFindBy(accessibility = "cancel")
    private WebElement cancelButton;

    @AndroidFindBy(accessibility = "close")
    @iOSXCUITFindBy(accessibility = "close")
    private WebElement crossIcon;
    
+    @AndroidFindBy(accessibility = "cancel")
+    @iOSXCUITFindBy(accessibility = "cancel")
+    private WebElement cancelPopupButton;
+    
+    @AndroidFindBy(accessibility = "otpVerificationTimer")
+    @iOSXCUITFindBy(accessibility = "otpVerificationTimer")
+    private WebElement otpVerificationTimer;
+    
+    @AndroidFindBy(accessibility = "confirmationPopupHeader")
+    @iOSXCUITFindBy(accessibility = "confirmationPopupHeader")
+    private WebElement confirmationPopupHeader;
+    
    @AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"VID not available in database\")")
+    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`label == \"VID not available in database\"`]")
 	  private WebElement vidNotAvailableMessage;
-
+    
+    @AndroidFindBy(accessibility = "resendCode")
+    @iOSXCUITFindBy(accessibility = "resendCode")
+    private WebElement resendCodeButton;
+    
    public OtpVerificationPage(AppiumDriver driver) {
        super(driver);
    }
@@ -52,6 +69,11 @@ public class OtpVerificationPage extends BasePage {
    }

    public boolean invalidOtpMessageDisplayed() {
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
        return this.isElementDisplayed(invalidOtpMessage, "OTP is invalid");
    }

@@ -71,7 +93,23 @@ public class OtpVerificationPage extends BasePage {
        clickOnElement(crossIcon);
    }
    
+    public void clickOnCancelPopupButton(){
+        clickOnElement(cancelPopupButton);
+    }
+    
    public boolean vidNotAvailableDisplayed() {
        return this.isElementDisplayed(vidNotAvailableMessage, "VID not available in database");
    }
+    
+    public boolean verifyResendCodeButtonDisplayed() {
+        return this.isElementDisplayed(resendCodeButton, "Resend Code");
+    }
+    
+    public boolean confirmPopupHeaderDisplayed() {
+        return this.isElementDisplayed(confirmationPopupHeader, "Do you want to cancel downloading?");
+    }
+    
+    public boolean verifyOtpVerificationTimerCompleted() {
+        return this.WaitTillElementVisible(otpVerificationTimer, 180,"You can resend the code in  :");
+    }
 }
--- a/injitest/src/main/java/inji/pages/ReceiveCardPage.java
+++ b/injitest/src/main/java/inji/pages/ReceiveCardPage.java
@@ -9,16 +9,16 @@ public class ReceiveCardPage extends BasePage {
 	 @AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Allow\")")
 	  private WebElement allowButton;
 	 
-	 @AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Display this QR code to request resident Card\")")
+	 @AndroidFindBy(accessibility = "showQrCode")
 	  private WebElement receiveCardHeder;
 	 
 	 @AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Ipakita ang QR code na ito para humiling ng resident card\")")
 	  private WebElement receiveCardHederInFilipinoLanguage;
 	 
-	 @AndroidFindBy(xpath = "//android.view.ViewGroup/descendant::android.view.ViewGroup[last()]")
+	 @AndroidFindBy(accessibility = "qrCode")
 	  private WebElement qrCode;
 	 
-	 @AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Waiting for connection...\")")
+	 @AndroidFindBy(accessibility = "receiveCardStatusMessage")
 	  private WebElement watitingForConnection;
 	 
 	 @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"com.oplus.wirelesssettings:id/alertTitle\")")
--- a/injitest/src/main/java/inji/pages/RetrieveIdPage.java
+++ b/injitest/src/main/java/inji/pages/RetrieveIdPage.java
@@ -8,15 +8,15 @@ import org.openqa.selenium.WebElement;


 public class RetrieveIdPage extends BasePage {
-    @AndroidFindBy(xpath = "//*[contains(@text,'Retrieve your ID')]")
-    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`label == \"Retrieve your ID\"`]")
+    @AndroidFindBy(accessibility = "retreiveIdHeader")
+    @iOSXCUITFindBy(accessibility = "retreiveIdHeader")
    private WebElement retrieveIdText;

    @AndroidFindBy(xpath = "//*[contains(@text,'Enter ID')]")
-    @iOSXCUITFindBy(accessibility = "idInput")
+    @iOSXCUITFindBy(accessibility = "idInputModalIndividualId")
    private WebElement enterIdTextBox;

-    @AndroidFindBy(xpath = "//*[contains(@text,'Generate Card')]")
+    @AndroidFindBy(accessibility = "generateVc")
    @iOSXCUITFindBy(accessibility = "generateVc")
    private WebElement generateCardButton;

@@ -29,18 +29,19 @@ public class RetrieveIdPage extends BasePage {
    @AndroidFindBy(className = "android.widget.Spinner")
    private WebElement spinnerButton;

-    @AndroidFindBy(xpath = "//*[contains(@text,'Get it now')]")
-    @iOSXCUITFindBy(accessibility = "getItHere")
+    @AndroidFindBy(accessibility = "getItNow")
+    @iOSXCUITFindBy(accessibility = "getItNow")
    private WebElement getItNowText;
    
    @AndroidFindBy(xpath = "//*[contains(@text,'UIN invalid')]")
    private WebElement invalidUin;

    @AndroidFindBy(xpath = "//*[contains(@text,'The input format is incorrect')]")
-    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`label == \"The input format is incorrect\"`]")
+    @iOSXCUITFindBy(accessibility = "idInputModalIndividualId")
    private WebElement inputFormatErrorMessage;

    @AndroidFindBy(xpath = "//*[contains(@text,'AID is not ready yet')]")
+    @iOSXCUITFindBy(accessibility = "AID is not ready yet")
    private WebElement aidIsNotReadyYetMessage;

    public RetrieveIdPage(AppiumDriver driver) {
@@ -52,11 +53,7 @@ public class RetrieveIdPage extends BasePage {
    }

    public RetrieveIdPage setEnterIdTextBox(String uinOrVid) {
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
+    	clickOnElement(generateCardButton);
        sendKeysToTextBox(enterIdTextBox, uinOrVid, "uin or vid textbox");
        return this;
    }
--- a/injitest/src/main/java/inji/pages/ScanPage.java
+++ b/injitest/src/main/java/inji/pages/ScanPage.java
@@ -10,7 +10,7 @@ public class ScanPage extends BasePage{
    @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"com.android.permissioncontroller:id/permission_allow_foreground_only_button\")")
    private WebElement allowPermissionPopupButton;

-    @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"io.mosip.residentapp:id/texture_view\")")
+    @AndroidFindBy(accessibility = "camera")
    private WebElement camera;

    @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"com.oplus.wirelesssettings:id/alertTitle\")")
@@ -19,13 +19,14 @@ public class ScanPage extends BasePage{
    @AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Allow\")")
    private WebElement allowButton;

-    @AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"No shareable cards are available.\")")
+    @AndroidFindBy(accessibility = "noShareableVcs")
+    @iOSXCUITFindBy(accessibility = "noShareableVcs")
    private WebElement noShareableCards;

-	@AndroidFindBy(className = "android.widget.ImageView")
+	@AndroidFindBy(accessibility = "flipCameraIcon")
 	private WebElement flipCamera;

-	@AndroidFindBy(xpath = "//*[contains(@text,'Hold the phone steady and scan the QR code')]")
+	@AndroidFindBy(accessibility = "holdPhoneSteadyMessage")
 	 private WebElement holdCameraSteady;

    public ScanPage(AppiumDriver driver) {
--- a/injitest/src/main/java/inji/pages/SecureSharingPage.java
+++ b/injitest/src/main/java/inji/pages/SecureSharingPage.java
@@ -7,15 +7,15 @@ import org.openqa.selenium.WebElement;

 public class SecureSharingPage extends BasePage {

-    @AndroidFindBy(xpath = "//*[contains(@text,'Secure Sharing')]")
+    @AndroidFindBy(accessibility = "introTitle")
    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`label == \"Secure Sharing\"`]")
    private WebElement secureSharingText;

-    @AndroidFindBy(xpath = "(//*[@class='android.widget.TextView'])[3]")
+    @AndroidFindBy(accessibility = "introText")
    @iOSXCUITFindBy(xpath = "//*[contains(@value,'Share your cards')]")
    private WebElement secureSharingDescription;

-    @AndroidFindBy(xpath = "//*[@text='Next']")
+    @AndroidFindBy(accessibility = "next")
    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeOther[`label == \"Next\"`][4]")
    private WebElement nextButton;

--- a/injitest/src/main/java/inji/pages/SetPasscode.java
+++ b/injitest/src/main/java/inji/pages/SetPasscode.java
@@ -9,7 +9,7 @@ import org.openqa.selenium.WebElement;

 public class SetPasscode extends BasePage {

-    @iOSXCUITFindBy(accessibility = "setPasscode")
+	@iOSXCUITFindBy(accessibility = "setPasscodeHeader")
    @AndroidFindBy(xpath = "//*[contains(@text,'Set Passcode')]")
    private WebElement setPasscode;

--- a/injitest/src/main/java/inji/pages/SettingsPage.java
+++ b/injitest/src/main/java/inji/pages/SettingsPage.java
@@ -21,27 +21,32 @@ public class SettingsPage extends BasePage {
    @iOSXCUITFindBy(accessibility = "Logout")
    private WebElement logoutButton;

-    @AndroidFindBy(xpath = "//*[contains(@text,'Language')]")
-    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`label == \"Language\"`]")
+    @AndroidFindBy(accessibility = "languageTitle")
+    @iOSXCUITFindBy(accessibility = "languageTitle")
    private WebElement languageButton;

    @AndroidFindBy(xpath = "//*[contains(@text,'Filipino')]")
    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`label == \"Filipino\"`]")
    private WebElement filipinoLanguageButton;
+    
+    @AndroidFindBy(xpath = "//*[contains(@text,'தமிழ்')]")
+    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`label == \"தமிழ்\"`]")
+    private WebElement tamilLanguageButton;

    @AndroidFindBy(xpath = "//*[contains(@text,'Wika')]")
-    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`label == \"Wika\"`]")
+    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeOther[`label == \"\uE037 Wika \uE5CC\"`][1]")
    private WebElement wikaButton;

    @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"listItemTitle\")")
+    @iOSXCUITFindBy(iOSNsPredicate = "name == \"listItemTitle\"")
    private List<WebElement> languages;

-    @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"aboutInji\")")
-    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`label == \"About Inji\"`]")
+    @AndroidFindBy(accessibility = "aboutInjiTitle")
+    @iOSXCUITFindBy(accessibility = "aboutInjiTitle")
    private WebElement aboutInji;

-    @AndroidFindBy(xpath = "//*[contains(@text,'Tuvali-version: v')]")
-    @iOSXCUITFindBy(xpath = "//*[contains(@name,'Tuvali-version: v')]")
+    @AndroidFindBy(xpath = "//*[contains(@text,'Tuvali-version:')]")
+    @iOSXCUITFindBy(xpath = "//*[contains(@name,'Tuvali-version: 0.4.6')]")
    private WebElement tuvaliVersion;

    @AndroidFindBy(accessibility = "injiTourGuide")
@@ -52,20 +57,22 @@ public class SettingsPage extends BasePage {
    @iOSXCUITFindBy(accessibility = "injiTourGuide")
    private WebElement receivedCards;

-    @AndroidFindBy(xpath = "//*[contains(@text,'Credential Registry')]")
+    @AndroidFindBy(accessibility = "credentialRegistryTitle")
+    @iOSXCUITFindBy(accessibility = "credentialRegistryTitle")
    public WebElement credentialRegistryText;

-    @AndroidFindBy(xpath = "//*[contains(@text,'Receive Card')]")
+    @AndroidFindBy(accessibility = "receiveCard")
    public WebElement receiveCardText;

    @AndroidFindBy(xpath = "//*[contains(@text,'Tumanggap ng Card')]")
    public WebElement receiveCardInfilipinoLanguageText;

    @AndroidFindBy(xpath = "(//*[@resource-id=\"padView\"])[3]")
+    @iOSXCUITFindBy(accessibility = "عربى")
    private WebElement arabicLanguageButton;
-
-    @AndroidFindBy(className = "android.widget.TextView")
-    private WebElement chooseLanguageInArabic;
+    
+    @AndroidFindBy(accessibility = "arrowLeft")
+    private WebElement backButton;

    public SettingsPage(AppiumDriver driver) {
        super(driver);
@@ -74,6 +81,10 @@ public class SettingsPage extends BasePage {
    public boolean isSettingPageLoaded() {
        return this.isElementDisplayed(settingsTittle, "Setting page");
    }
+    
+    public boolean isSettingPageLoadedInFilipion() {
+        return this.isElementDisplayed(settingsTittle, "Mga setting");
+    }

    public UnlockApplicationPage clickOnLogoutButton() {
        clickOnElement(logoutButton);
@@ -88,10 +99,18 @@ public class SettingsPage extends BasePage {
    public void clickOnFilipinoLanguage() {
        clickOnElement(filipinoLanguageButton);
    }
+    
+    public void clickOnTamilLanguage() {
+        clickOnElement(tamilLanguageButton);
+    }

    public boolean verifyFilipinoLanguage() {
        return this.isElementDisplayed(wikaButton, "Filipino language");
    }
+    
+    public boolean verifyTamilLanguage() {
+        return this.isElementDisplayed(languageButton, "மொழி");
+    }

    public boolean verifyLanguagesInLanguageFilter() {
        List<String> expectedLanguages = Arrays.asList("English", "Filipino", "عربى", "हिंदी", "ಕನ್ನಡ", "தமிழ்");
@@ -119,10 +138,6 @@ public class SettingsPage extends BasePage {
    public boolean isReceivedCardsPresent() {
        return this.isElementDisplayed(receivedCards, "Received Cards");
    }
-    
-    public boolean verifyArabicLanguage() {
-        return this.isElementDisplayed(chooseLanguageInArabic, "فتح التطبيق");
-    }

    public CredentialRegistryPage clickOnCredentialRegistry() {
        clickOnElement(credentialRegistryText);
@@ -144,7 +159,13 @@ public class SettingsPage extends BasePage {
        return new AboutInjiPage(driver);
    }

-    public void clickOnArabicLanguageButton() {
+    public SettingsPage clickOnBackArrow() {
+        clickOnElement(backButton);
+        return this;
+    }
+    
+    public UnlockApplicationPage clickOnArabicLanguageButton() {
        clickOnElement(arabicLanguageButton);
+        return new UnlockApplicationPage(driver);
    }
 }
--- a/injitest/src/main/java/inji/pages/TrustedDigitalWalletPage.java
+++ b/injitest/src/main/java/inji/pages/TrustedDigitalWalletPage.java
@@ -7,15 +7,15 @@ import org.openqa.selenium.WebElement;

 public class TrustedDigitalWalletPage extends BasePage {

-    @AndroidFindBy(xpath = "//*[contains(@text,'Trusted Digital Wallet')]")
+    @AndroidFindBy(accessibility = "introTitle")
    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`label == \"Trusted Digital Wallet\"`]")
    private WebElement trustedDigitalWalletText;

-    @AndroidFindBy(xpath = "(//*[@class='android.widget.TextView'])[3]")
+    @AndroidFindBy(accessibility = "introText")
    @iOSXCUITFindBy(xpath = "//*[contains(@value,'Store and carry')]")
    private WebElement trustedDigitalWalletDescription;

-    @AndroidFindBy(xpath = "//*[@text='Next']")
+    @AndroidFindBy(accessibility = "next")
    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeOther[`label == \"Next\"`][4]")
    private WebElement nextButton;

--- a/injitest/src/main/java/inji/pages/UnlockApplicationPage.java
+++ b/injitest/src/main/java/inji/pages/UnlockApplicationPage.java
@@ -10,6 +10,10 @@ public class UnlockApplicationPage extends BasePage {
    @AndroidFindBy(accessibility = "unlockApplication")
    @iOSXCUITFindBy(accessibility = "unlockApplication")
    private WebElement unlockApplicationButton;
+    
+    @AndroidFindBy(accessibility = "unlockApplication")
+    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeButton[`label == \"فتح التطبيق\"`]")
+    private WebElement unlockApplicationButtonInArabic;

    public UnlockApplicationPage(AppiumDriver driver) {
        super(driver);
@@ -18,9 +22,17 @@ public class UnlockApplicationPage extends BasePage {
    public boolean isUnlockApplicationPageLoaded() {
        return this.isElementDisplayed(unlockApplicationButton, "Unlock application page");
    }
+    
+    public boolean isUnlockApplicationPageLoadedInArabic() {
+        return this.isElementDisplayed(unlockApplicationButtonInArabic, "Unlock application page");
+    }

    public EnterYourPasscodePage clickOnUnlockApplicationButton() {
        clickOnElement(unlockApplicationButton);
        return new EnterYourPasscodePage(driver);
    }
+    
+    public boolean isUnlockApplicationDisplayed() {
+        return this.isElementDisplayed(unlockApplicationButton,5, "Unlock Application");
+    }
 }
--- a/injitest/src/main/java/inji/pages/WelcomePage.java
+++ b/injitest/src/main/java/inji/pages/WelcomePage.java
@@ -24,6 +24,7 @@ public class WelcomePage extends BasePage {
    private WebElement nextButton;
    
    @AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Back\")")
+    @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeButton[`label == \"Back\"`][1]")
    public WebElement backButton;


--- a/injitest/src/main/java/inji/utils/CommonMethods.java
+++ b/injitest/src/main/java/inji/utils/CommonMethods.java
@@ -1,13 +1,8 @@
 package inji.utils;

-import inji.driver.DriverManager;
-import inji.exceptions.PlatformNotSupportException;
-import org.openqa.selenium.OutputType;
-
 import java.io.IOException;
-import java.net.MalformedURLException;

-public class CommonMethods {
+public class AndroidUtil {

    public static void invokeAppFromBackGroundAndroid() {
        try {
@@ -52,4 +47,4 @@ public class CommonMethods {
            e.printStackTrace();
        }
    }
-}
+}
--- a/injitest/src/main/java/inji/utils/IosUtil.java
+++ b/injitest/src/main/java/inji/utils/IosUtil.java
@@ -0,0 +1,44 @@
+package inji.utils;
+
+import io.appium.java_client.AppiumDriver;
+import org.openqa.selenium.Dimension;
+import org.openqa.selenium.Point;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Pause;
+import org.openqa.selenium.interactions.PointerInput;
+import org.openqa.selenium.interactions.Sequence;
+
+import java.time.Duration;
+import java.util.Collections;
+
+public class IosUtil {
+    public static void scrollToElement(AppiumDriver driver, int startX, int startY, int endX, int endY) {
+        PointerInput finger = new PointerInput(PointerInput.Kind.TOUCH, "first finger");
+        Sequence sequence = new Sequence(finger, 0)
+                .addAction(finger.createPointerMove(Duration.ZERO, PointerInput.Origin.viewport(), startX, startY))
+                .addAction(finger.createPointerDown(PointerInput.MouseButton.MIDDLE.asArg()))
+                .addAction(finger.createPointerMove(Duration.ofMillis(300), PointerInput.Origin.viewport(), endX, endY))
+                .addAction(finger.createPointerUp(PointerInput.MouseButton.MIDDLE.asArg()));
+
+        driver.perform(Collections.singleton(sequence));
+
+    }
+
+    public static void tapOnElement(AppiumDriver driver, WebElement element) {
+        Point location = element.getLocation();
+        Dimension size = element.getSize();
+
+        Point centerOfElement = new Point(location.getX() + size.getWidth() / 2,
+                location.getY() + size.getHeight() / 2);
+
+        PointerInput finger = new PointerInput(PointerInput.Kind.TOUCH, "finger1");
+        Sequence sequence = new Sequence(finger, 1)
+                .addAction(finger.createPointerMove(Duration.ZERO, PointerInput.Origin.viewport(), centerOfElement))
+                .addAction(finger.createPointerDown(PointerInput.MouseButton.LEFT.asArg()))
+                .addAction(new Pause(finger,Duration.ofMillis(1000)))
+                .addAction(finger.createPointerUp(PointerInput.MouseButton.LEFT.asArg()));
+
+        driver.perform(Collections.singleton(sequence));
+
+    }
+}
--- a/injitest/src/main/java/inji/utils/S3Adapter.java
+++ b/injitest/src/main/java/inji/utils/S3Adapter.java
@@ -1,187 +0,0 @@
-package inji.api.pojo;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import inji.api.ConfigManager;
-import inji.utils.StringUtils;
-import org.apache.log4j.Logger;
-import org.joda.time.DateTime;
-
-import com.amazonaws.ClientConfiguration;
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.client.builder.AwsClientBuilder;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import com.amazonaws.services.s3.model.ObjectMetadata;
-import com.amazonaws.services.s3.model.PutObjectRequest;
-
-
-public class S3Adapter {
-    private static final Logger logger = Logger.getLogger(S3Adapter.class);
-
-    private AmazonS3 connection = null;
-
-    private int maxRetry = 20;
-
-    private int maxConnection = 200;
-
-    private int retry = 0;
-
-    private boolean useAccountAsBucketname = true;
-
-    private static final String SEPARATOR = "/";
-
-    private int reportExpirationInDays = Integer.parseInt(ConfigManager.getReportExpirationInDays());
-
-    private List<String> existingBuckets = new ArrayList<>();
-
-    private AmazonS3 getConnection(String bucketName) {
-        if (connection != null)
-            return connection;
-
-        logger.info("ConfigManager.getS3UserKey() :: " + ConfigManager.getS3UserKey());
-        logger.info("ConfigManager.getS3Host() :: " + ConfigManager.getS3Host());
-        logger.info("ConfigManager.getS3Region() :: " + ConfigManager.getS3Region());
-        logger.info("ConfigManager.getS3SecretKey() :: " + ConfigManager.getS3SecretKey());
-        try {
-            AWSCredentials awsCredentials = new BasicAWSCredentials(ConfigManager.getS3UserKey(),
-                    ConfigManager.getS3SecretKey());
-            connection = AmazonS3ClientBuilder.standard()
-                    .withCredentials(new AWSStaticCredentialsProvider(awsCredentials)).enablePathStyleAccess()
-                    .withClientConfiguration(
-                            new ClientConfiguration().withMaxConnections(maxConnection).withMaxErrorRetry(maxRetry))
-                    .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(ConfigManager.getS3Host(),
-                            ConfigManager.getS3Region()))
-                    .build();
-
-            connection.doesBucketExistV2(bucketName);
-            retry = 0;
-        } catch (Exception e) {
-            if (retry >= maxRetry) {
-                // reset the connection and retry count
-                retry = 0;
-                connection = null;
-//                LOGGER.error(SESSIONID, REGISTRATIONID,"Maximum retry limit exceeded. Could not obtain connection for "+ bucketName +". Retry count :" + retry, ExceptionUtils.getStackTrace(e));
-//                throw new ObjectStoreAdapterException(OBJECT_STORE_NOT_ACCESSIBLE.getErrorCode(), OBJECT_STORE_NOT_ACCESSIBLE.getErrorMessage(), e);
-            } else {
-                connection = null;
-                retry = retry + 1;
-//                LOGGER.error(SESSIONID, REGISTRATIONID,"Exception occured while obtaining connection for "+ bucketName +". Will try again. Retry count : " + retry, ExceptionUtils.getStackTrace(e));
-                getConnection(bucketName);
-            }
-        }
-        return connection;
-    }
-
-    /*
-     * public boolean putObject(String account, final String container, String
-     * source, String process, String objectName, File file) { String
-     * finalObjectName = null; String bucketName = null;
-     * logger.info("useAccountAsBucketname:: "+useAccountAsBucketname); if
-     * (useAccountAsBucketname) { finalObjectName = getName(container, source,
-     * process, objectName); bucketName = account; } else { finalObjectName =
-     * getName(source, process, objectName); bucketName = container; }
-     * logger.info("bucketName :: "+bucketName); AmazonS3 connection =
-     * getConnection(bucketName); if (!doesBucketExists(bucketName)) {
-     * connection.createBucket(bucketName); if (useAccountAsBucketname)
-     * existingBuckets.add(bucketName); }
-     *
-     * connection.putObject(bucketName, finalObjectName, file); return true; }
-     */
-
-    public boolean putObject(String account, final String container, String source, String process, String objectName, File file) {
-        String finalObjectName = null;
-        String bucketName = null;
-        boolean bReturn = false;
-        logger.info("useAccountAsBucketname:: " + useAccountAsBucketname);
-        if (useAccountAsBucketname) {
-            finalObjectName = getName(container, source, process, objectName);
-            bucketName = account;
-        } else {
-            finalObjectName = getName(source, process, objectName);
-            bucketName = container;
-        }
-        logger.info("bucketName :: " + bucketName);
-        AmazonS3 connection = getConnection(bucketName);
-        if (connection != null) {
-            if (!doesBucketExists(bucketName)) {
-                connection.createBucket(bucketName);
-                if (useAccountAsBucketname)
-                    existingBuckets.add(bucketName);
-            }
-            PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, finalObjectName, file);
-            ObjectMetadata objectMetadata = new ObjectMetadata();
-            objectMetadata.setHttpExpiresDate(new DateTime().plusDays(reportExpirationInDays).toDate());
-            putObjectRequest.setMetadata(objectMetadata);
-            connection.putObject(putObjectRequest);
-            bReturn = true;
-        }
-        return bReturn;
-    }
-
-    private boolean doesBucketExists(String bucketName) {
-        // use account as bucket name and bucket name is present in existing bucket list
-        if (useAccountAsBucketname && existingBuckets.contains(bucketName))
-            return true;
-            // use account as bucket name and bucket name is not present in existing bucket
-            // list
-        else if (useAccountAsBucketname && !existingBuckets.contains(bucketName)) {
-            boolean doesBucketExistsInObjectStore = connection.doesBucketExistV2(bucketName);
-            if (doesBucketExistsInObjectStore)
-                existingBuckets.add(bucketName);
-            return doesBucketExistsInObjectStore;
-        } else
-            return connection.doesBucketExistV2(bucketName);
-    }
-
-    /*
-     * public boolean reportRetentionPolicy(String bucketName) {
-     *
-     * ObjectMetadata metadata = new ObjectMetadata(); logger.info("size:" +
-     * bytes.length); metadata.setContentLength(bytes.length);
-     * metadata.setContentType(contentType); Date expirationTime = new Date(2025, 5,
-     * 10); metadata.setExpirationTime(DateTime.now().toDate());
-     * metadata.setHeader("x-amz-object-lock-retain-until-date", closerDate +
-     * "T00:00:00.000Z"); metadata.setHeader("x-amz-object-lock-mode",
-     * "COMPLIANCE"); byte[] md5 = Md5Utils.computeMD5Hash(baInputStream); String
-     * md5Base64 = BinaryUtils.toBase64(md5); metadata.setHeader("Content-MD5",
-     * md5Base64); baInputStream.reset(); PutObjectRequest putRequest = new
-     * PutObjectRequest(bucketName, finalObjectName, baInputStream, metadata);
-     * s3client.putObject(putRequest);
-     *
-     *
-     * return true;
-     *
-     * }
-     */
-
-    public static String getName(String container, String source, String process, String objectName) {
-        String finalObjectName = "";
-        if (StringUtils.isNotEmpty(container))
-            finalObjectName = container + SEPARATOR;
-        if (StringUtils.isNotEmpty(source))
-            finalObjectName = finalObjectName + source + SEPARATOR;
-        if (StringUtils.isNotEmpty(process))
-            finalObjectName = finalObjectName + process + SEPARATOR;
-
-        finalObjectName = finalObjectName + objectName;
-
-        return finalObjectName;
-    }
-
-    public static String getName(String source, String process, String objectName) {
-        String finalObjectName = "";
-        if (StringUtils.isNotEmpty(source))
-            finalObjectName = source + SEPARATOR;
-        if (StringUtils.isNotEmpty(process))
-            finalObjectName = finalObjectName + process + SEPARATOR;
-
-        finalObjectName = finalObjectName + objectName;
-
-        return finalObjectName;
-    }
-}
--- a/injitest/src/main/java/inji/utils/StringUtils.java
+++ b/injitest/src/main/java/inji/utils/StringUtils.java
@@ -1,2 +0,0 @@
-package inji.utils;public class StringUtils {
-}
--- a/injitest/src/main/java/inji/utils/TestDataReader.java
+++ b/injitest/src/main/java/inji/utils/TestDataReader.java
@@ -24,11 +24,13 @@ public class TestDataReader {
            case "invalidOtp":
                return "666666";
            case "newuin":
-                return "7059849273";
+                return "2492180164";
            case "revokevid":
                return "6205860394830280";
+            case "vid":
+                return "8349769368792139";
            case "newaid":
-                return "10001100400008120231110021527";
+                return "10001101410012320231225215314";
            case "invalidpasscode":
                return "123456";
            case "invaliduin":
@@ -44,23 +46,23 @@ public class TestDataReader {
            case "phoneNumber":
                return "9876543210";
            case "generatedOn":
-                return "9/5/2023";
+                return "13/12/2023";
            case "dateOfBirth":
                return "01/01/1996";
            case "aid":
-                return "10001100660000620230714065538";
+                return "10001100050003220231220202338";
            case "setExcludedGroups":
                return "AVT,PVT";
            case "uin":
-                return "6920386351";
+                return "9685190798";
            case "uin2":
-                return "5740943928";
+                return "2073912798";
            case "uin2FullName":
-                return "fbgfhgfhghd";
+                return "TEST_FULLNAMEeng";
            case "newEnv":
-                return "https://api.qa-trinity.mosip.net";
+                return "https://api.dev.mosip.net";
            case "injiEnv":
-                return "https://api.qa-inji.mosip.net";
+                return "https://api.qa-inji1.mosip.net";
            case "invalidenv":
                return "https://api.dev3.mosip";
            case "isDeviceFarmRun":
--- a/injitest/src/main/resources/DesiredCapabilities.json
+++ b/injitest/src/main/resources/DesiredCapabilities.json
@@ -2,14 +2,15 @@
  {
    "name": "androidDevice",
    "caps": {
-      "appium:deviceName": "nightwatch-android-11",
+      "appium:udid": "SWT8IFV8F6WWQO8T",
      "appium:automationName": "UiAutomator2",
-      "appium:app": "/Users/kamalsingh/TestAutomation/Inji/inji/injitest/apps/android/Inji.apk",
+      "appium:app": "C:/Users/anup.nehe/Downloads/Sprint-17/Inji_universal.apk",
      "platformName": "android",
      "appium:appPackage": "io.mosip.residentapp",
      "appium:appActivity": "io.mosip.residentapp.MainActivity",
      "appium:noReset": false,
-      "appium:autoGrantPermissions": true
+      "appium:autoGrantPermissions": true,
+      "appium:shouldTerminateApp": true
    }
  },
  {
@@ -17,13 +18,14 @@
    "caps": {
      "appium:deviceName": "iPhone 15 Pro",
      "appium:automationName": "XCUITest",
-      "appium:app": "/Users/kamalsingh/TestAutomation/Inji/inji/injitest/apps/ios/Inji_ios.zip",
-      "platformName": "ios",
+      "appium:app": "/Users/kamalsingh/TestAutomation/Inji/inji/injitest/apps/ios/Inji_new.zip",
+      "platformName": "iOS",
      "appium:noReset": false,
      "appium:includeSafariInWebviews": true,
      "appium:newCommandTimeout": 3600,
      "appium:connectHardwareKeyboard": true,
-      "maxTypingFrequency": 30
+      "maxTypingFrequency": 30,
+      "appium:shouldTerminateApp": true
    }
  }
 ]
--- a/injitest/src/main/resources/TestData.json
+++ b/injitest/src/main/resources/TestData.json
@@ -3,9 +3,9 @@
  "passcode": "111111",
  "otp":"111111",
  "invalidOtp":"666666",
-  "newuin":"7059849273",
+  "newuin":"7315748562",
  "revokevid":"6205860394830280",
-  "newaid":"10001100400008120231110021527",
+  "newaid":"10001101410012320231225215314",
  "invalidpasscode": "123456",
  "invaliduin": "1234567891",
  "fullName": "TEST_FULLNAMEeng",
@@ -17,10 +17,10 @@
  "dateOfBirth": "01/01/1996",
  "aid": "10001100660000620230714065538",
  "setExcludedGroups":"AVT,PVT",
-  "uin": "6920386351",
+  "uin": "9685190798",
  "uin2": "5740943928",
  "uin2FullName": "fbgfhgfhghd",
-  "newEnv":"https://api.qa-trinity.mosip.net",
-  "injiEnv":"https://api.qa-inji.mosip.net",
+  "newEnv":"https://api.dev2.mosip.net",
+  "injiEnv":"https://api.qa-inji1.mosip.net",
  "invalidenv":"https://api.dev3.mosip"
 }
--- a/injitest/src/main/resources/appiumSetupDoc.docx
+++ b/injitest/src/main/resources/appiumSetupDoc.docx
--- a/injitest/src/main/resources/config.properties
+++ b/injitest/src/main/resources/config.properties
@@ -1,5 +1,5 @@
 ipAddress=127.0.0.1
-nodePath=/opt/homebrew/bin/node
-appiumServerExecutable=/opt/homebrew/lib/node_modules/appium/build/lib/main.js
+nodePath=C:/Program Files/nodejs/node
+appiumServerExecutable=C:/Users/anup.nehe/AppData/Roaming/npm/node_modules/appium/build/lib/main.js
 appiumLogFilePath=report/appiumLogs.txt
 startAppiumServer=true
--- a/injitest/src/main/resources/testng.xml
+++ b/injitest/src/main/resources/testng.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="All Test Suite" parallel="tests" thread-count="2">
+	<listeners>
+		<listener class-name="inji.listeners.Listeners" />
+	</listeners>
+	<test verbose="2" preserve-order="true" name="ios">
+		<parameter name="platformName" value="IOS" />
+		<classes>
+			<class name="iosTestCases.VcDownloadAndVerifyUsingUinTest">
+				<methods>
+					<include name="downloadAndVerifyVcUsingUin" />
+					<include name="downloadWithEmptyUin" />
+					<include name="generateMultipleVcWithSameUin" />
+					<include name="downloadMultipleVcUsingDifferentUin" />
+					<include name="verifyInvalidUinErrorMessage" />
+				</methods>
+			</class>
+		</classes>
+	</test>
+</suite>
--- a/injitest/src/test/java/BaseTest/AndroidBaseTest.java
+++ b/injitest/src/test/java/BaseTest/AndroidBaseTest.java
@@ -22,14 +22,14 @@ public class AndroidBaseTest extends BaseTest {
            throw new RuntimeException(e);
        }
        if (!isDeviceFarmRun) {
-            ScreenRecording.startAndroidScreenRecording(driver);
+          //  ScreenRecording.startAndroidScreenRecording(driver);
        }
    }

    @AfterMethod(alwaysRun = true)
    public void teardown(ITestResult result) {
        if (!isDeviceFarmRun) {
-            ScreenRecording.stopAndroidScreenRecording(driver, result.getMethod().getMethodName());
+        //    ScreenRecording.stopAndroidScreenRecording(driver, result.getMethod().getMethodName());
        }
        driver.quit();
    }
--- a/injitest/src/test/java/BaseTest/BaseTest.java
+++ b/injitest/src/test/java/BaseTest/BaseTest.java
@@ -16,7 +16,7 @@ public class BaseTest {
    public void beforeSuite() {
        if (!isDeviceFarmRun) {
            DriverManager.startAppiumServer();
-            //BaseTestCase.intiateUINGenration();
+          //  BaseTestCase.intiateUINGenration();
        }
    }

--- a/injitest/src/test/java/BaseTest/IosBaseTest.java
+++ b/injitest/src/test/java/BaseTest/IosBaseTest.java
@@ -12,7 +12,7 @@ import org.testng.annotations.Parameters;
 import java.net.MalformedURLException;

 public class IosBaseTest extends BaseTest {
-    @Parameters("platformName")
+   // @Parameters("platformName")
    @BeforeMethod(alwaysRun = true)
    public void setup(String platformName) {
        try {
--- a/injitest/src/test/java/androidTestCases/AboutInjiTest.java
+++ b/injitest/src/test/java/androidTestCases/AboutInjiTest.java
@@ -34,7 +34,7 @@ public class AboutInjiTest extends AndroidBaseTest {
        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
        AboutInjiPage aboutInjiPage = settingsPage.clickOnAbouInji();
        
-        assertTrue(aboutInjiPage.isaboutInjiHeaderDisplayed(),"Verify id about inji page displayed");
+        assertTrue(aboutInjiPage.isAboutInjiHeaderDisplayed(),"Verify id about inji page displayed");
        
        aboutInjiPage.clickOnCopy();
        assertTrue(aboutInjiPage.isAppidIsCopied(),"verify if app id is copied");
--- a/injitest/src/test/java/androidTestCases/ChangeLanguageTest.java
+++ b/injitest/src/test/java/androidTestCases/ChangeLanguageTest.java
@@ -116,8 +116,95 @@ public class ChangeLanguageTest extends AndroidBaseTest {
        SettingsPage settingsPage = homePage.clickOnSettingIcon();

        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
-        settingsPage.clickOnLanguage().clickOnArabicLanguageButton();
+        UnlockApplicationPage unlockApplicationPage = settingsPage.clickOnLanguage().clickOnArabicLanguageButton();

-        assertTrue(settingsPage.verifyArabicLanguage(), "Verify if language is changed to arabic");
+        assertTrue(unlockApplicationPage.isUnlockApplicationPageLoadedInArabic(), "Verify if language is changed to arabic");
+        
+    }
+    
+    @Test
+    public void changeLanguageToFilipionAndSearchIssuer() {
+        ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
+
+        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
+        WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
+
+        assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
+        AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
+
+        assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
+        SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
+
+        assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
+        ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.ANDROID);
+
+        assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
+        HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.ANDROID);
+
+        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
+        SettingsPage settingsPage = homePage.clickOnSettingIcon();
+
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        settingsPage.clickOnLanguage().clickOnFilipinoLanguage();
+
+        assertTrue(settingsPage.verifyFilipinoLanguage(), "Verify if language is changed to filipino");
+        settingsPage.clickOnBackArrow();
+        
+        assertTrue(homePage.isNoVCDownloadedInFilipino(),"Verify if bring your digital id text is visible in filipino");
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+        
+        assertTrue(addNewCardPage.isAddNewCardGuideMessageDisplayedInFillopin(),"verify if add new card guide message displayed in filipino");
+        assertTrue(addNewCardPage.isIssuerSearchBarDisplayedInFilipino(),"verify if search bar is displayed in filipino");
+        addNewCardPage.IssuerSearchBar("uin");
+        
+        assertTrue(addNewCardPage.isDownloadViaUinDisplayed(),"verify if download via uin vid aid");
+        addNewCardPage.clickOnBack();
+        
+        homePage.downloadCard();
+        addNewCardPage.IssuerSearchBar("e-signet");
+        assertTrue(addNewCardPage.isDownloadViaEsignetDisplayed(),"verify if download via e-signet is displayed");
+    }
+    
+    @Test
+    public void changeLanguageToFilipionAndSearchIssuerEnterIncompleteName() {
+        ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
+
+        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
+        WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
+
+        assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
+        AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
+
+        assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
+        SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
+
+        assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
+        ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.ANDROID);
+
+        assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
+        HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.ANDROID);
+
+        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
+        SettingsPage settingsPage = homePage.clickOnSettingIcon();
+
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        settingsPage.clickOnLanguage().clickOnFilipinoLanguage();
+
+        assertTrue(settingsPage.verifyFilipinoLanguage(), "Verify if language is changed to filipino");
+        settingsPage.clickOnBackArrow();
+        
+        assertTrue(homePage.isNoVCDownloadedInFilipino(),"Verify if bring your digital id text is visible in filipino");
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+        
+        assertTrue(addNewCardPage.isAddNewCardGuideMessageDisplayedInFillopin(),"verify if add new card guide message displayed in filipino");
+        assertTrue(addNewCardPage.isIssuerSearchBarDisplayedInFilipino(),"verify if search bar is displayed in filipino");
+        addNewCardPage.IssuerSearchBar("ui");
+        
+        assertTrue(addNewCardPage.isDownloadViaUinDisplayed(),"verify if download via uin vid aid");
+        addNewCardPage.clickOnBack();
+        
+        homePage.downloadCard();
+        addNewCardPage.IssuerSearchBar("e-si");
+        assertTrue(addNewCardPage.isDownloadViaEsignetDisplayed(),"verify if download via e-signet is displayed");
    }
 }
--- a/injitest/src/test/java/androidTestCases/CredentialRegistryTest.java
+++ b/injitest/src/test/java/androidTestCases/CredentialRegistryTest.java
@@ -72,8 +72,8 @@ public class CredentialRegistryTest extends AndroidBaseTest {
        moreOptionsPage.clickOnCloseButton();
        
        DetailedVcViewPage detailedVcViewPage = homePage.openDetailedVcView(TestDataReader.readData("fullName"));
-        assertEquals(detailedVcViewPage.isCredentialRegistryTextDisplayed(),"Verify if is credential registry text displayed");
-        assertEquals(detailedVcViewPage.isCredentialRegistryValueDisplayed(), TestDataReader.readData("newEnv"), "Verify changed env is displayed in detailed vc");
+        assertTrue(detailedVcViewPage.isCredentialRegistryTextDisplayed(),"Verify if is credential registry text displayed");
+        assertEquals(detailedVcViewPage.getCredentialRegistryValue(), TestDataReader.readData("newEnv"), "Verify changed env is displayed in detailed vc");
 	}
 	
 	@Test
@@ -111,7 +111,7 @@ public class CredentialRegistryTest extends AndroidBaseTest {
        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");

        settingsPage.clickOnCredentialRegistry();
-        assertEquals(credentialRegistryPage.checkEnvNotChanged(),"https://api.qa-inji.mosip.net");
+        assertEquals(credentialRegistryPage.checkEnvNotChanged(),TestDataReader.readData("injiEnv"));
 	}
 	
 	@Test
@@ -403,7 +403,7 @@ public class CredentialRegistryTest extends AndroidBaseTest {
        CredentialRegistryPage credentialRegistryPage =settingsPage.clickOnCredentialRegistry();
        
        assertTrue(credentialRegistryPage.isCredentialRegistryTextBoxHeaderDisplayed(), "Verify if CredentialRegistry page is displayed");
-        credentialRegistryPage.setEnterIdTextBox(TestDataReader.readData("newEnv")).setEnterIdToEsignetTextBox(TestDataReader.readData("newEnv")).clickOnSaveButton();
+        credentialRegistryPage.setEnterIdTextBox(TestDataReader.readData("newEnv")).enterUrlToEsignetHostTextBox(TestDataReader.readData("newEnv")).clickOnSaveButton();
       
        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
        credentialRegistryPage.clickOnBackArrow();
@@ -433,7 +433,7 @@ public class CredentialRegistryTest extends AndroidBaseTest {
        assertTrue(detailedVcViewPage.isEsignetLogoDisplayed(), "Verify if detailed Vc esignet logo is displayed");
        assertTrue(detailedVcViewPage.isDetailedVcViewPageLoaded(), "Verify if detailed Vc view page is displayed");
        assertEquals(detailedVcViewPage.getNameInDetailedVcView(), TestDataReader.readData("fullName"), "Verify if full name is displayed");
-        assertEquals(detailedVcViewPage.getDateOfBirthInDetailedVcView(), TestDataReader.readData("dateOfBirth"), "Verify if date of birth is displayed");
+        //assertEquals(detailedVcViewPage.getDateOfBirthInDetailedVcView(), TestDataReader.readData("dateOfBirth"), "Verify if date of birth is displayed");
        assertEquals(detailedVcViewPage.getGenderInDetailedVcView(), TestDataReader.readData("gender"), "Verify if gender is displayed");
        assertEquals(detailedVcViewPage.getIdTypeValueInDetailedVcView(), TestDataReader.readData("idType"), "Verify if id type is displayed");
        assertEquals(detailedVcViewPage.getStatusInDetailedVcView(), TestDataReader.readData("status"), "Verify if status is displayed");
@@ -469,7 +469,7 @@ public class CredentialRegistryTest extends AndroidBaseTest {
        CredentialRegistryPage credentialRegistryPage =settingsPage.clickOnCredentialRegistry();
        
        assertTrue(credentialRegistryPage.isCredentialRegistryTextBoxHeaderDisplayed(), "Verify if CredentialRegistry page is displayed");
-        credentialRegistryPage.setEnterIdTextBox(TestDataReader.readData("invalidenv")).setEnterIdToEsignetTextBox(TestDataReader.readData("invalidenv")).clickOnSaveButton();
+        credentialRegistryPage.setEnterIdTextBox(TestDataReader.readData("invalidenv")).enterUrlToEsignetHostTextBox(TestDataReader.readData("invalidenv")).clickOnSaveButton();

        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
        credentialRegistryPage.clickOnBackArrow();
@@ -478,4 +478,53 @@ public class CredentialRegistryTest extends AndroidBaseTest {
        assertTrue(homePage.isNoInternetConnectionDisplayed(), "Verify if no internet connection is displayed");
 	}
 	
+	@Test
+	public void downloadAndVerifyVcInInvalidEnvForEsignetInFillpino() throws InterruptedException {
+		UnlockApplicationPage unlockApplicationPage = new UnlockApplicationPage(driver);
+		if (unlockApplicationPage.isUnlockApplicationDisplayed() == false) {
+			ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
+			assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
+
+			WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
+
+			assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
+			AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
+
+			assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
+			SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
+
+			assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
+			ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"),
+					Target.ANDROID);
+
+			assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
+			HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.ANDROID);
+		} else {
+			HomePage homePage = new HomePage(driver);
+			unlockApplicationPage.clickOnUnlockApplicationButton();
+
+			ConfirmPasscode confirmPasscode = new ConfirmPasscode(driver);
+			homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.ANDROID);
+		}
+
+		HomePage homePage = new HomePage(driver);
+		assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
+		SettingsPage settingsPage = homePage.clickOnSettingIcon();
+
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        settingsPage.clickOnLanguage().clickOnFilipinoLanguage();
+
+        assertTrue(settingsPage.verifyFilipinoLanguage(), "Verify if language is changed to filipino");
+        CredentialRegistryPage credentialRegistryPage =settingsPage.clickOnCredentialRegistry();
+        
+        assertTrue(credentialRegistryPage.isCredentialRegistryTextBoxHeaderInFilipinoDisplayed(), "Verify if CredentialRegistry page is displayed");
+        credentialRegistryPage.setEnterIdTextBox(TestDataReader.readData("invalidenv")).enterUrlToEsignetHostTextBox(TestDataReader.readData("invalidenv")).clickOnSaveButton();
+
+        assertTrue(settingsPage.isSettingPageLoadedInFilipion(), "Verify if setting page is displayed in filipino");
+        credentialRegistryPage.clickOnBackArrow();
+        
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+        assertTrue(homePage.isNoInternetConnectionDisplayedFlillpino(), "Verify if no internet connection is displayed in filipino");
+	}
+	
 }
--- a/injitest/src/test/java/androidTestCases/NoNetworkAndroidTest.java
+++ b/injitest/src/test/java/androidTestCases/NoNetworkAndroidTest.java
@@ -4,7 +4,7 @@ import BaseTest.AndroidBaseTest;
 import inji.api.BaseTestCase;
 import inji.constants.Target;
 import inji.pages.*;
-import inji.utils.CommonMethods;
+import inji.utils.AndroidUtil;
 import inji.utils.TestDataReader;
 import org.testng.annotations.Test;

@@ -18,7 +18,7 @@ public class NoNetworkAndroidTest extends AndroidBaseTest {

    @Test
    public void setupPasscodeAndDownloadCardWithoutInternet() {
-        CommonMethods.enableAirplaneMode();
+    	AndroidUtil.enableAirplaneMode();

        ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);

@@ -42,7 +42,7 @@ public class NoNetworkAndroidTest extends AndroidBaseTest {

        assertTrue(homePage.isNoInternetConnectionDisplayed(), "Verify if no internet connection is displayed");
        assertTrue(homePage.isTryAgainButtonDisplayed(), "Verify if Try again button displayed");
-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
        
        assertTrue(homePage.isTryAgainButtonDisplayed(), "Verify if Try again button displayed");

@@ -86,9 +86,9 @@ public class NoNetworkAndroidTest extends AndroidBaseTest {

        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");

-        CommonMethods.enableAirplaneMode();
+        AndroidUtil.enableAirplaneMode();
        assertTrue(homePage.clickOnScanButton().acceptPermissionPopup().isCameraOpen());
-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
    }
    @Test
    public void activateVcWithoutInternet() throws InterruptedException {
@@ -123,7 +123,7 @@ public class NoNetworkAndroidTest extends AndroidBaseTest {
        otpVerification.enterOtp(BaseTestCase.getOtp(), Target.ANDROID);

        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
-        CommonMethods.enableAirplaneMode();
+        AndroidUtil.enableAirplaneMode();

        MoreOptionsPage moreOptionsPage = homePage.clickOnMoreOptionsButton();

@@ -134,13 +134,13 @@ public class NoNetworkAndroidTest extends AndroidBaseTest {
        OtpVerificationPage otpVerificationPage = pleaseConfirmPopupPage.clickOnConfirmButton();

        assertTrue(otpVerificationPage.somethingWetWrongInVcActivationDisplayed(), "Verify if Something is wrong. Please try again later! is displayed");
-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();

    }

    @Test
    public void verifyListOfLanguagesInOfflineMode() {
-        CommonMethods.enableAirplaneMode();
+    	AndroidUtil.enableAirplaneMode();
        ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);

        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
@@ -165,12 +165,12 @@ public class NoNetworkAndroidTest extends AndroidBaseTest {
        settingsPage.clickOnLanguage();

        assertTrue(settingsPage.verifyLanguagesInLanguageFilter(), "Verify if all languages are shown in language filter");
-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
    }
    
    @Test
    public void verifyHelpPageOfflineMode() {
-    	CommonMethods.enableAirplaneMode();
+    	AndroidUtil.enableAirplaneMode();

        ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);

@@ -196,7 +196,7 @@ public class NoNetworkAndroidTest extends AndroidBaseTest {
        helpPage.exitHelpPage();

        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
    }
    
    @Test
@@ -231,7 +231,7 @@ public class NoNetworkAndroidTest extends AndroidBaseTest {
        otpVerification.enterOtp(BaseTestCase.getOtp(), Target.ANDROID);

        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
-        CommonMethods.enableAirplaneMode();
+        AndroidUtil.enableAirplaneMode();

        MoreOptionsPage moreOptionsPage = homePage.clickOnMoreOptionsButton();
        assertTrue(moreOptionsPage.isMoreOptionsPageLoaded(), "Verify if more options page is displayed");
@@ -241,7 +241,7 @@ public class NoNetworkAndroidTest extends AndroidBaseTest {

        pleaseConfirmPopupPage.clickOnConfirmButton();

-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
        assertTrue(homePage.isNoVCDownloaded(), "Verify if VC is removed");
    }
    
@@ -278,7 +278,7 @@ public class NoNetworkAndroidTest extends AndroidBaseTest {
        otpVerification.enterOtp(BaseTestCase.getOtp(), Target.ANDROID);

        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
-        CommonMethods.enableAirplaneMode();
+        AndroidUtil.enableAirplaneMode();

        DetailedVcViewPage detailedVcViewPage = homePage.openDetailedVcView(TestDataReader.readData("fullName"));
        detailedVcViewPage.clickOnQrCodeButton();
@@ -287,12 +287,12 @@ public class NoNetworkAndroidTest extends AndroidBaseTest {
        detailedVcViewPage.clickOnQrCrossIcon();
        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
        
-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
    }
    
    @Test
    public void verifyRecivedCardOffline() throws InterruptedException {
-    	 CommonMethods.enableAirplaneMode();
+    	AndroidUtil.enableAirplaneMode();
    	ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);

        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
@@ -318,12 +318,12 @@ public class NoNetworkAndroidTest extends AndroidBaseTest {
        assertTrue(receiveCardPage.isReceiveCardHederDisplayed(), "Verify if QR code  header is displayed");
        
        assertTrue(receiveCardPage.isWaitingForConnectionDisplayed(), "Verify if waiting for connection displayed");
-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
    }
    
    @Test
    public void downloadCardWithoutInternetRetryWithInternet() throws InterruptedException {
-        CommonMethods.enableAirplaneMode();
+    	AndroidUtil.enableAirplaneMode();

        ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);

@@ -349,7 +349,7 @@ public class NoNetworkAndroidTest extends AndroidBaseTest {
        assertTrue(homePage.isNoInternetConnectionDisplayed(), "Verify if no internet connection is displayed");
        assertTrue(homePage.isTryAgainButtonDisplayed(), "Verify if try again button displayed");

-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
        assertTrue(homePage.isTryAgainButtonNotDisplayed(), "Wating for network come online");
        
        homePage.clickOnTryAgainButton();
@@ -358,7 +358,7 @@ public class NoNetworkAndroidTest extends AndroidBaseTest {
    
    @Test
    public void downloadVcUsingUinViaEsignetWithoutInternet() throws InterruptedException {
-    	CommonMethods.enableAirplaneMode();
+    	AndroidUtil.enableAirplaneMode();
        ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);

        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
@@ -381,7 +381,7 @@ public class NoNetworkAndroidTest extends AndroidBaseTest {

        assertTrue(homePage.isNoInternetConnectionDisplayed(), "Verify if no internet connection is displayed");
        assertTrue(homePage.isTryAgainButtonDisplayed(), "Verify if Try again button displayed");
-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
        
        homePage.clickOnTryAgainButton();
        assertTrue(homePage.isTryAgainButtonNotDisplayed(), "Verify if Try again button displayed");
@@ -431,12 +431,12 @@ public class NoNetworkAndroidTest extends AndroidBaseTest {
        esignetLoginPage.clickOnVerifyButton();
        
        assertTrue(esignetLoginPage.isProgressingLogoDisplayed(),"verify if Progressing page is displayed");
-        CommonMethods.enableAirplaneMode();
+        AndroidUtil.enableAirplaneMode();
        
        assertTrue(homePage.isNoInternetConnectionDisplayed(), "Verify if no internet connection is displayed");
        addNewCardPage.clickOnBack();
        
-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
    }
    
@@ -478,7 +478,7 @@ public class NoNetworkAndroidTest extends AndroidBaseTest {
        esignetLoginPage.clickOnVerifyButton();
        
        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
-        CommonMethods.enableAirplaneMode();
+        AndroidUtil.enableAirplaneMode();
        MoreOptionsPage moreOptionsPage = homePage.clickOnMoreOptionsButton();

        assertTrue(moreOptionsPage.isMoreOptionsPageLoaded(), "Verify if more options page is displayed");
@@ -489,7 +489,7 @@ public class NoNetworkAndroidTest extends AndroidBaseTest {

        assertTrue(moreOptionsPage.isMoreOptionsPageLoaded(), "Verify if more options page is displayed");
        moreOptionsPage.clickOnPinOrUnPinCard();
-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
    }
    
    @Test
@@ -532,10 +532,113 @@ public class NoNetworkAndroidTest extends AndroidBaseTest {
        
        assertTrue(esignetLoginPage.isProgressingLogoDisplayed(),"verify if Progressing page is displayed");
        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
-        CommonMethods.enableAirplaneMode();
+        AndroidUtil.enableAirplaneMode();
        
        assertTrue(homePage.clickOnScanButton().acceptPermissionPopup().isCameraOpen());
-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
+    }
+    
+    @Test
+    public void downloadVcInOtherLanguageViaEsignetWithoutInternet() throws InterruptedException {
+    	AndroidUtil.enableAirplaneMode();
+    	UnlockApplicationPage unlockApplicationPage = new UnlockApplicationPage(driver);
+		if (unlockApplicationPage.isUnlockApplicationDisplayed() == false) {
+			ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
+			assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
+
+			WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
+
+			assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
+			AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
+
+			assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
+			SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
+
+			assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
+			ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"),
+					Target.ANDROID);
+
+			assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
+			HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.ANDROID);
+		} else {
+			HomePage homePage = new HomePage(driver);
+			unlockApplicationPage.clickOnUnlockApplicationButton();
+
+			ConfirmPasscode confirmPasscode = new ConfirmPasscode(driver);
+			homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.ANDROID);
+		}
+
+		HomePage homePage = new HomePage(driver);
+		assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");        SettingsPage settingsPage = homePage.clickOnSettingIcon();
+
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        settingsPage.clickOnLanguage().clickOnFilipinoLanguage();
+
+        assertTrue(settingsPage.verifyFilipinoLanguage(), "Verify if language is changed to filipino");
+        settingsPage.clickOnBackArrow();
+        
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+
+        assertTrue(homePage.isNoInternetConnectionDisplayedFlillpino(), "Verify if no internet connection is displayed in flillpino");
+        assertTrue(homePage.isTryAgainButtonDisplayedInFlillpino(), "Verify if Try again button displayed in flillpino");
+        
+        addNewCardPage.isBackButtonDisplayed();
+        AndroidUtil.disableAirplaneMode();
+        
+         homePage.clickOnTryAgainButtonInFlillpino();
+         assertTrue(homePage.isTryAgainButtonNotDisplayedInFlillpino(), "Verify if Try again button displayed");
+//        
+        homePage.clickOnTryAgainButtonInFlillpino();
+        assertTrue(addNewCardPage.isAddNewCardGuideMessageDisplayedInFillopin(), "Verify if add new card page guide is displayed in fillpino");
+//        
+       EsignetLoginPage esignetLoginPage =  addNewCardPage.clickOnDownloadViaEsignet();
+       assertTrue(esignetLoginPage.isEsignetLoginPageDisplayed(), "Verify if esignet login page displayed");
+       esignetLoginPage.clickOnEsignetLoginWithOtpButton();
+       
+       assertTrue(esignetLoginPage.isEnterYourVidTextDisplayed(), "Verify if enter your vid text is displayed");
+       OtpVerificationPage otpVerification= esignetLoginPage.setEnterIdTextBox(TestDataReader.readData("uin"));
+       
+       esignetLoginPage.clickOnGetOtpButton();
+       assertTrue(esignetLoginPage.isOtpHasSendMessageDisplayed(),"verify if otp page is displayed");
+       
+       otpVerification.enterOtpForEsignet(TestDataReader.readData("otp"), Target.ANDROID);
+       esignetLoginPage.clickOnVerifyButton();
+       
+       assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
+    }
+    
+    @Test
+    public void changeLanguageToTamilWithoutNetwork() {
+    	AndroidUtil.enableAirplaneMode();
+        ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
+
+        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
+        WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
+
+        assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
+        AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
+
+        assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
+        SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
+
+        assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
+        ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.ANDROID);
+
+        assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
+        HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.ANDROID);
+
+        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
+        SettingsPage settingsPage = homePage.clickOnSettingIcon();
+
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        settingsPage.clickOnLanguage().clickOnTamilLanguage();
+
+        assertTrue(settingsPage.verifyTamilLanguage(), "Verify if language is changed to tamil");
+        settingsPage.clickOnBackArrow();
+        
+        homePage.downloadCard();
+        assertTrue(homePage.isNoInternetConnectionDisplayed(), "Verify if no internet connection is displayed");
+        assertTrue(homePage.isNoInternetConnectionDisplayedInTamil(), "Verify if try again in tamil is displayed");
    }
    
 }
--- a/injitest/src/test/java/androidTestCases/PinVcTest.java
+++ b/injitest/src/test/java/androidTestCases/PinVcTest.java
@@ -54,6 +54,13 @@ public class PinVcTest extends AndroidBaseTest {
        moreOptionsPage.clickOnPinOrUnPinCard();

        assertTrue(homePage.isPinIconDisplayed(), "Verify if pin icon on vc is displayed");
+        
+        homePage.clickOnMoreOptionsButton();
+        HistoryPage historyPage= moreOptionsPage.clickOnViewActivityLog();
+        assertTrue(historyPage.verifyActivityLogHeader(TestDataReader.readData("uin"), Target.ANDROID));
+        assertTrue(historyPage.verifyHistory(TestDataReader.readData("uin"), Target.ANDROID));
+        assertTrue(historyPage.verifyPinHistory(TestDataReader.readData("uin"), Target.ANDROID));
+        
    }
    
    //For IOS bluetooth does not support in simulator, so we can't automate
@@ -97,7 +104,8 @@ public class PinVcTest extends AndroidBaseTest {
        assertTrue(homePage.isPinIconDisplayed(), "Verify if pin icon on vc is displayed");
        ScanPage scanPage=homePage.clickOnScanButton();
        
-        assertTrue(scanPage.isCameraPageLoaded(), "Verify if pin icon on vc is displayed");
+        scanPage.acceptPermissionPopup();
+        assertTrue(scanPage.isCameraPageLoaded(), "Verify camera page is displayed");
        assertTrue(scanPage.isFlipCameraClickable(),"Verify if flip camera is enabled");
    }
    
--- a/injitest/src/test/java/androidTestCases/UnlockWithPasscodeTest.java
+++ b/injitest/src/test/java/androidTestCases/UnlockWithPasscodeTest.java
@@ -77,7 +77,7 @@ public class UnlockWithPasscodeTest extends AndroidBaseTest {
        EnterYourPasscodePage enterYourPasscodePage = unlockApplicationPage.clickOnUnlockApplicationButton();

        assertTrue(enterYourPasscodePage.isEnterYourPasscodePageLoaded(), "Verify if enter your passcode page is displayed");
-        enterYourPasscodePage.enterYourPasscode(TestDataReader.readData("invalidPasscode"), Target.ANDROID);
+        enterYourPasscodePage.enterYourPasscode(TestDataReader.readData("invalidpasscode"), Target.ANDROID);

        assertTrue(confirmPasscode.isPasscodeInvalidMessageDisplayed(), "verify if invalid passcode is displayed");
    	
--- a/injitest/src/test/java/androidTestCases/VcDownloadAndVerifyUsingEsignetTest.java
+++ b/injitest/src/test/java/androidTestCases/VcDownloadAndVerifyUsingEsignetTest.java
@@ -16,7 +16,7 @@ import static org.testng.Assert.*;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;

-public class VcDownloadAndVerifyUsingEsignetTest extends BaseTest {
+public class VcDownloadAndVerifyUsingEsignetTest extends AndroidBaseTest {
    @Test
    public void downloadAndVerifyVcUsingUinViaEsignet() throws InterruptedException {
        ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
@@ -39,14 +39,18 @@ public class VcDownloadAndVerifyUsingEsignetTest extends BaseTest {
        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
        AddNewCardPage addNewCardPage = homePage.downloadCard();

+        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
+        assertTrue(addNewCardPage.isIssuerDescriptionMosipDisplayed(), "Verify if issuer description  mosip displayed");
+        assertTrue(addNewCardPage.isIssuerDescriptionEsignetDisplayed(), "Verify if issuer description  esignet displayed");
+        assertTrue(addNewCardPage.isIssuerSearchBarDisplayed(), "Verify if issuer search bar displayed");
+        addNewCardPage.IssuerSearchBar("e-signet");
        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
        assertTrue(addNewCardPage.isAddNewCardGuideMessageDisplayed(), "Verify if add new card guide message displayed");
-        assertTrue(addNewCardPage.isDownloadViaUinDisplayed(), "Verify if download via uin displayed");
        assertTrue(addNewCardPage.isDownloadViaEsignetDisplayed(), "Verify if download via uin displayed");
        EsignetLoginPage esignetLoginPage =  addNewCardPage.clickOnDownloadViaEsignet();

-        assertTrue(esignetLoginPage.isLoadingPageTextLoaded(), "Verify if loading page displayed");
-        assertTrue(esignetLoginPage.isSettingUpTextDisplayed(), "Verify if loading page displayed");
+//      assertTrue(esignetLoginPage.isLoadingPageTextLoaded(), "Verify if loading page displayed");
+//      assertTrue(esignetLoginPage.isSettingUpTextDisplayed(), "Verify if loading page displayed");
        assertTrue(esignetLoginPage.isEsignetLoginPageDisplayed(), "Verify if esignet login page displayed");
        esignetLoginPage.clickOnEsignetLoginWithOtpButton();
        
@@ -89,8 +93,6 @@ public class VcDownloadAndVerifyUsingEsignetTest extends BaseTest {
        
        detailedVcViewPage.clickOnCrossIcon();
        assertTrue(detailedVcViewPage.isEsignetLogoDisplayed(), "Verify if detailed Vc esignet logo is displayed");
-        
-        
    }
    
    @Test
@@ -122,7 +124,7 @@ public class VcDownloadAndVerifyUsingEsignetTest extends BaseTest {
        esignetLoginPage.clickOnEsignetLoginWithOtpButton();
        
        assertTrue(esignetLoginPage.isEnterYourVidTextDisplayed(), "Verify if enter your vid text is displayed");
-        OtpVerificationPage otpVerification= esignetLoginPage.setEnterIdTextBox(BaseTestCase.perpetualVid);
+        OtpVerificationPage otpVerification= esignetLoginPage.setEnterIdTextBox(TestDataReader.readData("vid"));
        esignetLoginPage.clickOnGetOtpButton();
        Thread.sleep(3000);
        otpVerification.enterOtpForEsignet(TestDataReader.readData("otp"), Target.ANDROID);
--- a/injitest/src/test/java/androidTestCases/VcDownloadAndVerifyUsingUinTest.java
+++ b/injitest/src/test/java/androidTestCases/VcDownloadAndVerifyUsingUinTest.java
@@ -33,8 +33,12 @@ public class VcDownloadAndVerifyUsingUinTest extends AndroidBaseTest {

        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
        AddNewCardPage addNewCardPage = homePage.downloadCard();
-
+        
        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
+        assertTrue(addNewCardPage.isIssuerDescriptionMosipDisplayed(), "Verify if issuer description  mosip displayed");
+        assertTrue(addNewCardPage.isIssuerDescriptionEsignetDisplayed(), "Verify if issuer description  esignet displayed");
+        assertTrue(addNewCardPage.isIssuerSearchBarDisplayed(), "Verify if issuer search bar displayed");
+        addNewCardPage.IssuerSearchBar("uin");
        RetrieveIdPage retrieveIdPage = addNewCardPage.clickOnDownloadViaUin();

        assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
@@ -227,4 +231,42 @@ public class VcDownloadAndVerifyUsingUinTest extends AndroidBaseTest {

        assertTrue(retrieveIdPage.isIncorrectInputFormatErrorMessageDisplayed());
    }
-}
+    
+    @Test
+    public void verifyOtpTimeOutAndGoBack() throws InterruptedException {
+    	ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
+
+        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
+        WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
+
+        assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
+        AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
+
+        assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
+        SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
+
+        assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
+        ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.ANDROID);
+
+        assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
+        HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.ANDROID);
+
+        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+
+        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
+        RetrieveIdPage retrieveIdPage = addNewCardPage.clickOnDownloadViaUin();
+
+        assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
+        OtpVerificationPage otpVerification = retrieveIdPage.setEnterIdTextBox(TestDataReader.readData("uin")).clickOnGenerateCardButton();
+
+        assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
+        assertTrue(otpVerification.verifyOtpVerificationTimerCompleted(), "Verify timer has stop for otp verification");
+        assertTrue(otpVerification.verifyResendCodeButtonDisplayed(), "Verify if resend code is displayed");
+        
+        otpVerification.clickOnCrossIcon();
+        assertTrue(otpVerification.confirmPopupHeaderDisplayed(), "Verify if comfirm popup displayed");
+        otpVerification.clickOnCancelPopupButton();
+        assertTrue(homePage.isNoVCDownloaded(), "Verify if VC is removed");
+    }
+}
--- a/injitest/src/test/java/androidTestCases/VcDownloadAndVerifyUsingVidTest.java
+++ b/injitest/src/test/java/androidTestCases/VcDownloadAndVerifyUsingVidTest.java
@@ -38,7 +38,7 @@ public class VcDownloadAndVerifyUsingVidTest extends AndroidBaseTest {
        RetrieveIdPage retrieveIdPage = addNewCardPage.clickOnDownloadViaUin();

        assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
-        OtpVerificationPage otpVerification = retrieveIdPage.clickOnVid(Target.ANDROID).setEnterIdTextBox(BaseTestCase.perpetualVid).clickOnGenerateCardButton();
+        OtpVerificationPage otpVerification = retrieveIdPage.clickOnVid(Target.ANDROID).setEnterIdTextBox(TestDataReader.readData("vid")).clickOnGenerateCardButton();

        assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
        otpVerification.enterOtp(BaseTestCase.getOtp(), Target.ANDROID);
@@ -75,7 +75,7 @@ public class VcDownloadAndVerifyUsingVidTest extends AndroidBaseTest {
        RetrieveIdPage retrieveIdPage = addNewCardPage.clickOnDownloadViaUin();

        assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
-        OtpVerificationPage otpVerification = retrieveIdPage.clickOnVid(Target.ANDROID).setEnterIdTextBox(BaseTestCase.perpetualVid).clickOnGenerateCardButton();
+        OtpVerificationPage otpVerification = retrieveIdPage.clickOnVid(Target.ANDROID).setEnterIdTextBox(TestDataReader.readData("vid")).clickOnGenerateCardButton();

        assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
        otpVerification.enterOtp(BaseTestCase.getOtp(), Target.ANDROID);
@@ -88,12 +88,12 @@ public class VcDownloadAndVerifyUsingVidTest extends AndroidBaseTest {
         addNewCardPage.clickOnDownloadViaUin();

        assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
-         retrieveIdPage.clickOnVid(Target.ANDROID).setEnterIdTextBox(BaseTestCase.perpetualVid).clickOnGenerateCardButton();
+         retrieveIdPage.clickOnVid(Target.ANDROID).setEnterIdTextBox(TestDataReader.readData("vid")).clickOnGenerateCardButton();

        assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
        otpVerification.enterOtp(BaseTestCase.getOtp(), Target.ANDROID);

-        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
+        assertTrue(homePage.isSecondNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
        //
        MoreOptionsPage moreOptionsPage = homePage.clickOnMoreOptionsButton();
        assertTrue(moreOptionsPage.isMoreOptionsPageLoaded(), "Verify if more options page is displayed");
--- a/injitest/src/test/java/androidTestCases/VerifyHelpPageTest.java
+++ b/injitest/src/test/java/androidTestCases/VerifyHelpPageTest.java
@@ -38,6 +38,7 @@ public class VerifyHelpPageTest extends AndroidBaseTest {
        
        assertEquals(helpPage.ishelpPageContentEmpty(),false,"verifying text is not empty");
        helpPage.scrollPerformInHelpPage();
+        assertTrue(helpPage.isBiometricIsChangeTextdDiscription(), "Verify if biometric is  text change displayed");

        assertTrue(helpPage.isHelpPageLoaded(), "Verify if help page is displayed");
        helpPage.exitHelpPage();
--- a/injitest/src/test/java/androidTestCases/VerifyHistoryTest.java
+++ b/injitest/src/test/java/androidTestCases/VerifyHistoryTest.java
@@ -303,7 +303,7 @@ public class VerifyHistoryTest extends AndroidBaseTest {
        esignetLoginPage.clickOnEsignetLoginWithOtpButton();
        
        assertTrue(esignetLoginPage.isEnterYourVidTextDisplayed(), "Verify if enter your vid text is displayed");
-        OtpVerificationPage otpVerification= esignetLoginPage.setEnterIdTextBox(BaseTestCase.perpetualVid);
+        OtpVerificationPage otpVerification= esignetLoginPage.setEnterIdTextBox(TestDataReader.readData("vid"));
        
        esignetLoginPage.clickOnGetOtpButton();
        assertTrue(esignetLoginPage.isOtpHasSendMessageDisplayed(),"verify if otp page is displayed");
@@ -336,7 +336,7 @@ public class VerifyHistoryTest extends AndroidBaseTest {
        
        HistoryPage historyPage = moreOptionsPage.clickOnCloseButton().clickOnHistoryButton();
        assertTrue(historyPage.isHistoryPageLoaded(), "Verify if history page is displayed");
-        assertTrue(historyPage.verifyActivationSuccessfulRecordInHistory(BaseTestCase.perpetualVid, Target.ANDROID));
-        assertTrue(historyPage.verifyHistory(BaseTestCase.perpetualVid, Target.ANDROID),"verify if download history is displayed");
+        assertTrue(historyPage.verifyActivationSuccessfulRecordInHistory(TestDataReader.readData("vid"), Target.ANDROID));
+        assertTrue(historyPage.verifyHistory(TestDataReader.readData("vid"), Target.ANDROID),"verify if download history is displayed");
    }
 }
--- a/injitest/src/test/java/iosTestCases/AboutInjiTest.java
+++ b/injitest/src/test/java/iosTestCases/AboutInjiTest.java
@@ -35,7 +35,7 @@ public class AboutInjiTest extends IosBaseTest {
        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
        AboutInjiPage aboutInjiPage = settingsPage.clickOnAbouInji();
        
-        assertTrue(aboutInjiPage.isaboutInjiHeaderDisplayed(),"Verify id about inji page displayed");
+        assertTrue(aboutInjiPage.isAboutInjiHeaderDisplayed(),"Verify id about inji page displayed");
        
        aboutInjiPage.clickOnCopy();
        assertTrue(aboutInjiPage.isAppidIsCopied(),"verify if app id is copied");
--- a/injitest/src/test/java/iosTestCases/ActivateVcTest.java
+++ b/injitest/src/test/java/iosTestCases/ActivateVcTest.java
@@ -5,6 +5,7 @@ import BaseTest.IosBaseTest;
 import inji.api.BaseTestCase;
 import inji.constants.Target;
 import inji.pages.*;
+import inji.utils.IosUtil;
 import inji.utils.TestDataReader;
 import org.testng.annotations.Test;

@@ -161,6 +162,7 @@ public class ActivateVcTest extends IosBaseTest {

        DetailedVcViewPage detailedVcViewPage = homePage.openDetailedVcView(TestDataReader.readData("fullName"));
        assertTrue(detailedVcViewPage.isDetailedVcViewPageLoaded(), "Verify if detailed Vc view page is displayed");
+        IosUtil.scrollToElement(driver,100,800,100,200);
        PleaseConfirmPopupPage pleaseConfirmPopupPage = detailedVcViewPage.clickOnActivateButton();

        assertTrue(pleaseConfirmPopupPage.isPleaseConfirmPopupPageLoaded(), "Verify if pop up page is displayed");
--- a/injitest/src/test/java/iosTestCases/ChangeLanguageTest.java
+++ b/injitest/src/test/java/iosTestCases/ChangeLanguageTest.java
@@ -116,8 +116,8 @@ public class ChangeLanguageTest extends IosBaseTest {
        SettingsPage settingsPage = homePage.clickOnSettingIcon();

        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
-        settingsPage.clickOnLanguage().clickOnArabicLanguageButton();
+        UnlockApplicationPage unlockApplicationPage = settingsPage.clickOnLanguage().clickOnArabicLanguageButton();

-        assertTrue(settingsPage.verifyArabicLanguage(), "Verify if language is changed to arabic");
+        assertTrue(unlockApplicationPage.isUnlockApplicationPageLoadedInArabic(), "Verify if language is changed to arabic");
    }
 }
--- a/injitest/src/test/java/iosTestCases/CredentialRegistryTest.java
+++ b/injitest/src/test/java/iosTestCases/CredentialRegistryTest.java
@@ -0,0 +1,478 @@
+package iosTestCases;
+
+import BaseTest.IosBaseTest;
+import inji.api.BaseTestCase;
+import inji.constants.Target;
+import inji.pages.*;
+import inji.utils.TestDataReader;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class CredentialRegistryTest extends IosBaseTest {
+
+	@Test
+	public void downloadAndVerifyVcInNewEnv() throws InterruptedException {
+		ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
+
+        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
+        WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
+
+        assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
+        AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
+
+        assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
+        SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
+
+        assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
+        ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
+        HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
+        SettingsPage settingsPage = homePage.clickOnSettingIcon();
+        
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        CredentialRegistryPage credentialRegistryPage =settingsPage.clickOnCredentialRegistry();
+        
+        assertTrue(credentialRegistryPage.isCredentialRegistryTextBoxHeaderDisplayed(), "Verify if CredentialRegistry page is displayed");
+        credentialRegistryPage.setEnterIdTextBox(TestDataReader.readData("newEnv")).clickOnSaveButton().clickOnSaveButton();
+
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        credentialRegistryPage.clickOnBackArrow();
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+
+        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
+        RetrieveIdPage retrieveIdPage = addNewCardPage.clickOnDownloadViaUin();
+
+        assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
+        OtpVerificationPage otpVerification = retrieveIdPage.setEnterIdTextBox(TestDataReader.readData("newuin")).clickOnGenerateCardButton();
+
+        assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
+        otpVerification.enterOtp(TestDataReader.readData("otp"), Target.IOS);
+        
+        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
+        MoreOptionsPage moreOptionsPage = homePage.clickOnMoreOptionsButton();
+
+        assertTrue(moreOptionsPage.isMoreOptionsPageLoaded(), "Verify if more options page is displayed");
+        PleaseConfirmPopupPage pleaseConfirmPopupPage = moreOptionsPage.clickOnActivationPending();
+
+        assertTrue(pleaseConfirmPopupPage.isPleaseConfirmPopupPageLoaded(), "Verify if pop up page is displayed");
+        OtpVerificationPage otpVerificationPage = pleaseConfirmPopupPage.clickOnConfirmButton();
+        
+        assertTrue(otpVerificationPage.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
+        otpVerificationPage.enterOtp(TestDataReader.readData("otp"), Target.IOS);
+
+        assertTrue(moreOptionsPage.isVcActivatedForOnlineLogin(), "Verify if VC is activated");
+        moreOptionsPage.clickOnCloseButton();
+        
+        DetailedVcViewPage detailedVcViewPage = homePage.openDetailedVcView(TestDataReader.readData("fullName"));
+        assertTrue(detailedVcViewPage.isCredentialRegistryTextDisplayed(),"Verify if is credential registry text displayed");
+        assertEquals(detailedVcViewPage.getCredentialRegistryValue(), TestDataReader.readData("newEnv"), "Verify changed env is displayed in detailed vc");
+	}
+	
+	@Test
+    public void cancelChangeEnvAndVerify() throws InterruptedException {
+		ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
+
+        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
+        WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
+
+        assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
+        AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
+
+        assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
+        SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
+
+        assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
+        ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
+        HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
+        SettingsPage settingsPage = homePage.clickOnSettingIcon();
+        
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        CredentialRegistryPage credentialRegistryPage =settingsPage.clickOnCredentialRegistry();
+        
+        assertTrue(credentialRegistryPage.isCredentialRegistryTextBoxHeaderDisplayed(), "Verify if CredentialRegistry page is displayed");
+        credentialRegistryPage.setEnterIdTextBox(TestDataReader.readData("newEnv")).clickOnCancelButton().clickOnCancelButton();
+
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        credentialRegistryPage.clickOnBackArrow();
+        
+        homePage.clickOnSettingIcon();
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+
+        settingsPage.clickOnCredentialRegistry();
+        assertEquals(credentialRegistryPage.checkEnvNotChanged(),"https://api.qa-inji1.mosip.net");
+	}
+	
+	@Test
+	public void downloadAndVerifyVcInInvalidEnv() throws InterruptedException {
+		ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
+
+        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
+        WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
+
+        assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
+        AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
+
+        assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
+        SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
+
+        assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
+        ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
+        HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
+        SettingsPage settingsPage = homePage.clickOnSettingIcon();
+        
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        CredentialRegistryPage credentialRegistryPage =settingsPage.clickOnCredentialRegistry();
+        
+        assertTrue(credentialRegistryPage.isCredentialRegistryTextBoxHeaderDisplayed(), "Verify if CredentialRegistry page is displayed");
+        credentialRegistryPage.setEnterIdTextBox(TestDataReader.readData("invalidenv")).clickOnSaveButton().clickOnSaveButton();
+
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        credentialRegistryPage.clickOnBackArrow();
+        
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+        assertTrue(homePage.isNoInternetConnectionDisplayed(), "Verify if no internet connection is displayed");
+	}
+	
+	@Test
+	public void generateUinInNewEnv() throws InterruptedException {
+		ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
+
+        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
+        WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
+
+        assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
+        AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
+
+        assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
+        SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
+
+        assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
+        ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
+        HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
+        SettingsPage settingsPage = homePage.clickOnSettingIcon();
+        
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        CredentialRegistryPage credentialRegistryPage =settingsPage.clickOnCredentialRegistry();
+        
+        assertTrue(credentialRegistryPage.isCredentialRegistryTextBoxHeaderDisplayed(), "Verify if CredentialRegistry page is displayed");
+        credentialRegistryPage.setEnterIdTextBox(TestDataReader.readData("newEnv")).clickOnSaveButton().clickOnSaveButton();
+
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        credentialRegistryPage.clickOnBackArrow();
+        
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
+        RetrieveIdPage retrieveIdPage = addNewCardPage.clickOnDownloadViaUin();
+        
+        assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
+        GenerateUinOrVidPage generateUinOrVidPage = retrieveIdPage.clickOnGetItNowText();
+
+        assertTrue(generateUinOrVidPage.isGenerateUinOrVidPageLoaded(), "Verify if generate uin or vid page page is displayed");
+        OtpVerificationPage otpVerification = generateUinOrVidPage.enterApplicationID(TestDataReader.readData("newaid")).clickOnGetUinOrVidButton();
+
+        assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
+        otpVerification.enterOtp(TestDataReader.readData("otp"), Target.IOS);
+
+        assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
+        retrieveIdPage.clickOnGenerateCardButton();
+
+        assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
+        otpVerification.enterOtp(TestDataReader.readData("otp"), Target.IOS);
+
+        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
+	}
+	
+	@Test
+	public void retrivingUinInOtherEnv() throws InterruptedException {
+		ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
+
+        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
+        WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
+
+        assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
+        AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
+
+        assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
+        SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
+
+        assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
+        ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
+        HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
+        SettingsPage settingsPage = homePage.clickOnSettingIcon();
+        
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        CredentialRegistryPage credentialRegistryPage =settingsPage.clickOnCredentialRegistry();
+        
+        assertTrue(credentialRegistryPage.isCredentialRegistryTextBoxHeaderDisplayed(), "Verify if CredentialRegistry page is displayed");
+        credentialRegistryPage.setEnterIdTextBox(TestDataReader.readData("newEnv")).clickOnSaveButton().clickOnSaveButton();
+
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        credentialRegistryPage.clickOnBackArrow();
+        
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
+        RetrieveIdPage retrieveIdPage = addNewCardPage.clickOnDownloadViaUin();
+        
+        assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
+        GenerateUinOrVidPage generateUinOrVidPage = retrieveIdPage.clickOnGetItNowText();
+
+        assertTrue(generateUinOrVidPage.isGenerateUinOrVidPageLoaded(), "Verify if generate uin or vid page page is displayed");
+        OtpVerificationPage otpVerification = generateUinOrVidPage.enterApplicationID(TestDataReader.readData("aid")).clickOnGetUinOrVidButton();
+
+        assertTrue(retrieveIdPage.isAidIsNotReadyYetErrorDisplayed(), "Verify if aid is not ready displayed");
+	}
+	
+	@Test
+	public void downloadAndVerifyVcInTwoEnv() throws InterruptedException {
+		ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
+
+        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
+        WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
+
+        assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
+        AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
+
+        assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
+        SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
+
+        assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
+        ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
+        HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
+        SettingsPage settingsPage = homePage.clickOnSettingIcon();
+        
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        CredentialRegistryPage credentialRegistryPage =settingsPage.clickOnCredentialRegistry();
+        
+        assertTrue(credentialRegistryPage.isCredentialRegistryTextBoxHeaderDisplayed(), "Verify if CredentialRegistry page is displayed");
+        credentialRegistryPage.setEnterIdTextBox(TestDataReader.readData("newEnv")).clickOnSaveButton().clickOnSaveButton();
+
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        credentialRegistryPage.clickOnBackArrow();
+        
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
+        RetrieveIdPage retrieveIdPage = addNewCardPage.clickOnDownloadViaUin();
+
+        assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
+        OtpVerificationPage otpVerification = retrieveIdPage.setEnterIdTextBox(TestDataReader.readData("newuin")).clickOnGenerateCardButton();
+
+        assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
+        otpVerification.enterOtp(TestDataReader.readData("otp"), Target.IOS);
+        
+        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
+        homePage.clickOnSettingIcon();
+        
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        settingsPage.clickOnCredentialRegistry();
+        
+        assertTrue(credentialRegistryPage.isCredentialRegistryTextBoxHeaderDisplayed(), "Verify if CredentialRegistry page is displayed");
+        credentialRegistryPage.setEnterIdTextBox(TestDataReader.readData("injiEnv")).clickOnSaveButton().clickOnSaveButton();
+
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        credentialRegistryPage.clickOnBackArrow();
+        
+         homePage.downloadCard();
+        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
+         addNewCardPage.clickOnDownloadViaUin();
+
+        assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
+         retrieveIdPage.setEnterIdTextBox(TestDataReader.readData("uin")).clickOnGenerateCardButton();
+
+        assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
+        otpVerification.enterOtp(BaseTestCase.getOtp(), Target.IOS);
+        
+        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
+        assertTrue(homePage.isSecondNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
+	}
+	
+	@Test
+	public void downloadVcAndActivateItInOtherEnv() throws InterruptedException {
+		ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
+
+        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
+        WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
+
+        assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
+        AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
+
+        assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
+        SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
+
+        assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
+        ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
+        HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
+        SettingsPage settingsPage = homePage.clickOnSettingIcon();
+        
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        CredentialRegistryPage credentialRegistryPage =settingsPage.clickOnCredentialRegistry();
+        
+        assertTrue(credentialRegistryPage.isCredentialRegistryTextBoxHeaderDisplayed(), "Verify if CredentialRegistry page is displayed");
+        credentialRegistryPage.setEnterIdTextBox(TestDataReader.readData("newEnv")).clickOnSaveButton().clickOnSaveButton();
+
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        credentialRegistryPage.clickOnBackArrow();
+        
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
+        RetrieveIdPage retrieveIdPage = addNewCardPage.clickOnDownloadViaUin();
+
+        assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
+        OtpVerificationPage otpVerification = retrieveIdPage.setEnterIdTextBox(TestDataReader.readData("newuin")).clickOnGenerateCardButton();
+
+        assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
+        otpVerification.enterOtp(TestDataReader.readData("otp"), Target.IOS);
+        
+        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
+        homePage.clickOnSettingIcon();
+        
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        settingsPage.clickOnCredentialRegistry();
+        
+        assertTrue(credentialRegistryPage.isCredentialRegistryTextBoxHeaderDisplayed(), "Verify if CredentialRegistry page is displayed");
+        credentialRegistryPage.setEnterIdTextBox(TestDataReader.readData("injiEnv")).clickOnSaveButton().clickOnSaveButton();
+
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        credentialRegistryPage.clickOnBackArrow();
+        
+        MoreOptionsPage moreOptionsPage = homePage.clickOnMoreOptionsButton();
+
+        assertTrue(moreOptionsPage.isMoreOptionsPageLoaded(), "Verify if more options page is displayed");
+        PleaseConfirmPopupPage pleaseConfirmPopupPage = moreOptionsPage.clickOnActivationPending();
+
+        assertTrue(pleaseConfirmPopupPage.isPleaseConfirmPopupPageLoaded(), "Verify if pop up page is displayed");
+        OtpVerificationPage otpVerificationPage = pleaseConfirmPopupPage.clickOnConfirmButton();
+        
+        assertTrue(moreOptionsPage.isSomthingIsWrongPopupVisible(), "Verify if somthing went wrong please try again popup displayed");
+	}
+	
+	@Test
+	public void downloadAndVerifyVcInNewEnvForEsignet() throws InterruptedException {
+		ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
+
+        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
+        WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
+
+        assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
+        AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
+
+        assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
+        SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
+
+        assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
+        ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
+        HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
+        SettingsPage settingsPage = homePage.clickOnSettingIcon();
+        
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        CredentialRegistryPage credentialRegistryPage =settingsPage.clickOnCredentialRegistry();
+        
+        assertTrue(credentialRegistryPage.isCredentialRegistryTextBoxHeaderDisplayed(), "Verify if CredentialRegistry page is displayed");
+        credentialRegistryPage.setEnterIdTextBox(TestDataReader.readData("newEnv")).enterUrlToEsignetHostTextBox(TestDataReader.readData("newEnv")).clickOnSaveButton().clickOnSaveButton();
+       
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        credentialRegistryPage.clickOnBackArrow();
+      
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
+        
+        EsignetLoginPage esignetLoginPage =  addNewCardPage.clickOnDownloadViaEsignet();
+        assertTrue(esignetLoginPage.isEsignetLoginPageDisplayed(), "Verify if esignet login page displayed");
+        esignetLoginPage.clickOnEsignetLoginWithOtpButton();
+        
+        assertTrue(esignetLoginPage.isEnterYourVidTextDisplayed(), "Verify if enter your vid text is displayed");
+        OtpVerificationPage otpVerification= esignetLoginPage.setEnterIdTextBox(TestDataReader.readData("newuin"));
+        
+        esignetLoginPage.clickOnGetOtpButton();
+        assertTrue(esignetLoginPage.isOtpHasSendMessageDisplayed(),"verify if otp page is displayed");
+        
+        otpVerification.enterOtpForEsignet(TestDataReader.readData("otp"), Target.IOS);
+        esignetLoginPage.clickOnVerifyButton();
+        
+        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
+        DetailedVcViewPage detailedVcViewPage = homePage.openDetailedVcView(TestDataReader.readData("fullName"));
+        detailedVcViewPage.clickOnQrCodeButton();
+        assertTrue(detailedVcViewPage.isQrCodeDisplayed(), "Verify if QR Code header is displayed");
+
+        detailedVcViewPage.clickOnQrCrossIcon();
+        assertTrue(detailedVcViewPage.isEsignetLogoDisplayed(), "Verify if detailed Vc esignet logo is displayed");
+        assertTrue(detailedVcViewPage.isDetailedVcViewPageLoaded(), "Verify if detailed Vc view page is displayed");
+        assertEquals(detailedVcViewPage.getNameInDetailedVcView(), TestDataReader.readData("fullName"), "Verify if full name is displayed");
+        assertEquals(detailedVcViewPage.getDateOfBirthInDetailedVcView(), TestDataReader.readData("dateOfBirth"), "Verify if date of birth is displayed");
+        assertEquals(detailedVcViewPage.getGenderInDetailedVcView(), TestDataReader.readData("gender"), "Verify if gender is displayed");
+        assertEquals(detailedVcViewPage.getIdTypeValueInDetailedVcView(), TestDataReader.readData("idType"), "Verify if id type is displayed");
+        assertEquals(detailedVcViewPage.getStatusInDetailedVcView(), TestDataReader.readData("status"), "Verify if status is displayed");
+        assertEquals(detailedVcViewPage.getUinInDetailedVcView(), TestDataReader.readData("newuin"), "Verify if uin is displayed");
+        assertEquals(detailedVcViewPage.getPhoneInDetailedVcView(), TestDataReader.readData("phoneNumber"), "Verify if phone number is displayed");
+        assertEquals(detailedVcViewPage.getEmailInDetailedVcView(), TestDataReader.readData("externalemail"), "Verify if email is displayed");
+        assertTrue(detailedVcViewPage.isActivateButtonDisplayed(), "Verify if activate vc button displayed");
+	}
+	
+	@Test
+	public void downloadAndVerifyVcInInvalidEnvForEsignet() throws InterruptedException {
+		ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
+
+        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
+        WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
+
+        assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
+        AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
+
+        assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
+        SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
+
+        assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
+        ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
+        HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
+        SettingsPage settingsPage = homePage.clickOnSettingIcon();
+        
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        CredentialRegistryPage credentialRegistryPage =settingsPage.clickOnCredentialRegistry();
+        
+        assertTrue(credentialRegistryPage.isCredentialRegistryTextBoxHeaderDisplayed(), "Verify if CredentialRegistry page is displayed");
+        credentialRegistryPage.setEnterIdTextBox(TestDataReader.readData("invalidenv")).enterUrlToEsignetHostTextBox(TestDataReader.readData("invalidenv")).clickOnSaveButton().clickOnSaveButton();
+
+        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
+        credentialRegistryPage.clickOnBackArrow();
+        
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+        assertTrue(homePage.isNoInternetConnectionDisplayed(), "Verify if no internet connection is displayed");
+	}
+	
+}
--- a/injitest/src/test/java/iosTestCases/NoNetworkAndroidTest.java
+++ b/injitest/src/test/java/iosTestCases/NoNetworkAndroidTest.java
@@ -1,21 +1,20 @@
 package iosTestCases;

-import BaseTest.AndroidBaseTest;
 import BaseTest.IosBaseTest;
 import inji.api.BaseTestCase;
 import inji.constants.Target;
 import inji.pages.*;
-import inji.utils.CommonMethods;
+import inji.utils.AndroidUtil;
 import inji.utils.TestDataReader;
 import org.testng.annotations.Test;

 import static org.testng.Assert.assertTrue;

-public class NoNetworkAndroidTest extends IosBaseTest {
+public class NoNetworkIosTest extends IosBaseTest {

    @Test
    public void setupPasscodeAndDownloadCardWithoutInternet() {
-        CommonMethods.enableAirplaneMode();
+        AndroidUtil.enableAirplaneMode();

        ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);

@@ -39,7 +38,7 @@ public class NoNetworkAndroidTest extends IosBaseTest {

        assertTrue(homePage.isNoInternetConnectionDisplayed(), "Verify if no internet connection is displayed");
        assertTrue(homePage.isTryAgainButtonDisplayed(), "Verify if Try again button displayed");
-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
        
        assertTrue(homePage.isTryAgainButtonDisplayed(), "Verify if Try again button displayed");

@@ -83,9 +82,9 @@ public class NoNetworkAndroidTest extends IosBaseTest {

        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");

-        CommonMethods.enableAirplaneMode();
+        AndroidUtil.enableAirplaneMode();
        assertTrue(homePage.clickOnScanButton().acceptPermissionPopup().isCameraOpen());
-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
    }
    @Test
    public void activateVcWithoutInternet() throws InterruptedException {
@@ -120,7 +119,7 @@ public class NoNetworkAndroidTest extends IosBaseTest {
        otpVerification.enterOtp(BaseTestCase.getOtp(), Target.IOS);

        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
-        CommonMethods.enableAirplaneMode();
+        AndroidUtil.enableAirplaneMode();

        MoreOptionsPage moreOptionsPage = homePage.clickOnMoreOptionsButton();

@@ -131,13 +130,13 @@ public class NoNetworkAndroidTest extends IosBaseTest {
        OtpVerificationPage otpVerificationPage = pleaseConfirmPopupPage.clickOnConfirmButton();

        assertTrue(otpVerificationPage.somethingWetWrongInVcActivationDisplayed(), "Verify if Something is wrong. Please try again later! is displayed");
-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();

    }

    @Test
    public void verifyListOfLanguagesInOfflineMode() {
-        CommonMethods.enableAirplaneMode();
+        AndroidUtil.enableAirplaneMode();
        ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);

        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
@@ -162,12 +161,12 @@ public class NoNetworkAndroidTest extends IosBaseTest {
        settingsPage.clickOnLanguage();

        assertTrue(settingsPage.verifyLanguagesInLanguageFilter(), "Verify if all languages are shown in language filter");
-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
    }
    
    @Test
    public void verifyHelpPageOfflineMode() {
-    	CommonMethods.enableAirplaneMode();
+    	AndroidUtil.enableAirplaneMode();

        ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);

@@ -193,7 +192,7 @@ public class NoNetworkAndroidTest extends IosBaseTest {
        helpPage.exitHelpPage();

        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
    }
    
    @Test
@@ -228,7 +227,7 @@ public class NoNetworkAndroidTest extends IosBaseTest {
        otpVerification.enterOtp(BaseTestCase.getOtp(), Target.IOS);

        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
-        CommonMethods.enableAirplaneMode();
+        AndroidUtil.enableAirplaneMode();

        MoreOptionsPage moreOptionsPage = homePage.clickOnMoreOptionsButton();
        assertTrue(moreOptionsPage.isMoreOptionsPageLoaded(), "Verify if more options page is displayed");
@@ -238,7 +237,7 @@ public class NoNetworkAndroidTest extends IosBaseTest {

        pleaseConfirmPopupPage.clickOnConfirmButton();

-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
        assertTrue(homePage.isNoVCDownloaded(), "Verify if VC is removed");
    }
    
@@ -275,7 +274,7 @@ public class NoNetworkAndroidTest extends IosBaseTest {
        otpVerification.enterOtp(BaseTestCase.getOtp(), Target.IOS);

        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
-        CommonMethods.enableAirplaneMode();
+        AndroidUtil.enableAirplaneMode();

        DetailedVcViewPage detailedVcViewPage = homePage.openDetailedVcView(TestDataReader.readData("fullName"));
        detailedVcViewPage.clickOnQrCodeButton();
@@ -284,12 +283,12 @@ public class NoNetworkAndroidTest extends IosBaseTest {
        detailedVcViewPage.clickOnQrCrossIcon();
        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
        
-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
    }
    
    @Test
    public void verifyRecivedCardOffline() throws InterruptedException {
-    	 CommonMethods.enableAirplaneMode();
+    	 AndroidUtil.enableAirplaneMode();
    	ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);

        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
@@ -314,12 +313,12 @@ public class NoNetworkAndroidTest extends IosBaseTest {
        assertTrue(receiveCardPage.isReceiveCardHederDisplayed(), "Verify if QR code  header is displayed");
        
        assertTrue(receiveCardPage.isWaitingForConnectionDisplayed(), "Verify if waiting for connection displayed");
-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
    }
    
    @Test
    public void downloadCardWithoutInternetRetryWithInternet() throws InterruptedException {
-        CommonMethods.enableAirplaneMode();
+        AndroidUtil.enableAirplaneMode();

        ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);

@@ -344,7 +343,7 @@ public class NoNetworkAndroidTest extends IosBaseTest {
        assertTrue(homePage.isNoInternetConnectionDisplayed(), "Verify if no internet connection is displayed");
        assertTrue(homePage.isTryAgainButtonDisplayed(), "Verify if try again button displayed");

-        CommonMethods.disableAirplaneMode();
+        AndroidUtil.disableAirplaneMode();
        assertTrue(homePage.isTryAgainButtonNotDisplayed(), "Wating for network come online");
        
        homePage.clickOnTryAgainButton();
--- a/injitest/src/test/java/iosTestCases/ReceiveCardTest.java
+++ b/injitest/src/test/java/iosTestCases/ReceiveCardTest.java
@@ -1,71 +0,0 @@
-package iosTestCases;
-
-import BaseTest.AndroidBaseTest;
-import BaseTest.IosBaseTest;
-import inji.constants.Target;
-import inji.pages.*;
-import inji.utils.TestDataReader;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.assertTrue;
-
-public class ReceiveCardTest extends IosBaseTest {
-	
-	 @Test
-	    public void verifyRecivedCardAndQrCode() {
-		 ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
-
-	        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
-	        WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
-
-	        assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
-	        AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
-
-	        assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
-	        SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
-
-	        assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
-	        ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS);
-
-	        assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
-	        HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.IOS);
-
-	        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
-	        SettingsPage settingsPage = homePage.clickOnSettingIcon();
-	        
-	        ReceiveCardPage receiveCardPage = settingsPage.clickOnReceiveCard();
-	        assertTrue(receiveCardPage.isReceiveCardHederDisplayed(), "Verify if QR code  header is displayed");
-	        assertTrue(receiveCardPage.isWaitingForConnectionDisplayed(), "Verify if waiting for connection displayed");
-	 }
-	 
-	 @Test
-	    public void verifyRecivedCardAndQrCodeInFilipinoLanguage() {
-	        ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
-
-	        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
-	        WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
-
-	        assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
-	        AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
-
-	        assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
-	        SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
-
-	        assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
-	        ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS);
-
-	        assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
-	        HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.IOS);
-
-	        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
-	        SettingsPage settingsPage = homePage.clickOnSettingIcon();
-
-	        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
-	        settingsPage.clickOnLanguage().clickOnFilipinoLanguage();
-
-	        assertTrue(settingsPage.verifyFilipinoLanguage(), "Verify if language is changed to filipino");
-	        ReceiveCardPage receiveCardPage =settingsPage.clickOnReceiveCardFilipinoLanguage();
-	        
-	        assertTrue(receiveCardPage.isReceiveCardHederInFilipinoLanguageDisplayed(), "Verify if QR code  header is displayed filipino");
-	 }
-}
--- a/injitest/src/test/java/iosTestCases/ShareVcTest.java
+++ b/injitest/src/test/java/iosTestCases/ShareVcTest.java
@@ -1,6 +1,5 @@
 package iosTestCases;

-import BaseTest.AndroidBaseTest;
 import BaseTest.IosBaseTest;
 import inji.constants.Target;
 import inji.pages.*;
@@ -34,31 +33,4 @@ public class ShareVcTest  extends IosBaseTest {
        ScanPage scanPage = homePage.clickOnScanButton();
        assertTrue(scanPage.isNoShareableCardsMessageDisplayed(), "Verify if no shareable cards are available message is displayed");
    }
-
-    @Test
-    public void verifyReceivedCardTabPresent() {
-        ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
-
-        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
-        WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
-
-        assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
-        AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
-
-        assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
-        SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
-
-        assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
-        ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS);
-
-        assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
-        HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.IOS);
-
-        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
-        SettingsPage settingsPage = homePage.clickOnSettingIcon();
-
-        assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed");
-        assertTrue(settingsPage.isReceivedCardsPresent(), "Verify if received cards tab is displayed");
-
-    }
-}
+}
--- a/injitest/src/test/java/iosTestCases/VcDownloadAndVerifyUsingEsignetTest.java
+++ b/injitest/src/test/java/iosTestCases/VcDownloadAndVerifyUsingEsignetTest.java
@@ -0,0 +1,153 @@
+package iosTestCases;
+
+import BaseTest.IosBaseTest;
+import inji.api.BaseTestCase;
+import inji.constants.Target;
+import inji.pages.*;
+import inji.utils.TestDataReader;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class VcDownloadAndVerifyUsingEsignetTest extends IosBaseTest {
+    @Test
+    public void downloadAndVerifyVcUsingUinViaEsignet() throws InterruptedException {
+        ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
+
+        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
+        WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
+
+        assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
+        AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
+
+        assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
+        SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
+
+        assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
+        ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
+        HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+
+        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
+        assertTrue(addNewCardPage.isAddNewCardGuideMessageDisplayed(), "Verify if add new card guide message displayed");
+        assertTrue(addNewCardPage.isDownloadViaUinDisplayed(), "Verify if download via uin displayed");
+        assertTrue(addNewCardPage.isDownloadViaEsignetDisplayed(), "Verify if download via uin displayed");
+        EsignetLoginPage esignetLoginPage =  addNewCardPage.clickOnDownloadViaEsignet();
+
+        assertTrue(esignetLoginPage.isLoadingPageTextLoaded(), "Verify if loading page displayed");
+        assertTrue(esignetLoginPage.isSettingUpTextDisplayed(), "Verify if loading page displayed");
+        assertTrue(esignetLoginPage.isEsignetLoginPageDisplayed(), "Verify if esignet login page displayed");
+        esignetLoginPage.clickOnEsignetLoginWithOtpButton();
+        
+        assertTrue(esignetLoginPage.isEnterYourVidTextDisplayed(), "Verify if enter your vid text is displayed");
+        OtpVerificationPage otpVerification= esignetLoginPage.setEnterIdTextBox(TestDataReader.readData("uin"));
+        
+        esignetLoginPage.clickOnGetOtpButton();
+        assertTrue(esignetLoginPage.isOtpHasSendMessageDisplayed(),"verify if otp page is displayed");
+        
+        otpVerification.enterOtpForEsignet(TestDataReader.readData("otp"), Target.IOS);
+        esignetLoginPage.clickOnVerifyButton();
+        
+        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
+        DetailedVcViewPage detailedVcViewPage = homePage.openDetailedVcView(TestDataReader.readData("fullName"));
+        
+        detailedVcViewPage.clickOnQrCodeButton();
+        assertTrue(detailedVcViewPage.isQrCodeDisplayed(), "Verify if QR Code header is displayed");
+
+        detailedVcViewPage.clickOnQrCrossIcon();
+        assertTrue(detailedVcViewPage.isEsignetLogoDisplayed(), "Verify if detailed Vc esignet logo is displayed");
+        assertTrue(detailedVcViewPage.isDetailedVcViewPageLoaded(), "Verify if detailed Vc view page is displayed");
+        assertEquals(detailedVcViewPage.getNameInDetailedVcView(), TestDataReader.readData("fullName"), "Verify if full name is displayed");
+        assertEquals(detailedVcViewPage.getDateOfBirthInDetailedVcView(), TestDataReader.readData("dateOfBirth"), "Verify if date of birth is displayed");
+        assertEquals(detailedVcViewPage.getGenderInDetailedVcView(), TestDataReader.readData("gender"), "Verify if gender is displayed");
+        assertEquals(detailedVcViewPage.getIdTypeValueInDetailedVcView(), TestDataReader.readData("idType"), "Verify if id type is displayed");
+        assertEquals(detailedVcViewPage.getStatusInDetailedVcView(), TestDataReader.readData("status"), "Verify if status is displayed");
+        assertEquals(detailedVcViewPage.getUinInDetailedVcView(), TestDataReader.readData("uin"), "Verify if uin is displayed");
+        assertEquals(detailedVcViewPage.getPhoneInDetailedVcView(), TestDataReader.readData("phoneNumber"), "Verify if phone number is displayed");
+        assertEquals(detailedVcViewPage.getEmailInDetailedVcView(), TestDataReader.readData("externalemail"), "Verify if email is displayed");
+        assertTrue(detailedVcViewPage.isActivateButtonDisplayed(), "Verify if activate vc button displayed");
+        
+        PleaseConfirmPopupPage pleaseConfirmPopupPage  =detailedVcViewPage.clickOnActivateButton();
+        assertTrue(pleaseConfirmPopupPage.isPleaseConfirmPopupPageLoaded(), "Verify if confirm popup page is displayed");
+        
+        pleaseConfirmPopupPage.clickOnConfirmButton();
+        assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
+       
+        otpVerification.enterOtp(TestDataReader.readData("passcode"), Target.IOS);
+        assertTrue(detailedVcViewPage.isProfileAuthenticatedDisplayed(), "Verify profile authenticated displayed");
+        
+        detailedVcViewPage.clickOnCrossIcon();
+        assertTrue(detailedVcViewPage.isEsignetLogoDisplayed(), "Verify if detailed Vc esignet logo is displayed");
+        
+        
+    }
+    
+    @Test
+    public void downloadAndVerifyVcUsingVidViaEsignet() throws InterruptedException {
+        ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
+
+        assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed");
+        WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference();
+
+        assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded");
+        AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton();
+
+        assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed");
+        SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode();
+
+        assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed");
+        ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed");
+        HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), Target.IOS);
+
+        assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+
+        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
+        EsignetLoginPage esignetLoginPage =  addNewCardPage.clickOnDownloadViaEsignet();
+
+        assertTrue(esignetLoginPage.isEsignetLoginPageDisplayed(), "Verify if esignet login page displayed");
+        esignetLoginPage.clickOnEsignetLoginWithOtpButton();
+        
+        assertTrue(esignetLoginPage.isEnterYourVidTextDisplayed(), "Verify if enter your vid text is displayed");
+        OtpVerificationPage otpVerification= esignetLoginPage.setEnterIdTextBox(BaseTestCase.perpetualVid);
+        esignetLoginPage.clickOnGetOtpButton();
+        Thread.sleep(3000);
+        otpVerification.enterOtpForEsignet(TestDataReader.readData("otp"), Target.IOS);
+        esignetLoginPage.clickOnVerifyButton();
+        assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed");
+        DetailedVcViewPage detailedVcViewPage = homePage.openDetailedVcView(TestDataReader.readData("fullName"));
+        detailedVcViewPage.clickOnQrCodeButton();
+        assertTrue(detailedVcViewPage.isQrCodeDisplayed(), "Verify if QR Code header is displayed");
+
+        detailedVcViewPage.clickOnQrCrossIcon();
+        assertTrue(detailedVcViewPage.isEsignetLogoDisplayed(), "Verify if detailed Vc esignet logo is displayed");
+        assertTrue(detailedVcViewPage.isDetailedVcViewPageLoaded(), "Verify if detailed Vc view page is displayed");
+        assertEquals(detailedVcViewPage.getNameInDetailedVcView(), TestDataReader.readData("fullName"), "Verify if full name is displayed");
+        assertEquals(detailedVcViewPage.getDateOfBirthInDetailedVcView(), TestDataReader.readData("dateOfBirth"), "Verify if date of birth is displayed");
+        assertEquals(detailedVcViewPage.getGenderInDetailedVcView(), TestDataReader.readData("gender"), "Verify if gender is displayed");
+        assertEquals(detailedVcViewPage.getIdTypeValueInDetailedVcView(), TestDataReader.readData("idType"), "Verify if id type is displayed");
+        assertEquals(detailedVcViewPage.getStatusInDetailedVcView(), TestDataReader.readData("status"), "Verify if status is displayed");
+       // assertEquals(detailedVcViewPage.getUinInDetailedVcView(), TestDataReader.readData("uin"), "Verify if uin is displayed");
+        assertEquals(detailedVcViewPage.getPhoneInDetailedVcView(), TestDataReader.readData("phoneNumber"), "Verify if phone number is displayed");
+        assertEquals(detailedVcViewPage.getEmailInDetailedVcView(), TestDataReader.readData("externalemail"), "Verify if email is displayed");
+        assertTrue(detailedVcViewPage.isActivateButtonDisplayed(), "Verify if activate vc button displayed");
+        
+        PleaseConfirmPopupPage pleaseConfirmPopupPage  =detailedVcViewPage.clickOnActivateButton();
+        assertTrue(pleaseConfirmPopupPage.isPleaseConfirmPopupPageLoaded(), "Verify if confirm popup page is displayed");
+        
+        pleaseConfirmPopupPage.clickOnConfirmButton();
+        assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
+       
+        otpVerification.enterOtp(TestDataReader.readData("passcode"), Target.IOS);
+        assertTrue(detailedVcViewPage.isProfileAuthenticatedDisplayed(), "Verify profile authenticated displayed");
+        
+    }
+
+   }
--- a/injitest/src/test/java/iosTestCases/VcDownloadAndVerifyUsingVidTest.java
+++ b/injitest/src/test/java/iosTestCases/VcDownloadAndVerifyUsingVidTest.java
@@ -38,7 +38,7 @@ public class VcDownloadAndVerifyUsingVidTest extends IosBaseTest {
        RetrieveIdPage retrieveIdPage = addNewCardPage.clickOnDownloadViaUin();

        assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
-        OtpVerificationPage otpVerification = retrieveIdPage.clickOnVid(Target.IOS).setEnterIdTextBox(BaseTestCase.perpetualVid).clickOnGenerateCardButton();
+        OtpVerificationPage otpVerification = retrieveIdPage.clickOnVid(Target.IOS).setEnterIdTextBox(TestDataReader.readData("vid")).clickOnGenerateCardButton();

        assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
        otpVerification.enterOtp(BaseTestCase.getOtp(), Target.IOS);
@@ -75,7 +75,7 @@ public class VcDownloadAndVerifyUsingVidTest extends IosBaseTest {
        RetrieveIdPage retrieveIdPage = addNewCardPage.clickOnDownloadViaUin();

        assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
-        OtpVerificationPage otpVerification = retrieveIdPage.clickOnVid(Target.IOS).setEnterIdTextBox(BaseTestCase.perpetualVid).clickOnGenerateCardButton();
+        OtpVerificationPage otpVerification = retrieveIdPage.clickOnVid(Target.IOS).setEnterIdTextBox(TestDataReader.readData("vid")).clickOnGenerateCardButton();

        assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
        otpVerification.enterOtp(BaseTestCase.getOtp(), Target.IOS);
@@ -88,7 +88,7 @@ public class VcDownloadAndVerifyUsingVidTest extends IosBaseTest {
         addNewCardPage.clickOnDownloadViaUin();

        assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
-         retrieveIdPage.clickOnVid(Target.IOS).setEnterIdTextBox(BaseTestCase.perpetualVid).clickOnGenerateCardButton();
+         retrieveIdPage.clickOnVid(Target.IOS).setEnterIdTextBox(TestDataReader.readData("vid")).clickOnGenerateCardButton();

        assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
        otpVerification.enterOtp(BaseTestCase.getOtp(), Target.IOS);
--- a/injitest/testng.xml
+++ b/injitest/testng.xml
@@ -7,13 +7,14 @@
 	<test verbose="2" preserve-order="true" name="android">
 		<parameter name="platformName" value="ANDROID" />
 		<classes>
-			<class name="androidTestCases.VcDownloadAndVerifyUsingUinTest">
+	<!--	<class name="androidTestCases.VcDownloadAndVerifyUsingUinTest">
 				<methods>
 					<include name="downloadAndVerifyVcUsingUin" />
 					<include name="downloadWithEmptyUin" />
 					<include name="generateMultipleVcWithSameUin" />
 					<include name="downloadMultipleVcUsingDifferentUin" />
 					<include name="verifyInvalidUinErrorMessage" />
+					<include name="verifyOtpTimeOutAndGoBack" />
 				</methods>
 			</class>
 			<class name="androidTestCases.VerifyWelcomePagesTest">
@@ -27,7 +28,7 @@
 			<class name="androidTestCases.VcDownloadAndVerifyUsingVidTest">
 				<methods>
 					<include name="downloadAndVerifyVcUsingVid" />
-					<include name="downloadTwoVcDeleteUsingVid" />
+					<include name="downloadTwoVcDeleteOneUsingVid" />
 					<include name="verifyInvalidVidErrorMessage" />
 					<include name="downloadAndVerifyVcUsingRevokeVid" />
 				</methods>
@@ -37,13 +38,13 @@
 					<include name="logoutAndLoginWithPasscode" />
 					<include name="loginWithInvalidPasscode" />
 				</methods>
-			</class>
+			</class>	
 			<class name="androidTestCases.VerifyHelpPageTest">
 				<methods>
 					<include name="verifyHelpPage" />
 				</methods>
 			</class>
-			<class name="androidTestCases.DeletingVcTest">
+		<class name="androidTestCases.DeletingVcTest">
 				<methods>
 					<include name="deleteVcAndVerifyInHistory" />
 					<include name="cancelDeleteVc" />
@@ -52,7 +53,7 @@
 			</class>
 			<class name="androidTestCases.VerifyHistoryTest">
 				<methods>
-					<include name="generateAndVerifyHistory" />
+					<include name="downloadVcAndVerifyHistory" />
 					<include name="verifyActivationFailedRecordInHistory" />
 					<include name="verifyActivationFailedRecordInHistoryFromDetailedView" />
 					<include name="activateVcAndVerifyInHistory" />
@@ -75,17 +76,21 @@
 			<class name="androidTestCases.PinVcTest">
 				<methods>
 					<include name="pinVc" />
-					<include name="VerifyCameraAfterPinVc" />
+					<include name="VerifyCameraOpenAfterPinVc" />
+					<include name="downloadVcViaEsignetAndPinUnpin" />
 				</methods>
-			</class>
+			</class>-->
 			<class name="androidTestCases.ChangeLanguageTest">
 				<methods>
-					<include name="changeLanguage" />
+					<!--<include name="changeLanguage" />
 					<include name="languageShouldBeInNativeLanguages" />
-					<include name="changeLanguage" />
+					<include name="verifyTuvaliVersion" />
+					<include name="changeLanguageToArabic" />-->
+					<include name="changeLanguageToFilipionAndSearchIssuer" />
+					<include name="changeLanguageToFilipionAndSearchIssuerEnterIncompleteName" />
 				</methods>
 			</class>
-			<class name="androidTestCases.ShareVcTest">
+			<!--<class name="androidTestCases.ShareVcTest">
 				<methods>
 					<include name="noCardsAvailableToShare" />
 					<include name="verifyReceivedCardTabPresent" />
@@ -106,6 +111,8 @@
 					<include name="downloadVcUsingUinViaEsignetNoInternateWhileDownloading" />
 					<include name="downloadVcViaEsignetAndPinUnpinWithNoNetwork" />
 					<include name="downloadVcUsingUinViaEsignetNoInternateOpenScan" />
+					<include name="downloadVcInOtherLanguageViaEsignetWithoutInternet" />
+					<include name="changeLanguageToTamilWithoutNetwork" />
 				</methods>
 			</class>
 			<class name="androidTestCases.CredentialRegistryTest">
@@ -120,12 +127,7 @@
 					<include name="downloadVcAndActivateItInOtherEnv" />
 					<include name="downloadAndVerifyVcInNewEnvForEsignet" />
 					<include name="downloadAndVerifyVcInInvalidEnvForEsignet" />
-				</methods>
-			</class>
-			<class name="androidTestCases.ChangeLanguageTest">
-				<methods>
-					<include name="changeLanguage" />
-					<include name="changeLanguageToArabic" />
+					<include name="downloadAndVerifyVcInInvalidEnvForEsignetInFillpino" />
 				</methods>
 			</class>
 			<class name="androidTestCases.ReceiveCardTest">
@@ -139,7 +141,7 @@
 					<include name="downloadAndVerifyVcUsingUinViaEsignet" />
 					<include name="downloadAndVerifyVcUsingVidViaEsignet" />
 				</methods>
-			</class>
+			</class>-->
 		</classes>
 	</test>
 </suite>