diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 558e2af7..fbfa2ffd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -246,11 +246,11 @@
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="stateHidden" />
-        <activity
-            android:name=".gme_branches.view.GmeBranchesActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateHidden" />
+<!--        <activity-->
+<!--            android:name=".gme_branches.view.GmeBranchesActivity"-->
+<!--            android:screenOrientation="portrait"-->
+<!--            android:theme="@style/AppTheme.NoActionBar"-->
+<!--            android:windowSoftInputMode="stateHidden" />-->
         <activity
             android:name=".int_notification.view.IntNotificationView"
             android:screenOrientation="portrait"
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAccountAddActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAccountAddActivity.java
index 462e4530..bda336da 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAccountAddActivity.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/view/inboundaccountmanage/InboundAccountAddActivity.java
@@ -46,7 +46,7 @@ public class InboundAccountAddActivity extends BaseActivity implements InboundAc
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_inbound_account_add_activitity);
-        if (Build.VERSION.SDK_INT == 26) {
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.O||Build.VERSION.SDK_INT==Build.VERSION_CODES.O_MR1) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
         } else {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestActivity.java
index be7e6418..bfe0d09d 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestActivity.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestActivity.java
@@ -89,7 +89,7 @@ public class PennyTestActivity extends BaseActivity implements View.OnClickListe
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_penny_test);
         ButterKnife.bind(this);
-        if (Build.VERSION.SDK_INT == 26) {
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.O||Build.VERSION.SDK_INT==Build.VERSION_CODES.O_MR1) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
         } else {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java
index 41776d30..c51406ce 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java
@@ -107,7 +107,7 @@ public class TransactionPasswordPromptActivity extends BaseActivity implements S
     }
 
     private void setUpWindowWithInsets() {
-        if (Build.VERSION.SDK_INT == 26) {
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.O||Build.VERSION.SDK_INT==Build.VERSION_CODES.O_MR1) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
         } else {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);