diff --git a/Common-UI b/Common-UI
index 3ec7e81..bb57ecf 160000
--- a/Common-UI
+++ b/Common-UI
@@ -1 +1 @@
-Subproject commit 3ec7e81443c830c7784bb39ad1fe34af1a939858
+Subproject commit bb57ecfac052a50bd85dc30eba1ca93335c34344
diff --git a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.html b/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.html
index 52549b9..ae055f3 100644
--- a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.html
+++ b/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.html
@@ -29,9 +29,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
         </mat-form-field>
       </div>
       <div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
-        <mat-form-field
-          [style.width]="'100%'"
-        >
+        <mat-form-field [style.width]="'100%'">
           <mat-label>
             {{ currentLanguageSet?.inventory?.referenceNo }}
           </mat-label>
@@ -45,9 +43,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
         </mat-form-field>
       </div>
       <div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
-        <mat-form-field
-          [style.width]="'100%'"
-        >
+        <mat-form-field [style.width]="'100%'">
           <mat-label>
             {{ currentLanguageSet?.inventory?.reason }}
           </mat-label>
@@ -270,9 +266,9 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
           <button
             type="button"
             mat-raised-button
-            color="accent mat_green"
-            class="pull-right m-r-5"
+            color="accent"
             *ngIf="editMode"
+            class="pull-right m-r-5 mat_green"
             [disabled]="indentRequestForm.invalid"
             (click)="updateIndentRequest(indentRequestForm)"
           >
@@ -281,6 +277,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
           <button
             type="button"
             mat-raised-button
+            *ngIf="editMode"
             color="primary"
             class="pull-right m-r-5"
             [disabled]="indentRequestForm.pristine"
diff --git a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.ts b/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.ts
index 677f370..e970bef 100644
--- a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.ts
+++ b/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.ts
@@ -111,7 +111,7 @@ export class IndentRequestComponent implements OnInit, DoCheck {
       indentID: this.dataStorageService.indentDetails.indentID,
       fromFacilityID: this.dataStorageService.indentDetails.fromFacilityID,
     };
-    if (this.viewItemReqObj !== undefined || this.viewItemReqObj !== null) {
+    if (this.viewItemReqObj !== undefined && this.viewItemReqObj !== null) {
       this.editMode = true;
       this.getItemList(this.viewItemReqObj);
     } else {
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index c7edad9..51e7053 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -15,11 +15,11 @@ const FHIRIP = "https://amritwprdev.piramalswasthya.org/";
 // const INVENTORY_API = `http://${IP}:8080/apiman-gateway/IEMR/Inventory/1.0/`;
 // const MMU_API = `http://${IP}:8080/apiman-gateway/IEMR/MMU/1.0/`;
 
-const COMMON_API_OPEN = `${commonIP}commonapi-v1.0/`;
-const COMMON_API = `${commonIP}commonapi-v1.0/`;
-const INVENTORY_API = `${inventoryIP}Inventoryapi-v1.0/`;
-const MMU_API = `${mmuIP}mmuapi-v1.0/`;
-const FHIR_API = `${FHIRIP}fhirapi-v1.0/`;
+const COMMON_API_OPEN = `${commonIP}common-api/`;
+const COMMON_API = `${commonIP}common-api/`;
+const INVENTORY_API = `${inventoryIP}inventory-api/`;
+const MMU_API = `${mmuIP}mmu-api/`;
+const FHIR_API = `${FHIRIP}fhir-api/`;
 const sessionStorageEncKey = '';
 const siteKey = '';
 const captchaChallengeURL = '';
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 29aa684..0edb0e8 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -12,11 +12,11 @@ const FHIRIP = "https://amritwprdev.piramalswasthya.org/";
 // const INVENTORY_API = `http://${IP}:8080/apiman-gateway/IEMR/Inventory/1.0/`;
 // const MMU_API = `http://${IP}:8080/apiman-gateway/IEMR/MMU/1.0/`;
 
-const COMMON_API_OPEN = `${commonIP}commonapi-v1.0/`;
-const COMMON_API = `${commonIP}commonapi-v1.0/`;
-const INVENTORY_API = `${inventoryIP}Inventoryapi-v1.0/`;
-const MMU_API = `${mmuIP}mmuapi-v1.0/`;
-const FHIR_API = `${FHIRIP}fhirapi-v1.0/`; 
+const COMMON_API_OPEN = `${commonIP}common-api/`;
+const COMMON_API = `${commonIP}common-api/`;
+const INVENTORY_API = `${inventoryIP}inventory-api/`;
+const MMU_API = `${mmuIP}mmu-api/`;
+const FHIR_API = `${FHIRIP}fhir-api/`;
 const sessionStorageEncKey = '';
 
 export const environment = {