Use NetworkAddress

src/app/@api/base.api.ts

@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { environment } from '@env/environment';
 import {
-  EthAddress,
+  NetworkAddress,
   PublicCollections,
   BUILD5_PROD_ADDRESS_API,
   BUILD5_TEST_ADDRESS_API,
@@ -29,7 +29,7 @@ export class BaseApi<T> {
 
   public listen = (id: string) => this.repo.getByIdLive(id);
 
-  public listenMultiple = (ids: EthAddress[]) =>
+  public listenMultiple = (ids: NetworkAddress[]) =>
     ids.length ? this.repo.getManyByIdLive(ids) : of([]);
 
   public top = (lastValue?: string, limit?: number) => this.repo.getTopLive(lastValue, limit);

src/app/@api/member.api.ts

@@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { environment } from '@env/environment';
 import {
-  EthAddress,
+  NetworkAddress,
   Member,
   Proposal,
   PublicCollections,
@@ -74,7 +74,7 @@ export class MemberApi extends BaseApi<Member> {
     super(PublicCollections.MEMBER, httpClient);
   }
 
-  public soonDistributionStats = (id: EthAddress) => {
+  public soonDistributionStats = (id: NetworkAddress) => {
     const tokenId = environment.production ? SOON_TOKEN : SOON_TOKEN_TEST;
     return this.tokenDistRepo.getByIdLive(tokenId, id.toLowerCase()).pipe(
       switchMap(async (distribution) => {
@@ -90,7 +90,7 @@ export class MemberApi extends BaseApi<Member> {
     ) as Observable<TokenDistributionWithAirdrops | undefined>;
   };
 
-  public listenMultiple = (ids: EthAddress[]) =>
+  public listenMultiple = (ids: NetworkAddress[]) =>
     ids.length
       ? this.memberRepo
           .getByFieldLive(
@@ -105,7 +105,10 @@ export class MemberApi extends BaseApi<Member> {
           )
       : of([]);
 
-  public topStakes = (memberId: EthAddress, lastValue?: string): Observable<StakeWithTokenRec[]> =>
+  public topStakes = (
+    memberId: NetworkAddress,
+    lastValue?: string,
+  ): Observable<StakeWithTokenRec[]> =>
     this.stakeRepo.getByMemberLive(memberId, lastValue).pipe(
       switchMap(async (stakes: Stake[]) => {
         const tokenIds = Array.from(new Set(stakes.map((s) => s.token)));
@@ -119,7 +122,7 @@ export class MemberApi extends BaseApi<Member> {
       }),
     );
 
-  public topTokens = (memberId: EthAddress): Observable<TokenWithMemberDistribution[]> =>
+  public topTokens = (memberId: NetworkAddress): Observable<TokenWithMemberDistribution[]> =>
     this.tokenDistRepo.getTopBySubColIdLive(memberId, [], []).pipe(
       switchMap(async (distributions) => {
         const promises = distributions.map(async (distribution) => {
@@ -138,28 +141,28 @@ export class MemberApi extends BaseApi<Member> {
     );
 
   public topSpaces = (
-    memberId: EthAddress,
+    memberId: NetworkAddress,
     orderBy = ['createdOn'],
     orderByDir = ['desc'],
     lastValue?: string,
     limit?: number,
   ) => this.spaceRepo.getTopByMember(memberId, orderBy, orderByDir, lastValue, limit);
 
   public pendingSpaces = (
-    memberId: EthAddress,
+    memberId: NetworkAddress,
     orderBy = ['createdOn'],
     orderByDir = ['desc'],
     lastValue?: string,
   ) => this.spaceRepo.getPendingSpacesByMemberLive(memberId, orderBy, orderByDir, lastValue);
 
-  public topAwardsPending = (memberId: EthAddress, lastValue?: string) =>
+  public topAwardsPending = (memberId: NetworkAddress, lastValue?: string) =>
     this.awardRepo.getTopByMemberLive(memberId, false, lastValue);
 
-  public topAwardsCompleted = (memberId: EthAddress, lastValue?: string) =>
+  public topAwardsCompleted = (memberId: NetworkAddress, lastValue?: string) =>
     this.awardRepo.getTopByMemberLive(memberId, true, lastValue);
 
   public topProposals = (
-    memberId: EthAddress,
+    memberId: NetworkAddress,
     orderBy = ['createdOn'],
     orderByDir = ['desc'],
     lastValue?: string,
@@ -211,7 +214,7 @@ export class MemberApi extends BaseApi<Member> {
     );
   }
 
-  public allSpacesAsMember = (memberId: EthAddress, lastValue?: string) =>
+  public allSpacesAsMember = (memberId: NetworkAddress, lastValue?: string) =>
     this.spaceMemberRepo.getTopBySubColIdLive(memberId, [], [], lastValue).pipe(
       switchMap(async (spaceMembers) => {
         const spacePromises = spaceMembers.map(

src/app/@api/order.api.ts

@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import {
-  EthAddress,
+  NetworkAddress,
   PublicCollections,
   Transaction,
   WEN_FUNC,
@@ -33,7 +33,7 @@ export class OrderApi extends BaseApi<Transaction> {
   public openBid = (req: WenRequest): Observable<Transaction | undefined> =>
     this.request(WEN_FUNC.openBid, req);
 
-  public listenMultiple = (ids: EthAddress[]) =>
+  public listenMultiple = (ids: NetworkAddress[]) =>
     ids.length
       ? this.transactionRepo.getByFieldLive(
           ids.map(() => 'uid'),

src/app/@api/proposal.api.ts

@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import {
-  EthAddress,
+  NetworkAddress,
   Member,
   Proposal,
   PublicCollections,
@@ -53,7 +53,7 @@ export class ProposalApi extends BaseApi<Proposal> {
     super(PublicCollections.PROPOSAL, httpClient);
   }
 
-  public listen = (id: EthAddress) => this.proposalRepo.getByIdLive(id);
+  public listen = (id: NetworkAddress) => this.proposalRepo.getByIdLive(id);
 
   public lastActive = (lastValue?: string) => this.proposalRepo.getActiveLive(lastValue);
 

src/app/components/auth/services/auth.service.ts

@@ -12,7 +12,7 @@ import { undefinedToEmpty } from '@core/utils/manipulations.utils';
 import { ROUTER_UTILS } from '@core/utils/router.utils';
 import detectEthereumProvider from '@metamask/detect-provider';
 import {
-  EthAddress,
+  NetworkAddress,
   Member,
   Network,
   StakeType,
@@ -412,7 +412,7 @@ export class AuthService {
     }
   }
 
-  public monitorMember(address: EthAddress): void {
+  public monitorMember(address: NetworkAddress): void {
     this.memberSubscription$ = this.memberApi.listen(address).subscribe((v) => {
       this.member$.next(v);
     });