Merge branch 'enad-pre-live' of https://gitlab.com/haroon6138/mohemmionic5 into enad-pre-live

# Conflicts:
#	Mohem/package.json

Mohem/src/app/hmg-common/ui/file-uploader/file-uploader.component.ts

@@ -230,7 +230,7 @@ export class FileUploaderComponent implements OnInit {
       });
     });
   }
-  getImgContent(imgFile, data): SafeUrl {
+  getImgContent(imgFile): SafeUrl {
     console.log(imgFile);
     return this.sanitizer.bypassSecurityTrustUrl(imgFile);
   }

Mohem/src/app/itemforsale/home/home.component.html

@@ -141,7 +141,7 @@
     <!-- <img  slot="start" style=" height: 55px;"src="../assets/imgs/add-photo.svg"> -->
     <!-- <input end class="upload" type="file" ng2FileSelect [uploader]="uploader" 
     (change)="onFileSelected($event)" (click)="onFileSelectedclick($event)" /> -->
-    <file-uploader (fileSelected)="attachmentSelected($event)" [maxFileSize]="maxFileSize"
+    <file-uploader (fileSelected)="attachmentSelected($event)" 
     [multiupload]="true" [selectedAttachment]="selectedPicture">
 </file-uploader>
   </div>

Mohem/src/app/itemforsale/item-details/item-details.component.html

@@ -12,7 +12,7 @@
   <div >
     <ion-card>
       <ion-card-header>
-        <img  *ngIf="!item.itemAttachments[0] || !item.itemAttachments[0].content" src="assets/imgs/no-images.png" /> 
+        <img  *ngIf="!itemDetails.itemAttachments[0] || !itemDetails.itemAttachments[0].content" src="assets/imgs/no-images.png" /> 
         <!-- <img  *ngIf="itemDetails.itemAttachments[0]" [src]="item.itemAttachments[0]" />
         <img  *ngIf="!itemDetails.itemAttachments[0]" src="assets/imgs/no-images.png" /> -->
         <ion-slides *ngIf="itemDetails.itemAttachments.length>0">