#422765 - Removed comments and unused variables

Author: ppelgmv

src/app/pages/catalog/catalog-browser/catalog-browser.component.html

@@ -8,8 +8,6 @@
         <mat-icon>close</mat-icon>
       </button>
     </mat-form-field>
-
-    <!-- <button mat-button (click)="onSearch()">Search</button> -->
   </div>
 
   <div fxLayout="row wrap" fxLayoutGap="15px" fxLayoutAlign="start start">
@@ -36,16 +34,12 @@
 
       <mat-divider></mat-divider>
       <mat-card-actions class="card-actions">
-        <!-- <button
-                      [disabled]="isBusy(dataOffer) || isNegotiated(dataOffer)"
-                      color="accent" mat-stroked-button> -->
         <button color="accent" mat-stroked-button
           (click)="viewContractOffers(dataOffer.assetId, dataOffer.contractOffers, dataOffer.originator, dataOffer.properties)">
           View details and contract offers
         </button>
       </mat-card-actions>
       <mat-card-footer>
-        <!-- <mat-progress-bar *ngIf="isBusy(dataOffer)" color="accent" mode="indeterminate"></mat-progress-bar> -->
       </mat-card-footer>
     </mat-card>
   </div>

src/app/pages/catalog/contract-offers-viewer/contract-offers-viewer.component.scss

@@ -2,10 +2,6 @@
   --mdc-elevated-card-container-color: #474747;
 }
 
-// mat-progress-bar {
-//   margin-bottom: -20px;
-// }
-
 mat-card-title{
   padding: 20px;
   color: white;

src/app/pages/catalog/contract-offers-viewer/contract-offers-viewer.component.ts

@@ -29,8 +29,8 @@ interface RunningTransferProcess {
 export class ContractOffersViewerComponent {
 
   runningTransferProcesses: RunningTransferProcess[] = [];
-  runningNegotiations: Map<string, NegotiationResult> = new Map<string, NegotiationResult>(); // contractOfferId, NegotiationResult
-  finishedNegotiations: Map<string, ContractNegotiation> = new Map<string, ContractNegotiation>(); // contractOfferId, contractAgreementId
+  runningNegotiations: Map<string, NegotiationResult> = new Map<string, NegotiationResult>();
+  finishedNegotiations: Map<string, ContractNegotiation> = new Map<string, ContractNegotiation>();
 
   private pollingHandleNegotiation?: any;
 
@@ -82,11 +82,9 @@ export class ContractOffersViewerComponent {
       if (!this.pollingHandleNegotiation) {
         // there are no active negotiations
         this.pollingHandleNegotiation = setInterval(() => {
-          // const finishedNegotiations: NegotiationResult[] = [];
-
           for (const negotiation of this.runningNegotiations.values()) {
             this.apiService.getNegotiationState(negotiation.id).subscribe(updatedNegotiation => {
-              if (finishedNegotiationStates.includes(updatedNegotiation.state!)) {
+              if (finishedNegotiationStates.includes(updatedNegotiation.state)) {
                 let offerId = negotiation.offerId;
                 this.runningNegotiations.delete(offerId);
                 if (updatedNegotiation["state"] === "VERIFIED") {

src/app/pages/contracts/contract-viewer/contract-viewer.component.ts

@@ -34,10 +34,7 @@ export class ContractViewerComponent implements OnInit {
   private pollingHandleTransfer?: any;
 
   constructor(private contractAgreementService: ContractAgreementService,
-              private assetService: AssetService,
               public dialog: MatDialog,
-              @Inject('HOME_CONNECTOR_STORAGE_ACCOUNT') private homeConnectorStorageAccount: string,
-              private transferService: TransferProcessService,
               private catalogService: CatalogBrowserService,
               private router: Router,
               private notificationService: NotificationService) {
@@ -74,7 +71,6 @@ export class ContractViewerComponent implements OnInit {
    * @param assetId Asset ID of the asset that is associated with the contract.
    */
   private getContractOfferForAssetId(assetId: string): Observable<DataOffer> {
-    //return this.catalogService.getContractOffers()
     return this.catalogService.getDataOffers()
       .pipe(
         map(offers => offers.find(o => o.assetId === assetId)),