Merge pull request #79 from soonaverse/master

merge master
soonaverse · Oct 31, 2023 · 9107995 · 9107995
2 parents 84e287b + 85e5b8e
commit 9107995
Show file tree

Hide file tree

Showing 37 changed files with 175 additions and 220 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -7,5 +7,6 @@ lib
 .angular
 .github
 CONTRIBUTING.md
+CONTRIBUTORS.md
 MANIFESTO.md
 README.md
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -1,7 +1,8 @@
 # List of all contributors and SOON token reward
 
-This table provides complete history into each contributions and their SOON reward.
+This table provides complete history into each contributions and SOON rewards. It's continually updated through PRs.
 
 User | PR | SOON Reward | SMR Address | Authorized By | Comments |
 ---- | -- | ----------- | ----------- | ------------- | -------- |
 [@emmap3-do](https://github.com/emmap3-do) | https://github.com/soonaverse/app/pull/47 | 500 | smr1qzt5qs6m6s2us8ll0hdfefzpr43cdz2xmjzywmrkz0sc2uyegvzjwazr6f8 | [@adam_unchained](https://github.com/adam_unchained) | Testing, continuous support in #dev channel
+[@emmap3-do](https://github.com/emmap3-do) | https://github.com/soonaverse/app/pull/56 | 75 | smr1qzt5qs6m6s2us8ll0hdfefzpr43cdz2xmjzywmrkz0sc2uyegvzjwazr6f8 | [@adam_unchained](https://github.com/adam_unchained) | Minor fixes
diff --git a/package.json b/package.json
@@ -32,8 +32,8 @@
     "@metamask/detect-provider": "2.0.0",
     "@ngneat/until-destroy": "9.2.3",
     "@nguniversal/express-engine": "15.1.0",
-    "@build-5/interfaces": "latest",
-    "@build-5/lib": "latest",
+    "@build-5/interfaces": "*",
+    "@build-5/lib": "*",
     "@tailwindcss/line-clamp": "0.4.2",
     "algoliasearch": "4.14.3",
     "angular-instantsearch": "4.4.0",

diff --git a/src/app/@core/pipes/formatToken/format-token.pipe.ts b/src/app/@core/pipes/formatToken/format-token.pipe.ts
@@ -19,7 +19,7 @@ export interface ConvertValue {
 export class FormatTokenPipe implements PipeTransform {
   public constructor(private cache: CacheService) {}
   public async transformTest(
-    _value: number | null | undefined | ConvertValue,
+    _value: any,
     _tokenUidOrNetwork?: string | null,
     _removeZeroes = false,
     _showUnit = true,
@@ -29,7 +29,7 @@ export class FormatTokenPipe implements PipeTransform {
   }
 
   public async transform(
-    value: string | number | null | undefined | ConvertValue,
+    value: any,
     tokenUidOrNetwork?: string | null,
     removeZeroes = false,
     showUnit = true,

diff --git a/src/app/@core/utils/router.utils.ts b/src/app/@core/utils/router.utils.ts
@@ -32,8 +32,8 @@ export const ROUTER_UTILS = {
     swap: {
       root: 'swap',
     },
-    pool: {
-      root: 'pool',
+    farming: {
+      farming: 'farming',
     },
     soonStaking: {
       root: 'soon-staking',

diff --git a/src/app/@shell/ft/web-shell.module.ts b/src/app/@shell/ft/web-shell.module.ts
@@ -66,7 +66,7 @@ const APP_ROUTES: Routes = [
     canLoad: [],
   },
   {
-    path: ROUTER_UTILS.config.pool.root,
+    path: ROUTER_UTILS.config.farming.farming,
     loadChildren: async () => (await import('@pages/pool/pool.module')).PoolModule,
     canLoad: [],
   },

diff --git a/src/app/@shell/ui/sider/navigation/navigation.component.html b/src/app/@shell/ui/sider/navigation/navigation.component.html
@@ -13,13 +13,23 @@
     <a
       *ngIf="(deviceService.isNotBreakHeight$ | async) || (deviceService.isMobile$ | async)"
       nz-popover
+      [nzPopoverVisible]="!!item.highlight"
       nzPopoverPlacement="right"
       nz-menu-item
       class="flex item"
       [ngClass]="{ item__selected: isSelectedRoute(item.route) }"
       [routerLink]="item.route"
-      [nzPopoverContent]="item.title"
+      [nzPopoverContent]="item.highlight ? highlightTemplate : item.title"
+      [nzPopoverOverlayClassName]="item.highlight ? 'item__highlight' : ''"
     >
+      <ng-template #highlightTemplate>
+        <div class="text-lg" *ngIf="(deviceService.isMobile$ | async) !== true">
+          ⬅ Farming | <span class="text-2xl">🚀</span>
+          {{ item.highlight }}
+          <span class="text-2xl">🚀</span>
+        </div>
+      </ng-template>
+
       <div class="ml-4 lg:ml-0">
         <ng-template [wenMenuItem]="item"></ng-template>
       </div>

diff --git a/src/app/@shell/ui/sider/network-status/network-status.component.html b/src/app/@shell/ui/sider/network-status/network-status.component.html
@@ -229,42 +229,5 @@
         </div>
       </div>
     </ng-container>
-
-    <div class="w-full h-px mt-6 bg-foregrounds-separator dark:bg-foregrounds-separator-dark"></div>
-
-    <div class="mt-6 ml-8 mr-5">
-      <div class="flex items-center">
-        <div class="text-lg font-semibold" i18n>Assembly</div>
-      </div>
-
-      <div
-        class="flex items-center justify-center p-8 mt-4 text-xs font-medium text-center rounded-2xl bg-backgrounds-secondary dark:bg-backgrounds-secondary-dark"
-        i18n
-      >
-        Assembly Coming SOON
-      </div>
-    </div>
-
-    <div class="w-full h-px mt-6 bg-foregrounds-separator dark:bg-foregrounds-separator-dark"></div>
-
-    <div class="mt-6 pb-6 ml-8 mr-5">
-      <div class="flex items-center">
-        <div>
-          <div class="mt-2 text-lg font-semibold leading-3">Shimmer</div>
-          <div
-            class="text-sm font-medium text-foregrounds-secondary dark:text-foregrounds-secondary-dark"
-          >
-            EVM
-          </div>
-        </div>
-      </div>
-
-      <div
-        class="flex items-center justify-center p-8 mt-4 text-xs font-medium text-center rounded-2xl bg-backgrounds-secondary dark:bg-backgrounds-secondary-dark"
-        i18n
-      >
-        Shimmer EVM Coming SOON
-      </div>
-    </div>
   </div>
 </nz-drawer>
diff --git a/src/app/components/auth/services/auth.service.ts b/src/app/components/auth/services/auth.service.ts
@@ -41,6 +41,7 @@ export interface MenuItem {
   icon: any;
   title: string;
   authSepeator: boolean;
+  highlight?: string;
   unAuthauthSepeator: boolean;
 }
 
@@ -106,9 +107,10 @@ export class AuthService {
     unAuthauthSepeator: false,
   };
   private poolMenuItem: MenuItem = {
-    route: [ROUTER_UTILS.config.pool.root],
+    route: [ROUTER_UTILS.config.farming.farming],
     icon: PoolIconComponent,
-    title: $localize`Pool`,
+    title: $localize`Farming`,
+    highlight: 'Earn $SOON',
     authSepeator: false,
     unAuthauthSepeator: false,
   };

diff --git a/src/app/components/member/components/member-card/member-card.component.html b/src/app/components/member/components/member-card/member-card.component.html
@@ -53,8 +53,15 @@
         </span>
       </div>
       <p
-        class="mt-2 mb-3 leading-5 whitespace-pre-line text-accent-secondary dark:text-accent-secondary-dark truncate-line-3 text-foregrounds-primary dark:text-foregrounds-primary-dark"
-        [ngClass]="fullWidth ? 'text-base' : 'text-xs'"
+        #aboutMember
+        class="mt-2 mb-3 leading-5 whitespace-pre-line text-accent-secondary dark:text-accent-secondary-dark text-foregrounds-primary dark:text-foregrounds-primary-dark"
+        (click)="isAboutExpanded = !isAboutExpanded"
+        [ngClass]="{
+          'text-base': fullWidth,
+          'text-xs': !fullWidth,
+          'truncate-line-3': !isAboutExpanded,
+          'cursor-pointer': aboutShowPointer
+        }"
       >
         {{ about !== undefined ? about : member.about }}
       </p>

diff --git a/src/app/components/member/components/member-card/member-card.component.ts b/src/app/components/member/components/member-card/member-card.component.ts
@@ -1,5 +1,13 @@
 /* eslint-disable @typescript-eslint/adjacent-overload-signatures */
-import { ChangeDetectionStrategy, Component, Input, OnDestroy } from '@angular/core';
+import {
+  AfterViewInit,
+  ChangeDetectionStrategy,
+  Component,
+  ElementRef,
+  Input,
+  OnDestroy,
+  ViewChild,
+} from '@angular/core';
 import { MemberApi } from '@api/member.api';
 import { DeviceService } from '@core/services/device';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
@@ -14,7 +22,7 @@ import { ROUTER_UTILS } from './../../../../@core/utils/router.utils';
   styleUrls: ['./member-card.component.less'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class MemberCardComponent implements OnDestroy {
+export class MemberCardComponent implements AfterViewInit, OnDestroy {
   @Input() member?: Member;
   @Input() fullWidth?: boolean;
   @Input() allowMobileContent?: boolean;
@@ -28,6 +36,9 @@ export class MemberCardComponent implements OnDestroy {
   public totalVisibleBadges = 6;
   public path = ROUTER_UTILS.config.member.root;
   public isReputationVisible = false;
+  public isAboutExpanded = false;
+  public aboutShowPointer = false;
+  @ViewChild('aboutMember') aboutMemberEleRef?: ElementRef<HTMLElement>;
 
   constructor(private memberApi: MemberApi, public deviceService: DeviceService) {
     // none.
@@ -58,7 +69,18 @@ export class MemberCardComponent implements OnDestroy {
     return FILE_SIZES;
   }
 
+  public ngAfterViewInit(): void {
+    this.aboutPointer();
+  }
+
   public ngOnDestroy(): void {
     this.badges$.next(undefined);
   }
+
+  private aboutPointer(): void {
+    const offset = (this.aboutMemberEleRef?.nativeElement.clientHeight || 0) / 3; // matching css value -webkit-line-clamp
+    this.aboutShowPointer =
+      (this.aboutMemberEleRef?.nativeElement.scrollHeight || 0) - offset >
+      (this.aboutMemberEleRef?.nativeElement.clientHeight || 0);
+  }
 }
diff --git a/src/app/components/network/components/select-network/select-network.component.html b/src/app/components/network/components/select-network/select-network.component.html
@@ -6,6 +6,16 @@
 </div>
 
 <div class="flex flex-wrap items-center w-full">
+  <div
+    class="py-2 network"
+    [ngClass]="{
+      network__selected: selectedNetwork === networkTypes.IOTA,
+      network__disabled: !isNetworkEnabled(networkTypes.IOTA)
+    }"
+    (click)="selectNetwork.next(networkTypes.IOTA)"
+  >
+    <div class="text-lg font-semibold" i18n>IOTA</div>
+  </div>
   <div
     class="py-2 network"
     [ngClass]="{
@@ -34,32 +44,4 @@
       Testnet
     </div>
   </div>
-  <div
-    class="py-2 network"
-    [ngClass]="{
-      network__selected: selectedNetwork === networkTypes.IOTA,
-      network__disabled: !isNetworkEnabled(networkTypes.IOTA)
-    }"
-    (click)="selectNetwork.next(networkTypes.IOTA)"
-  >
-    <div class="text-lg font-semibold" i18n>IOTA</div>
-  </div>
-  <div
-    *ngIf="!environment.production"
-    class="py-2 network"
-    [ngClass]="{
-      network__selected: selectedNetwork === networkTypes.ATOI,
-      network__disabled: !isNetworkEnabled(networkTypes.ATOI)
-    }"
-    (click)="selectNetwork.next(networkTypes.ATOI)"
-  >
-    <div class="text-lg font-semibold" i18n>IOTA</div>
-    <div class="w-px h-5 bg-[#66DDCA] ml-1.5 mr-1"></div>
-    <div
-      class="font-medium -translate-y-1 text-xxs text-foregrounds-secondary dark:text-foregrounds-secondary-dark"
-      i18n
-    >
-      Devnet
-    </div>
-  </div>
 </div>
diff --git a/src/app/components/token/components/token-all-token-row/token-all-token-row.component.html b/src/app/components/token/components/token-all-token-row/token-all-token-row.component.html
@@ -26,7 +26,7 @@
         </nz-avatar>
         <div class="flex items-center ml-3 lg:block">
           <div class="text-sm font-bold lg:text-base">
-            {{ (token?.symbol === 'IOTA' ? 'M' : '') + token?.symbol }}
+            {{ token?.symbol }}
           </div>
           <div class="wen-card-highlight-title lg:text-sm lg:ml-0">{{ token?.name }}</div>
         </div>
@@ -152,9 +152,7 @@
       <div
         class="text-xs text-foregrounds-secondary dark:text-foregrounds-secondary-dark lg:w-full whitespace-nowrap"
       >
-        <ng-container i18n>24h Volume</ng-container> ({{
-          (token?.symbol === 'IOTA' ? 'M' : '') + token?.symbol
-        }})
+        <ng-container i18n>24h Volume</ng-container> ({{ token?.symbol }})
       </div>
       <div class="mt-0.5 lg:w-full whitespace-nowrap">
         {{

diff --git a/src/app/components/token/components/token-bid/token-bid.component.html b/src/app/components/token/components/token-bid/token-bid.component.html
@@ -18,7 +18,7 @@
     </nz-avatar>
     <div class="ml-4 text-lg font-bold">{{ token?.name }}</div>
     <div class="ml-2 font-medium">
-      {{ '(' + (token?.symbol === 'IOTA' ? 'M' : '') + token?.symbol + ')' }}
+      {{ '(' + token?.symbol + ')' }}
     </div>
   </div>
 
@@ -39,7 +39,7 @@
           | formatToken : token?.uid : true : false
           | async
       }}
-      {{ (token?.symbol === 'IOTA' ? 'M' : '') + token?.symbol }}
+      {{ token?.symbol }}
     </div>
   </div>
 

diff --git a/src/app/components/token/components/token-card/token-card.component.html b/src/app/components/token/components/token-card/token-card.component.html
@@ -99,7 +99,7 @@
               / {{ getPublicSaleSupply() | formatToken : token?.uid : false : false | async }}
             </span>
             <span class="text-foregrounds-primary dark:text-foregroundss-primary-dark">{{
-              (token?.symbol === 'IOTA' ? 'M' : '') + token?.symbol
+              token?.symbol
             }}</span>
           </div>
         </div>
@@ -161,7 +161,7 @@
               / {{ getPublicSaleSupply() | formatToken : token?.uid : false : false | async }}
             </span>
             <span class="text-foregrounds-primary dark:text-foregroundss-primary-dark">{{
-              (token?.symbol === 'IOTA' ? 'M' : '') + token?.symbol
+              token?.symbol
             }}</span>
           </div>
         </div>
@@ -223,7 +223,7 @@
               / {{ getPublicSaleSupply() | formatToken : token?.uid : false : false | async }}
             </span>
             <span class="text-foregrounds-primary dark:text-foregroundss-primary-dark">{{
-              (token?.symbol === 'IOTA' ? 'M' : '') + token?.symbol
+              token?.symbol
             }}</span>
           </div>
         </div>

diff --git a/src/app/components/token/components/token-highlight-card/token-highlight-card.component.html b/src/app/components/token/components/token-highlight-card/token-highlight-card.component.html
@@ -18,7 +18,7 @@
             >
             </nz-avatar>
             <div class="ml-2 text-sm font-bold">
-              {{ (token?.symbol === 'IOTA' ? 'M' : '') + token?.symbol }}
+              {{ token?.symbol }}
             </div>
             <div
               class="ml-2 text-sm font-medium text-foregrounds-secondary dark:text-foregrounds-secondary-dark"

diff --git a/src/app/components/token/components/token-info/token-info-description.component.html b/src/app/components/token/components/token-info/token-info-description.component.html
@@ -7,13 +7,7 @@
       ? {
           title: tokenInfoLabels[4],
           type: descriptionItemTypes.DEFAULT_NO_TRUNCATE,
-          value:
-            '1 ' +
-            ((token?.symbol === 'IOTA' ? 'M' : '') + token?.symbol) +
-            ' = ' +
-            token?.pricePerToken +
-            ' ' +
-            unitsService.label()
+          value: '1 ' + token?.symbol + ' = ' + token?.pricePerToken + ' ' + unitsService.label()
         }
       : null,
     !helper.isMinted(token)

diff --git a/src/app/components/token/components/token-offer-mint/token-offer-mint.component.html b/src/app/components/token/components/token-offer-mint/token-offer-mint.component.html
@@ -17,9 +17,7 @@
     >
     </nz-avatar>
     <div class="ml-4 text-lg font-bold">{{ token?.name }}</div>
-    <div class="ml-2 font-medium">
-      ({{ (token?.symbol === 'IOTA' ? 'M' : '') + token?.symbol }})
-    </div>
+    <div class="ml-2 font-medium">({{ token?.symbol }})</div>
   </div>
 
   <ng-container *ngIf="!helper.isBase(token || undefined)">
@@ -121,7 +119,7 @@
           | formatToken : token?.uid : true : false
           | async
       }}
-      {{ (token?.symbol === 'IOTA' ? 'M' : '') + token?.symbol }}
+      {{ token?.symbol }}
     </div>
   </div>
 
@@ -222,7 +220,6 @@
             | formatToken : token?.uid : true : false
             | async) +
           ' ' +
-          (token?.symbol === 'IOTA' ? 'M' : '') +
           token?.symbol
     "
   >