Merge branch 'develop' into unused-imports

[github/Chocobozzz/PeerTube.git] / client / src / app / core / confirm / confirm.service.ts

diff --git a/client/src/app/core/confirm/confirm.service.ts b/client/src/app/core/confirm/confirm.service.ts
index d99226f053496f6bf6058b278d1ff5723705c689..8419f622b257e0afd395a24f780f554e3449e088 100644 (file)
--- a/client/src/app/core/confirm/confirm.service.ts
+++ b/client/src/app/core/confirm/confirm.service.ts
@@ -1,7 +1,6 @@
+import { first } from 'rxjs/operators'
 import { Injectable } from '@angular/core'
-import { Subject } from 'rxjs/Subject'
-import 'rxjs/add/operator/first'
-import 'rxjs/add/operator/toPromise'
+import { Subject } from 'rxjs'
 
 type ConfirmOptions = {
   title: string
@@ -19,12 +18,12 @@ export class ConfirmService {
   confirm (message: string, title = '', confirmButtonText?: string) {
     this.showConfirm.next({ title, message, confirmButtonText })
 
-    return this.confirmResponse.asObservable().first().toPromise()
+    return this.confirmResponse.asObservable().pipe(first()).toPromise()
   }
 
   confirmWithInput (message: string, inputLabel: string, expectedInputValue: string, title = '', confirmButtonText?: string) {
     this.showConfirm.next({ title, message, inputLabel, expectedInputValue, confirmButtonText })
 
-    return this.confirmResponse.asObservable().first().toPromise()
+    return this.confirmResponse.asObservable().pipe(first()).toPromise()
   }
 }