Connection manager replacement

src/app/components/channel-list/channel-list.component.spec.ts

@@ -214,7 +214,7 @@ describe('ChannelListComponent', () => {
 
         const dialogSpy = spyOn(dialog, 'open').and.callThrough();
         const dialogResult: OpenDialogResult = {
-            tokenAddress: token1.address,
+            token: token1,
             partnerAddress: createAddress(),
             balance: new BigNumber(1000),
             settleTimeout: raidenConfig.config.settle_timeout,
@@ -226,7 +226,7 @@ describe('ChannelListComponent', () => {
         clickElement(fixture.debugElement, '#open-channel');
 
         const payload: OpenDialogPayload = {
-            tokenAddress: '',
+            token: undefined,
             defaultSettleTimeout: raidenConfig.config.settle_timeout,
             revealTimeout: raidenConfig.config.reveal_timeout,
         };
@@ -236,7 +236,7 @@ describe('ChannelListComponent', () => {
         });
         expect(openSpy).toHaveBeenCalledTimes(1);
         expect(openSpy).toHaveBeenCalledWith(
-            dialogResult.tokenAddress,
+            dialogResult.token.address,
             dialogResult.partnerAddress,
             dialogResult.settleTimeout,
             dialogResult.balance
@@ -272,7 +272,7 @@ describe('ChannelListComponent', () => {
         clickElement(fixture.debugElement, '#open-channel');
 
         const payload: OpenDialogPayload = {
-            tokenAddress: token1.address,
+            token: token1,
             defaultSettleTimeout: raidenConfig.config.settle_timeout,
             revealTimeout: raidenConfig.config.reveal_timeout,
         };

src/app/components/channel-list/channel-list.component.ts

@@ -7,7 +7,7 @@ import {
     AfterViewInit,
 } from '@angular/core';
 import { Channel } from '../../models/channel';
-import { EMPTY, Subject, Observable, fromEvent } from 'rxjs';
+import { EMPTY, Subject, fromEvent } from 'rxjs';
 import { ChannelPollingService } from '../../services/channel-polling.service';
 import { amountToDecimal } from '../../utils/amount.converter';
 import { UserToken } from '../../models/usertoken';
@@ -120,7 +120,7 @@ export class ChannelListComponent implements OnInit, OnDestroy, AfterViewInit {
         const rdnConfig = this.raidenConfig.config;
 
         const payload: OpenDialogPayload = {
-            tokenAddress: this.selectedToken ? this.selectedToken.address : '',
+            token: this.selectedToken,
             revealTimeout: rdnConfig.reveal_timeout,
             defaultSettleTimeout: rdnConfig.settle_timeout,
         };
@@ -138,7 +138,7 @@ export class ChannelListComponent implements OnInit, OnDestroy, AfterViewInit {
                     }
 
                     return this.raidenService.openChannel(
-                        result.tokenAddress,
+                        result.token.address,
                         result.partnerAddress,
                         result.settleTimeout,
                         result.balance

src/app/components/contact/contact-actions/contact-actions.component.spec.ts

@@ -113,7 +113,7 @@ describe('ContactActionsComponent', () => {
     it('should open payment dialog', () => {
         const dialogSpy = spyOn(dialog, 'open').and.callThrough();
         const dialogResult: PaymentDialogPayload = {
-            tokenAddress: token.address,
+            token: token,
             targetAddress: contact.address,
             amount: new BigNumber(10),
             paymentIdentifier: undefined,
@@ -126,7 +126,7 @@ describe('ContactActionsComponent', () => {
         clickElement(fixture.debugElement, '#transfer');
 
         const payload: PaymentDialogPayload = {
-            tokenAddress: '',
+            token: undefined,
             targetAddress: contact.address,
             amount: undefined,
         };
@@ -136,7 +136,7 @@ describe('ContactActionsComponent', () => {
         });
         expect(initiatePaymentSpy).toHaveBeenCalledTimes(1);
         expect(initiatePaymentSpy).toHaveBeenCalledWith(
-            dialogResult.tokenAddress,
+            dialogResult.token.address,
             dialogResult.targetAddress,
             dialogResult.amount,
             dialogResult.paymentIdentifier
@@ -172,7 +172,7 @@ describe('ContactActionsComponent', () => {
         clickElement(fixture.debugElement, '#transfer');
 
         const payload: PaymentDialogPayload = {
-            tokenAddress: connectedToken.address,
+            token: connectedToken,
             targetAddress: contact.address,
             amount: undefined,
         };

src/app/components/contact/contact-actions/contact-actions.component.ts

@@ -93,7 +93,7 @@ export class ContactActionsComponent implements OnInit, OnDestroy {
         this.actionClicked.emit(true);
 
         const payload: PaymentDialogPayload = {
-            tokenAddress: this.selectedToken ? this.selectedToken.address : '',
+            token: this.selectedToken,
             targetAddress: this.contact.address,
             amount: undefined,
         };
@@ -111,7 +111,7 @@ export class ContactActionsComponent implements OnInit, OnDestroy {
                     }
 
                     return this.raidenService.initiatePayment(
-                        result.tokenAddress,
+                        result.token.address,
                         result.targetAddress,
                         result.amount,
                         result.paymentIdentifier

src/app/components/open-dialog/open-dialog.component.html

@@ -8,7 +8,6 @@
 >
     <app-token-network-selector
         formControlName="token"
-        (tokenChanged)="tokenNetworkSelected($event)"
         [showOnChainBalance]="true"
     >
     </app-token-network-selector>

src/app/components/open-dialog/open-dialog.component.spec.ts

@@ -68,7 +68,7 @@ describe('OpenDialogComponent', () => {
     beforeEach(
         waitForAsync(() => {
             const payload: OpenDialogPayload = {
-                tokenAddress: token.address,
+                token: token,
                 defaultSettleTimeout: defaultSettleTimeout,
                 revealTimeout: revealTimeout,
             };
@@ -136,7 +136,7 @@ describe('OpenDialogComponent', () => {
 
         expect(closeSpy).toHaveBeenCalledTimes(1);
         expect(closeSpy).toHaveBeenCalledWith({
-            tokenAddress: token.address,
+            token: token,
             partnerAddress: addressInput,
             settleTimeout: defaultSettleTimeout,
             balance: new BigNumber(amountInput),

src/app/components/open-dialog/open-dialog.component.ts

@@ -1,4 +1,4 @@
-import { Component, Inject, ViewChild, OnDestroy } from '@angular/core';
+import { Component, Inject, ViewChild, OnDestroy, OnInit } from '@angular/core';
 import {
     AbstractControl,
     FormBuilder,
@@ -14,19 +14,19 @@ import BigNumber from 'bignumber.js';
 import { Animations } from '../../animations/animations';
 import { TokenPollingService } from '../../services/token-polling.service';
 import { Subject } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
+import { switchMap, takeUntil, tap } from 'rxjs/operators';
 
 export interface OpenDialogPayload {
-    readonly tokenAddress: string;
+    readonly token: UserToken;
     readonly defaultSettleTimeout: number;
     readonly revealTimeout: number;
 }
 
 export interface OpenDialogResult {
-    tokenAddress: string;
-    partnerAddress: string;
-    settleTimeout: number;
-    balance: BigNumber;
+    readonly token: UserToken;
+    readonly partnerAddress: string;
+    readonly settleTimeout: number;
+    readonly balance: BigNumber;
 }
 
 @Component({
@@ -35,7 +35,7 @@ export interface OpenDialogResult {
     styleUrls: ['./open-dialog.component.scss'],
     animations: Animations.fallDown,
 })
-export class OpenDialogComponent implements OnDestroy {
+export class OpenDialogComponent implements OnInit, OnDestroy {
     @ViewChild(TokenInputComponent, { static: true })
     private tokenInput: TokenInputComponent;
 
@@ -53,7 +53,7 @@ export class OpenDialogComponent implements OnDestroy {
         this.revealTimeout = data.revealTimeout;
         this.form = this.fb.group({
             address: ['', Validators.required],
-            token: [data.tokenAddress, Validators.required],
+            token: [data.token, Validators.required],
             amount: ['', Validators.required],
             settle_timeout: [
                 data.defaultSettleTimeout,
@@ -66,6 +66,23 @@ export class OpenDialogComponent implements OnDestroy {
         });
     }
 
+    ngOnInit() {
+        this.form.controls.token.valueChanges
+            .pipe(
+                tap((token) => (this.tokenInput.selectedToken = token)),
+                switchMap((token) =>
+                    this.tokenPollingService.getTokenUpdates(
+                        token?.address ?? ''
+                    )
+                ),
+                takeUntil(this.ngUnsubscribe)
+            )
+            .subscribe((updatedToken) => {
+                this.tokenInput.maxAmount = updatedToken?.balance;
+            });
+        this.form.controls.token.updateValueAndValidity();
+    }
+
     ngOnDestroy() {
         this.ngUnsubscribe.next();
         this.ngUnsubscribe.complete();
@@ -74,7 +91,7 @@ export class OpenDialogComponent implements OnDestroy {
     accept() {
         const value = this.form.value;
         const result: OpenDialogResult = {
-            tokenAddress: value.token,
+            token: value.token,
             partnerAddress: value.address,
             settleTimeout: value.settle_timeout,
             balance: value.amount,
@@ -87,21 +104,6 @@ export class OpenDialogComponent implements OnDestroy {
         this.dialogRef.close();
     }
 
-    tokenNetworkSelected(token: UserToken) {
-        this.tokenInput.selectedToken = token;
-        this.subscribeToTokenUpdates(token.address);
-    }
-
-    subscribeToTokenUpdates(tokenAddress: string) {
-        this.ngUnsubscribe.next();
-        this.tokenPollingService
-            .getTokenUpdates(tokenAddress)
-            .pipe(takeUntil(this.ngUnsubscribe))
-            .subscribe((updatedToken: UserToken) => {
-                this.tokenInput.maxAmount = updatedToken.balance;
-            });
-    }
-
     private settleTimeoutValidator(): ValidatorFn {
         return (control: AbstractControl): ValidationErrors => {
             const value = parseInt(control.value, 10);

src/app/components/payment-dialog/payment-dialog.component.html

@@ -8,7 +8,6 @@
 >
     <app-token-network-selector
         formControlName="token"
-        (tokenChanged)="tokenNetworkSelected($event)"
         [onlyConnectedTokens]="true"
     >
     </app-token-network-selector>

src/app/components/payment-dialog/payment-dialog.component.spec.ts

@@ -104,7 +104,7 @@ describe('PaymentDialogComponent', () => {
     beforeEach(
         waitForAsync(() => {
             const payload: PaymentDialogPayload = {
-                tokenAddress: '',
+                token: undefined,
                 amount: undefined,
                 targetAddress: '',
             };
@@ -185,7 +185,7 @@ describe('PaymentDialogComponent', () => {
 
         expect(closeSpy).toHaveBeenCalledTimes(1);
         expect(closeSpy).toHaveBeenCalledWith({
-            tokenAddress: token.address,
+            token: token,
             targetAddress: addressInput,
             amount: new BigNumber(amountInput),
             paymentIdentifier: undefined,
@@ -202,7 +202,7 @@ describe('PaymentDialogComponent', () => {
 
         expect(closeSpy).toHaveBeenCalledTimes(1);
         expect(closeSpy).toHaveBeenCalledWith({
-            tokenAddress: token.address,
+            token: token,
             targetAddress: addressInput,
             amount: new BigNumber(amountInput),
             paymentIdentifier: new BigNumber(identifierInput),
@@ -245,7 +245,7 @@ describe('PaymentDialogComponent', () => {
         });
         expect(close).toHaveBeenCalledTimes(1);
         expect(close).toHaveBeenCalledWith({
-            tokenAddress: token.address,
+            token: token,
             targetAddress: addressInput,
             amount: new BigNumber(amountInput),
             paymentIdentifier: new BigNumber(identifierInput),
@@ -317,7 +317,7 @@ describe('PaymentDialogComponent', () => {
         expect(dialogSpy).toHaveBeenCalledTimes(0);
         expect(closeSpy).toHaveBeenCalledTimes(1);
         expect(closeSpy).toHaveBeenCalledWith({
-            tokenAddress: token.address,
+            token: token,
             targetAddress: addressInput,
             amount: new BigNumber(amountInput),
             paymentIdentifier: differentIdentifier,