Merge pull request #84 from soonaverse/develop

Release 2.1

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

@@ -1,14 +1,14 @@
 import { HttpClient } from '@angular/common/http';
 import { environment } from '@env/environment';
 import {
-  EthAddress,
+  NetworkAddress,
   PublicCollections,
   BUILD5_PROD_ADDRESS_API,
   BUILD5_TEST_ADDRESS_API,
   WEN_FUNC,
+  WenRequest,
 } from '@build-5/interfaces';
-import { Build5Env } from '@build-5/lib';
-import { CrudRepository } from '@build-5/lib/lib/repositories/CrudRepository';
+import { Build5Env, CrudRepository } from '@build-5/lib';
 import { Observable, map, of } from 'rxjs';
 
 export const DEFAULT_LIST_SIZE = 50;
@@ -29,12 +29,12 @@ 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);
 
-  protected request<T>(func: WEN_FUNC, req: any): Observable<T | undefined> {
+  protected request<T>(func: WEN_FUNC, req: WenRequest): Observable<T | undefined> {
     const origin = environment.production ? BUILD5_PROD_ADDRESS_API : BUILD5_TEST_ADDRESS_API;
     return this.httpClient.post(origin + func, { data: req }).pipe(map((b: any) => b.data));
   }

src/app/@api/file.api.ts

@@ -47,6 +47,7 @@ export class FileApi {
     formData.append('file', <Blob>item.postFile);
     formData.append('member', memberId);
     formData.append('uid', item.file.uid);
+    formData.append('projectApiKey', environment.build5Token);
     const origin = environment.production ? BUILD5_PROD_ADDRESS_API : BUILD5_TEST_ADDRESS_API;
     return this.httpClient
       .post(origin + WEN_FUNC.uploadFile, formData)

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(
@@ -222,7 +225,11 @@ export class MemberApi extends BaseApi<Member> {
     );
 
   public createIfNotExists = (address: string): Observable<Member | undefined> =>
-    this.request(WEN_FUNC.createMember, address);
+    this.request(WEN_FUNC.createMember, {
+      address: '',
+      projectApiKey: environment.build5Token,
+      body: address,
+    });
 
   public updateMember = (req: WenRequest): Observable<Member | undefined> =>
     this.request(WEN_FUNC.updateMember, req);

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,11 +12,10 @@ 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,
-  tiers,
   TOKEN_EXPIRY_HOURS,
   WenRequest,
 } from '@build-5/interfaces';
@@ -25,6 +24,7 @@ import { NzNotificationService } from 'ng-zorro-antd/notification';
 import { BehaviorSubject, firstValueFrom, skip, Subscription } from 'rxjs';
 import { MemberApi, TokenDistributionWithAirdrops } from './../../../@api/member.api';
 import { removeItem } from './../../../@core/utils/local-storage.utils';
+import { environment } from '@env/environment';
 const tanglePay = (window as any).iota;
 
 export interface MetamaskSignature {
@@ -144,12 +144,11 @@ export class AuthService {
     this.memberSoonDistribution$.subscribe((v) => {
       if (v && (v?.stakes?.[StakeType.DYNAMIC]?.value || 0) > 0) {
         let l = -1;
-        tiers.forEach((a) => {
+        environment.tiers.forEach((a) => {
           if ((v?.stakes?.[StakeType.DYNAMIC]?.value || 0) >= a) {
             l++;
           }
         });
-
         this.memberLevel$.next(l);
       } else {
         this.memberLevel$.next(0);
@@ -206,14 +205,15 @@ export class AuthService {
   public async sign(params: any = {}, cb: SignCallback): Promise<WenRequest | undefined> {
     this.showWalletPopup$.next(WalletStatus.ACTIVE);
     // We support either resign with metamask or reuse token.
-    let sc: WenRequest | undefined | false = undefined;
+    let sc: any | undefined | false = undefined;
     const customToken: any = getItem(StorageItem.CustomToken);
     const wallet = customToken.wallet || Wallets.Metamask;
     // check it's not expired.
     if (this.isCustomTokenNotExpired(customToken)) {
       sc = {
         address: customToken.address,
         customToken: customToken.value,
+        projectApiKey: environment.build5Token,
         body: params,
       };
     } else if (customToken) {
@@ -271,7 +271,7 @@ export class AuthService {
     return true;
   }
 
-  private async signWithMetamask(params: any = {}): Promise<WenRequest | undefined | false> {
+  private async signWithMetamask(params: any = {}): Promise<any | undefined | false> {
     const provider: any = await detectEthereumProvider();
     if (provider) {
       try {
@@ -319,6 +319,7 @@ export class AuthService {
         return {
           address: provider.selectedAddress,
           signature: signature,
+          projectApiKey: environment.build5Token,
           body: params,
         };
       } catch (e) {
@@ -389,9 +390,10 @@ export class AuthService {
           },
         });
 
-        const returnObj: WenRequest = {
+        const returnObj: any = {
           address: currentAddress,
           signature: signature,
+          projectApiKey: environment.build5Token,
           body: params,
         };
 
@@ -414,7 +416,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);
     });

src/app/components/nft/components/nft-checkout/nft-checkout.component.ts

@@ -230,9 +230,9 @@ export class NftCheckoutComponent implements OnInit, OnDestroy {
         if (val.payload.nft) {
           firstValueFrom(this.nftApi.listen(val.payload.nft)).then((obj) => {
             if (obj) {
-              this.purchasedNft = obj;
+              this.purchasedNft = <Nft>obj;
               this.fileApi
-                .getMetadata(this.purchasedNft.media)
+                .getMetadata(this.purchasedNft?.media)
                 .pipe(take(1), untilDestroyed(this))
                 .subscribe((o) => {
                   this.mediaType = o;

src/app/components/token/components/token-all-token-row/token-all-token-row.component.ts

@@ -57,10 +57,12 @@ export class TokenAllTokenRowComponent implements OnInit, OnDestroy {
       this.tokenApi
         .listen(this.tokenId)
         .pipe(untilDestroyed(this))
-        .subscribe((token) => {
+        .subscribe((token: any) => {
           if (token) {
             this.token = token;
-            this.listenToStats(this.token.uid);
+            if (this.token?.uid) {
+              this.listenToStats(this.token.uid);
+            }
             this.cd.markForCheck();
           }
         });

src/app/components/token/components/token-info/token-info-description.component.ts

@@ -50,7 +50,7 @@ export class TokenInfoDescriptionComponent {
     const distributions = await this.tokenApi.getAllDistributions(this.token?.uid);
     const fields = [
       '',
-      'ethAddress',
+      'NetworkAddress',
       'tokenOwned',
       'unclaimedTokens',
       'tokenClaimed',

src/app/components/token/components/token-stake/token-stake.component.ts

@@ -44,7 +44,6 @@ import {
   TransactionType,
   calcStakedMultiplier,
   getDefDecimalIfNotSet,
-  tiers,
 } from '@build-5/interfaces';
 import dayjs from 'dayjs';
 import { BehaviorSubject, Subscription, interval, merge } from 'rxjs';
@@ -157,14 +156,14 @@ export class TokenStakeComponent implements OnInit, OnDestroy {
             (this.auth.memberSoonDistribution$.value?.stakes?.[StakeType.DYNAMIC]?.value || 0) +
             Math.pow(10, getDefDecimalIfNotSet(this.token?.decimals)) * val;
           let l = 0;
-          tiers.forEach((a) => {
+          environment.tiers.forEach((a) => {
             if (newTotal >= a) {
               l++;
             }
           });
 
-          if (l > tiers.length - 1) {
-            l = tiers.length - 1;
+          if (l > environment.tiers.length - 1) {
+            l = environment.tiers.length - 1;
           }
 
           this.levelControl.setValue(l);

src/app/components/token/components/token-trading-pair-row/token-trading-pair-row.component.ts

@@ -34,7 +34,7 @@ export class TokenTradingPairRowComponent implements OnInit, OnDestroy {
   @Input() tableMode = false;
   @Output() wenOnFavouriteClick = new EventEmitter<void>();
   @Output() wenOnClick = new EventEmitter<void>();
-  public token?: Token;
+  public token?: any;
   public path = ROUTER_UTILS.config.token.root;
   public tradePath = ROUTER_UTILS.config.token.trade;
   public listenAvgPrice$: BehaviorSubject<number | undefined> = new BehaviorSubject<
@@ -64,7 +64,7 @@ export class TokenTradingPairRowComponent implements OnInit, OnDestroy {
       this.tokenApi
         .listen(this.tokenId)
         .pipe(untilDestroyed(this))
-        .subscribe((token) => {
+        .subscribe((token: any) => {
           if (token) {
             this.token = token;
             this.listenToStats(this.token.uid, [token.status || TokenStatus.PRE_MINTED]);