From 343eb425ffa315593fe2b6b9d0dd6cb192645d8c Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Tue, 4 Apr 2023 17:25:12 +0900 Subject: [PATCH 01/16] feat: routing --- .../app-derivatives-routing.module.ts | 6 +++++ .../copy-trading-routing.module.ts | 26 +++++++++++++++++++ .../pages/copy-trading/copy-trading.module.ts | 15 +++++++++++ 3 files changed, 47 insertions(+) create mode 100644 projects/portal/src/app/pages/copy-trading/copy-trading-routing.module.ts create mode 100644 projects/portal/src/app/pages/copy-trading/copy-trading.module.ts diff --git a/projects/portal/src/app/pages/apps/app-derivatives/app-derivatives-routing.module.ts b/projects/portal/src/app/pages/apps/app-derivatives/app-derivatives-routing.module.ts index 89b93ac01..bc92e39c6 100644 --- a/projects/portal/src/app/pages/apps/app-derivatives/app-derivatives-routing.module.ts +++ b/projects/portal/src/app/pages/apps/app-derivatives/app-derivatives-routing.module.ts @@ -9,6 +9,12 @@ const routes: Routes = [ loadChildren: () => import('../../derivatives/derivatives.module').then((m) => m.AppDerivativesModule), }, + { + path: 'copy-trading', + component: AppDerivativesComponent, + loadChildren: () => + import('../../copy-trading/copy-trading.module').then((m) => m.AppCopyTradingModule), + }, ]; @NgModule({ diff --git a/projects/portal/src/app/pages/copy-trading/copy-trading-routing.module.ts b/projects/portal/src/app/pages/copy-trading/copy-trading-routing.module.ts new file mode 100644 index 000000000..5d2a2a584 --- /dev/null +++ b/projects/portal/src/app/pages/copy-trading/copy-trading-routing.module.ts @@ -0,0 +1,26 @@ +import { CreateComponent } from './traders/create/create.component'; +import { TraderComponent } from './traders/trader/trader.component'; +import { TradersComponent } from './traders/traders.component'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; + +const routes: Routes = [ + { + path: 'traders', + component: TradersComponent, + }, + { + path: 'traders/:address', + component: TraderComponent, + }, + { + path: 'traders/create', + component: CreateComponent, + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class CopyTradingRoutingModule {} diff --git a/projects/portal/src/app/pages/copy-trading/copy-trading.module.ts b/projects/portal/src/app/pages/copy-trading/copy-trading.module.ts new file mode 100644 index 000000000..4270cc22a --- /dev/null +++ b/projects/portal/src/app/pages/copy-trading/copy-trading.module.ts @@ -0,0 +1,15 @@ +import { CreateModule } from '../../views/copy-trading/traders/create/create.module'; +import { TraderModule } from '../../views/copy-trading/traders/trader/trader.module'; +import { TradersModule } from '../../views/copy-trading/traders/traders.module'; +import { CopyTradingRoutingModule } from './copy-trading-routing.module'; +import { CreateComponent } from './traders/create/create.component'; +import { TraderComponent } from './traders/trader/trader.component'; +import { TradersComponent } from './traders/traders.component'; +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; + +@NgModule({ + declarations: [TradersComponent, TraderComponent, CreateComponent], + imports: [CommonModule, CopyTradingRoutingModule, TradersModule, TraderModule, CreateModule], +}) +export class AppCopyTradingModule {} From 8902357dc7213ee6cceb8e7657f835261dc17484 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Tue, 4 Apr 2023 17:25:32 +0900 Subject: [PATCH 02/16] feat: component --- .../traders/create/create.component.css | 0 .../traders/create/create.component.html | 1 + .../traders/create/create.component.ts | 15 +++++++++++++++ .../traders/trader/trader.component.css | 0 .../traders/trader/trader.component.html | 1 + .../traders/trader/trader.component.ts | 15 +++++++++++++++ .../copy-trading/traders/traders.component.css | 0 .../copy-trading/traders/traders.component.html | 1 + .../copy-trading/traders/traders.component.ts | 15 +++++++++++++++ .../traders/create/create.component.css | 0 .../traders/create/create.component.html | 1 + .../traders/create/create.component.ts | 12 ++++++++++++ .../copy-trading/traders/create/create.module.ts | 10 ++++++++++ .../traders/trader/trader.component.css | 0 .../traders/trader/trader.component.html | 1 + .../traders/trader/trader.component.ts | 15 +++++++++++++++ .../copy-trading/traders/trader/trader.module.ts | 10 ++++++++++ .../copy-trading/traders/traders.component.css | 0 .../copy-trading/traders/traders.component.html | 1 + .../copy-trading/traders/traders.component.ts | 15 +++++++++++++++ .../views/copy-trading/traders/traders.module.ts | 10 ++++++++++ 21 files changed, 123 insertions(+) create mode 100644 projects/portal/src/app/pages/copy-trading/traders/create/create.component.css create mode 100644 projects/portal/src/app/pages/copy-trading/traders/create/create.component.html create mode 100644 projects/portal/src/app/pages/copy-trading/traders/create/create.component.ts create mode 100644 projects/portal/src/app/pages/copy-trading/traders/trader/trader.component.css create mode 100644 projects/portal/src/app/pages/copy-trading/traders/trader/trader.component.html create mode 100644 projects/portal/src/app/pages/copy-trading/traders/trader/trader.component.ts create mode 100644 projects/portal/src/app/pages/copy-trading/traders/traders.component.css create mode 100644 projects/portal/src/app/pages/copy-trading/traders/traders.component.html create mode 100644 projects/portal/src/app/pages/copy-trading/traders/traders.component.ts create mode 100644 projects/portal/src/app/views/copy-trading/traders/create/create.component.css create mode 100644 projects/portal/src/app/views/copy-trading/traders/create/create.component.html create mode 100644 projects/portal/src/app/views/copy-trading/traders/create/create.component.ts create mode 100644 projects/portal/src/app/views/copy-trading/traders/create/create.module.ts create mode 100644 projects/portal/src/app/views/copy-trading/traders/trader/trader.component.css create mode 100644 projects/portal/src/app/views/copy-trading/traders/trader/trader.component.html create mode 100644 projects/portal/src/app/views/copy-trading/traders/trader/trader.component.ts create mode 100644 projects/portal/src/app/views/copy-trading/traders/trader/trader.module.ts create mode 100644 projects/portal/src/app/views/copy-trading/traders/traders.component.css create mode 100644 projects/portal/src/app/views/copy-trading/traders/traders.component.html create mode 100644 projects/portal/src/app/views/copy-trading/traders/traders.component.ts create mode 100644 projects/portal/src/app/views/copy-trading/traders/traders.module.ts diff --git a/projects/portal/src/app/pages/copy-trading/traders/create/create.component.css b/projects/portal/src/app/pages/copy-trading/traders/create/create.component.css new file mode 100644 index 000000000..e69de29bb diff --git a/projects/portal/src/app/pages/copy-trading/traders/create/create.component.html b/projects/portal/src/app/pages/copy-trading/traders/create/create.component.html new file mode 100644 index 000000000..544f9d321 --- /dev/null +++ b/projects/portal/src/app/pages/copy-trading/traders/create/create.component.html @@ -0,0 +1 @@ + diff --git a/projects/portal/src/app/pages/copy-trading/traders/create/create.component.ts b/projects/portal/src/app/pages/copy-trading/traders/create/create.component.ts new file mode 100644 index 000000000..5ee037e5d --- /dev/null +++ b/projects/portal/src/app/pages/copy-trading/traders/create/create.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-create', + templateUrl: './create.component.html', + styleUrls: ['./create.component.css'] +}) +export class CreateComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/projects/portal/src/app/pages/copy-trading/traders/trader/trader.component.css b/projects/portal/src/app/pages/copy-trading/traders/trader/trader.component.css new file mode 100644 index 000000000..e69de29bb diff --git a/projects/portal/src/app/pages/copy-trading/traders/trader/trader.component.html b/projects/portal/src/app/pages/copy-trading/traders/trader/trader.component.html new file mode 100644 index 000000000..fe2d753c1 --- /dev/null +++ b/projects/portal/src/app/pages/copy-trading/traders/trader/trader.component.html @@ -0,0 +1 @@ + diff --git a/projects/portal/src/app/pages/copy-trading/traders/trader/trader.component.ts b/projects/portal/src/app/pages/copy-trading/traders/trader/trader.component.ts new file mode 100644 index 000000000..81f5bf4a5 --- /dev/null +++ b/projects/portal/src/app/pages/copy-trading/traders/trader/trader.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-trader', + templateUrl: './trader.component.html', + styleUrls: ['./trader.component.css'] +}) +export class TraderComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/projects/portal/src/app/pages/copy-trading/traders/traders.component.css b/projects/portal/src/app/pages/copy-trading/traders/traders.component.css new file mode 100644 index 000000000..e69de29bb diff --git a/projects/portal/src/app/pages/copy-trading/traders/traders.component.html b/projects/portal/src/app/pages/copy-trading/traders/traders.component.html new file mode 100644 index 000000000..1c2094e14 --- /dev/null +++ b/projects/portal/src/app/pages/copy-trading/traders/traders.component.html @@ -0,0 +1 @@ + diff --git a/projects/portal/src/app/pages/copy-trading/traders/traders.component.ts b/projects/portal/src/app/pages/copy-trading/traders/traders.component.ts new file mode 100644 index 000000000..9430c6a88 --- /dev/null +++ b/projects/portal/src/app/pages/copy-trading/traders/traders.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-traders', + templateUrl: './traders.component.html', + styleUrls: ['./traders.component.css'] +}) +export class TradersComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/projects/portal/src/app/views/copy-trading/traders/create/create.component.css b/projects/portal/src/app/views/copy-trading/traders/create/create.component.css new file mode 100644 index 000000000..e69de29bb diff --git a/projects/portal/src/app/views/copy-trading/traders/create/create.component.html b/projects/portal/src/app/views/copy-trading/traders/create/create.component.html new file mode 100644 index 000000000..f8c979e31 --- /dev/null +++ b/projects/portal/src/app/views/copy-trading/traders/create/create.component.html @@ -0,0 +1 @@ +

create works!

diff --git a/projects/portal/src/app/views/copy-trading/traders/create/create.component.ts b/projects/portal/src/app/views/copy-trading/traders/create/create.component.ts new file mode 100644 index 000000000..e064c5768 --- /dev/null +++ b/projects/portal/src/app/views/copy-trading/traders/create/create.component.ts @@ -0,0 +1,12 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'view-create', + templateUrl: './create.component.html', + styleUrls: ['./create.component.css'], +}) +export class CreateComponent implements OnInit { + constructor() {} + + ngOnInit(): void {} +} diff --git a/projects/portal/src/app/views/copy-trading/traders/create/create.module.ts b/projects/portal/src/app/views/copy-trading/traders/create/create.module.ts new file mode 100644 index 000000000..43e28acfd --- /dev/null +++ b/projects/portal/src/app/views/copy-trading/traders/create/create.module.ts @@ -0,0 +1,10 @@ +import { CreateComponent } from './create.component'; +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; + +@NgModule({ + declarations: [CreateComponent], + imports: [CommonModule], + exports: [CreateComponent], +}) +export class CreateModule {} diff --git a/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.css b/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.css new file mode 100644 index 000000000..e69de29bb diff --git a/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.html b/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.html new file mode 100644 index 000000000..640efd8b2 --- /dev/null +++ b/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.html @@ -0,0 +1 @@ +

trader works!

diff --git a/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.ts b/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.ts new file mode 100644 index 000000000..6f6415621 --- /dev/null +++ b/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'view-trader', + templateUrl: './trader.component.html', + styleUrls: ['./trader.component.css'] +}) +export class TraderComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/projects/portal/src/app/views/copy-trading/traders/trader/trader.module.ts b/projects/portal/src/app/views/copy-trading/traders/trader/trader.module.ts new file mode 100644 index 000000000..c8cf36e8c --- /dev/null +++ b/projects/portal/src/app/views/copy-trading/traders/trader/trader.module.ts @@ -0,0 +1,10 @@ +import { TraderComponent } from './trader.component'; +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; + +@NgModule({ + declarations: [TraderComponent], + imports: [CommonModule], + exports: [TraderComponent], +}) +export class TraderModule {} diff --git a/projects/portal/src/app/views/copy-trading/traders/traders.component.css b/projects/portal/src/app/views/copy-trading/traders/traders.component.css new file mode 100644 index 000000000..e69de29bb diff --git a/projects/portal/src/app/views/copy-trading/traders/traders.component.html b/projects/portal/src/app/views/copy-trading/traders/traders.component.html new file mode 100644 index 000000000..e1770171d --- /dev/null +++ b/projects/portal/src/app/views/copy-trading/traders/traders.component.html @@ -0,0 +1 @@ +

traders works!

diff --git a/projects/portal/src/app/views/copy-trading/traders/traders.component.ts b/projects/portal/src/app/views/copy-trading/traders/traders.component.ts new file mode 100644 index 000000000..6b3c5f92c --- /dev/null +++ b/projects/portal/src/app/views/copy-trading/traders/traders.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'view-traders', + templateUrl: './traders.component.html', + styleUrls: ['./traders.component.css'] +}) +export class TradersComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/projects/portal/src/app/views/copy-trading/traders/traders.module.ts b/projects/portal/src/app/views/copy-trading/traders/traders.module.ts new file mode 100644 index 000000000..4009d8fca --- /dev/null +++ b/projects/portal/src/app/views/copy-trading/traders/traders.module.ts @@ -0,0 +1,10 @@ +import { TradersComponent } from './traders.component'; +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; + +@NgModule({ + declarations: [TradersComponent], + imports: [CommonModule], + exports: [TradersComponent], +}) +export class TradersModule {} From 84ab285e75352ec8d083589500f554ddf0cd36b0 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Tue, 4 Apr 2023 17:41:00 +0900 Subject: [PATCH 03/16] feat: page impl --- .../traders/create/create.component.html | 76 +++++- .../traders/create/create.component.ts | 3 + .../traders/create/create.module.ts | 3 +- .../traders/trader/trader.component.html | 224 +++++++++++++++++- .../traders/trader/trader.component.ts | 12 +- .../traders/trader/trader.module.ts | 3 +- .../traders/traders.component.html | 138 ++++++++++- 7 files changed, 449 insertions(+), 10 deletions(-) diff --git a/projects/portal/src/app/views/copy-trading/traders/create/create.component.html b/projects/portal/src/app/views/copy-trading/traders/create/create.component.html index f8c979e31..9cb4568d5 100644 --- a/projects/portal/src/app/views/copy-trading/traders/create/create.component.html +++ b/projects/portal/src/app/views/copy-trading/traders/create/create.component.html @@ -1 +1,75 @@ -

create works!

+
+
+

Become an Exemplary Trader

+
+ +
+
+
+

Exemplary traders Settings

+ + + + + + + +
Addressununifi155u042u8wk3al32h3vzxu989jj76k4zcu44v6w
+
+
+ + +
+
+ + +
+
+ + + + +
+
+ +
+
+
+
+
+
diff --git a/projects/portal/src/app/views/copy-trading/traders/create/create.component.ts b/projects/portal/src/app/views/copy-trading/traders/create/create.component.ts index e064c5768..2bb5895b8 100644 --- a/projects/portal/src/app/views/copy-trading/traders/create/create.component.ts +++ b/projects/portal/src/app/views/copy-trading/traders/create/create.component.ts @@ -6,6 +6,9 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./create.component.css'], }) export class CreateComponent implements OnInit { + commissionRate?: number; + newRate?: number; + constructor() {} ngOnInit(): void {} diff --git a/projects/portal/src/app/views/copy-trading/traders/create/create.module.ts b/projects/portal/src/app/views/copy-trading/traders/create/create.module.ts index 43e28acfd..d234ee6de 100644 --- a/projects/portal/src/app/views/copy-trading/traders/create/create.module.ts +++ b/projects/portal/src/app/views/copy-trading/traders/create/create.module.ts @@ -1,10 +1,11 @@ import { CreateComponent } from './create.component'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { FormsModule } from '@angular/forms'; @NgModule({ declarations: [CreateComponent], - imports: [CommonModule], + imports: [CommonModule, FormsModule], exports: [CreateComponent], }) export class CreateModule {} diff --git a/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.html b/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.html index 640efd8b2..98ecd0098 100644 --- a/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.html +++ b/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.html @@ -1 +1,223 @@ -

trader works!

+
+
+

Exemplary traders

+
+ +
+
+
+
+
#1
+
+

UnUniFi Exemplary traders 1

+ + + + + + + + + + + +
Addressununifi155u042u8wk3al32h3vzxu989jj76k4zcu44v6w
Registered Date2023-3-14 AM 12:50:08 GMT+9
+

+ The momentum trading strategy involves identifying a cryptocurrency that is on an upward + trend and has high trading volume. Traders can use technical analysis to identify these + trends through analyzing charts and indicators like moving averages, relative strength + index (RSI), and stochastic oscillators. +

+

+ Once a promising cryptocurrency has been identified, the trader opens a position by buying + in at a relatively low price. The goal is to ride the upward trend and sell off the + position as the price continues to rise. +

+
+
+
Current APY
+
12.34%
+
+
+
+
Commission Fee
+
1.23%
+
+
+
+
Users
+
1024
+
+
+
+ +

Chart Coming soon

+ +
+ + + + +
+ +
+
+

Are you sure to subscribe this Trader?

+
+
+ + + + +
+
+ + + +
+
+ + +
+
+
+
+ + +
+
+

Are you sure to unsubscribe this Trader?

+
+
+ + +
+
+
+
+ + +
+
+

Are you sure to delete yor Exemplary trader?

+
+
+ + +
+
+
+
+ + +
+
+

+ Are you sure to update your Exemplary trader settings? +

+
+
+ + +
+
+ + + + +
+
+ + +
+
+
+
+
+
+
+
diff --git a/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.ts b/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.ts index 6f6415621..4038489de 100644 --- a/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.ts +++ b/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.ts @@ -3,13 +3,15 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'view-trader', templateUrl: './trader.component.html', - styleUrls: ['./trader.component.css'] + styleUrls: ['./trader.component.css'], }) export class TraderComponent implements OnInit { + sizeCoef: number = 100; + leverageCoef: number = 100; + commissionRate?: number; + newRate?: number; - constructor() { } - - ngOnInit(): void { - } + constructor() {} + ngOnInit(): void {} } diff --git a/projects/portal/src/app/views/copy-trading/traders/trader/trader.module.ts b/projects/portal/src/app/views/copy-trading/traders/trader/trader.module.ts index c8cf36e8c..c6946e004 100644 --- a/projects/portal/src/app/views/copy-trading/traders/trader/trader.module.ts +++ b/projects/portal/src/app/views/copy-trading/traders/trader/trader.module.ts @@ -1,10 +1,11 @@ import { TraderComponent } from './trader.component'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { FormsModule } from '@angular/forms'; @NgModule({ declarations: [TraderComponent], - imports: [CommonModule], + imports: [CommonModule, FormsModule], exports: [TraderComponent], }) export class TraderModule {} diff --git a/projects/portal/src/app/views/copy-trading/traders/traders.component.html b/projects/portal/src/app/views/copy-trading/traders/traders.component.html index e1770171d..24f5f0284 100644 --- a/projects/portal/src/app/views/copy-trading/traders/traders.component.html +++ b/projects/portal/src/app/views/copy-trading/traders/traders.component.html @@ -1 +1,137 @@ -

traders works!

+
+
+

Your Subscribing Trader

+
+
+
+
+
+
#1
+
+

UnUniFi Exemplary traders 1

+
+
+
Size Coefficient
+
10%
+
+
+
+
Leverage Coefficient
+
100%
+
+
+
+
Current APY
+
1.234%
+
+
+
+
Commission Fee
+
1.23%
+
+
+
+ +
+ + +
+ +
+
+

Are you sure to unsubscribe this Trader?

+
+
+ + +
+
+
+
+
+
+
+ +
+

Exemplary Traders

+
+ +
+
+
+
+
#1
+
+

UnUniFi Exemplary traders 1

+
+
+
Current APY
+
12.34%
+
+
+
+
Commission Fee
+
1.23%
+
+
+
+
Users
+
1024
+
+
+
+ +
+ +
+
+
+
+ +
+
+
+
+
#2
+
+

UnUniFi Exemplary traders 2

+
+
+
Current APY
+
10.23%
+
+
+
+
Commission Fee
+
1.23%
+
+
+
+
Users
+
24
+
+
+
+ +
+ +
+
+
+
+
From 4918f23a6df7aed124e4cc5c194aed4abb4975f0 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Tue, 4 Apr 2023 18:02:49 +0900 Subject: [PATCH 04/16] feat: fix & mobile --- .../copy-trading-routing.module.ts | 8 ++--- .../traders/create/create.component.html | 34 +++++++++---------- .../traders/create/create.component.ts | 1 - .../traders/trader/trader.component.html | 30 ++++++++-------- .../traders/traders.component.html | 16 +++++---- .../copy-trading/traders/traders.module.ts | 3 +- 6 files changed, 48 insertions(+), 44 deletions(-) diff --git a/projects/portal/src/app/pages/copy-trading/copy-trading-routing.module.ts b/projects/portal/src/app/pages/copy-trading/copy-trading-routing.module.ts index 5d2a2a584..3c7667f70 100644 --- a/projects/portal/src/app/pages/copy-trading/copy-trading-routing.module.ts +++ b/projects/portal/src/app/pages/copy-trading/copy-trading-routing.module.ts @@ -9,14 +9,14 @@ const routes: Routes = [ path: 'traders', component: TradersComponent, }, - { - path: 'traders/:address', - component: TraderComponent, - }, { path: 'traders/create', component: CreateComponent, }, + { + path: 'traders/:address', + component: TraderComponent, + }, ]; @NgModule({ diff --git a/projects/portal/src/app/views/copy-trading/traders/create/create.component.html b/projects/portal/src/app/views/copy-trading/traders/create/create.component.html index 9cb4568d5..dee866ffb 100644 --- a/projects/portal/src/app/views/copy-trading/traders/create/create.component.html +++ b/projects/portal/src/app/views/copy-trading/traders/create/create.component.html @@ -7,15 +7,17 @@

Become an Exemplary Trader

Exemplary traders Settings

- - - - - - - -
Addressununifi155u042u8wk3al32h3vzxu989jj76k4zcu44v6w
+
+ + +

UnUniFi Exemplary traders 1

- - - - - - - - - - - -
Addressununifi155u042u8wk3al32h3vzxu989jj76k4zcu44v6w
Registered Date2023-3-14 AM 12:50:08 GMT+9
+
+ + + + + + + + + + + +
Addressununifi155u042u8wk3al32h3vzxu989jj76k4zcu44v6w
Registered Date2023-3-14 AM 12:50:08 GMT+9
+

The momentum trading strategy involves identifying a cryptocurrency that is on an upward trend and has high trading volume. Traders can use technical analysis to identify these @@ -33,7 +35,7 @@

UnUniFi Exemplary traders 1

in at a relatively low price. The goal is to ride the upward trend and sell off the position as the price continues to rise.

-
+
Current APY
12.34%
@@ -51,8 +53,6 @@

UnUniFi Exemplary traders 1

-

Chart Coming soon

-
diff --git a/projects/portal/src/app/views/copy-trading/traders/traders.component.html b/projects/portal/src/app/views/copy-trading/traders/traders.component.html index 24f5f0284..d542751b9 100644 --- a/projects/portal/src/app/views/copy-trading/traders/traders.component.html +++ b/projects/portal/src/app/views/copy-trading/traders/traders.component.html @@ -9,7 +9,7 @@

Your Subscribing Trader

#1

UnUniFi Exemplary traders 1

-
+
Size Coefficient
10%
@@ -35,7 +35,7 @@

UnUniFi Exemplary traders 1

@@ -59,6 +59,10 @@

Are you sure to unsubscribe this Trader?

Exemplary Traders

+ +
@@ -68,7 +72,7 @@

Exemplary Traders

#1

UnUniFi Exemplary traders 1

-
+
Current APY
12.34%
@@ -89,7 +93,7 @@

UnUniFi Exemplary traders 1

@@ -105,7 +109,7 @@

UnUniFi Exemplary traders 1

#2

UnUniFi Exemplary traders 2

-
+
Current APY
10.23%
@@ -126,7 +130,7 @@

UnUniFi Exemplary traders 2

diff --git a/projects/portal/src/app/views/copy-trading/traders/traders.module.ts b/projects/portal/src/app/views/copy-trading/traders/traders.module.ts index 4009d8fca..5a8a03c40 100644 --- a/projects/portal/src/app/views/copy-trading/traders/traders.module.ts +++ b/projects/portal/src/app/views/copy-trading/traders/traders.module.ts @@ -1,10 +1,11 @@ import { TradersComponent } from './traders.component'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; @NgModule({ declarations: [TradersComponent], - imports: [CommonModule], + imports: [CommonModule, RouterModule], exports: [TradersComponent], }) export class TradersModule {} From bf470ad5eec935506e73c5bd3060d2cd8e200788 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 5 Apr 2023 13:41:07 +0900 Subject: [PATCH 05/16] feat: side nav --- .../apps/app-derivatives/app-derivatives.component.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/projects/portal/src/app/views/apps/app-derivatives/app-derivatives.component.html b/projects/portal/src/app/views/apps/app-derivatives/app-derivatives.component.html index 8c9f7496e..b79ce1208 100644 --- a/projects/portal/src/app/views/apps/app-derivatives/app-derivatives.component.html +++ b/projects/portal/src/app/views/apps/app-derivatives/app-derivatives.component.html @@ -71,6 +71,14 @@ Pool +
  • + +
  • Apps From 1157b287ee55e7bd39444fe18212ff2d995d7db3 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Tue, 11 Apr 2023 20:41:42 +0900 Subject: [PATCH 06/16] feat: ununifi-ts update --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index ded870b2a..3d3133fa5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "stream-browserify": "^3.0.0", "stream-http": "^3.2.0", "tslib": "^2.3.0", - "ununifi-client": "^0.46.4", + "ununifi-client": "^0.46.5-dev1", "zone.js": "~0.11.4" }, "devDependencies": { @@ -40076,9 +40076,9 @@ } }, "node_modules/ununifi-client": { - "version": "0.46.4", - "resolved": "https://registry.npmjs.org/ununifi-client/-/ununifi-client-0.46.4.tgz", - "integrity": "sha512-oCPlLAWbMra5LhOYIJtTyA0LfH4zI2NPWcvBDgKvD25M7Ad0fx5nvrVE2vvwAqY//jxx0TBR8SSFBHNdCYPIZw==", + "version": "0.46.5-dev1", + "resolved": "https://registry.npmjs.org/ununifi-client/-/ununifi-client-0.46.5-dev1.tgz", + "integrity": "sha512-a2C8cqZNA2tWVHxN/dvOu+Y7NUieLwUj10ORQAxlix0GI4HYK0bZzS9MjTTbrRbRgD0vIF9L2qJtRtptikPOJQ==", "dependencies": { "axios": "^0.21.1", "protobufjs": "^6.11.2" @@ -71540,9 +71540,9 @@ "dev": true }, "ununifi-client": { - "version": "0.46.4", - "resolved": "https://registry.npmjs.org/ununifi-client/-/ununifi-client-0.46.4.tgz", - "integrity": "sha512-oCPlLAWbMra5LhOYIJtTyA0LfH4zI2NPWcvBDgKvD25M7Ad0fx5nvrVE2vvwAqY//jxx0TBR8SSFBHNdCYPIZw==", + "version": "0.46.5-dev1", + "resolved": "https://registry.npmjs.org/ununifi-client/-/ununifi-client-0.46.5-dev1.tgz", + "integrity": "sha512-a2C8cqZNA2tWVHxN/dvOu+Y7NUieLwUj10ORQAxlix0GI4HYK0bZzS9MjTTbrRbRgD0vIF9L2qJtRtptikPOJQ==", "requires": { "axios": "^0.21.1", "protobufjs": "^6.11.2" diff --git a/package.json b/package.json index de3d3ac7e..9afa4a773 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "stream-browserify": "^3.0.0", "stream-http": "^3.2.0", "tslib": "^2.3.0", - "ununifi-client": "^0.46.4", + "ununifi-client": "^0.46.5-dev1", "zone.js": "~0.11.4" }, "devDependencies": { From b24311119a24d22d0289afd25eb294bbb200fa31 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Tue, 11 Apr 2023 21:18:58 +0900 Subject: [PATCH 07/16] feat: ununifi-ts support --- package-lock.json | 14 ++-- package.json | 2 +- .../copy-trading.application.service.ts | 8 ++ .../models/copy-trading/copy-trading.model.ts | 29 +++++++ .../copy-trading.query.service.ts | 58 ++++++++++++++ .../copy-trading/copy-trading.service.ts | 78 +++++++++++++++++++ .../models/derivatives/derivatives.service.ts | 6 +- 7 files changed, 184 insertions(+), 11 deletions(-) create mode 100644 projects/portal/src/app/models/copy-trading/copy-trading.application.service.ts create mode 100644 projects/portal/src/app/models/copy-trading/copy-trading.model.ts create mode 100644 projects/portal/src/app/models/copy-trading/copy-trading.query.service.ts create mode 100644 projects/portal/src/app/models/copy-trading/copy-trading.service.ts diff --git a/package-lock.json b/package-lock.json index 3d3133fa5..7a22c3ec0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "stream-browserify": "^3.0.0", "stream-http": "^3.2.0", "tslib": "^2.3.0", - "ununifi-client": "^0.46.5-dev1", + "ununifi-client": "^0.46.5-dev2", "zone.js": "~0.11.4" }, "devDependencies": { @@ -40076,9 +40076,9 @@ } }, "node_modules/ununifi-client": { - "version": "0.46.5-dev1", - "resolved": "https://registry.npmjs.org/ununifi-client/-/ununifi-client-0.46.5-dev1.tgz", - "integrity": "sha512-a2C8cqZNA2tWVHxN/dvOu+Y7NUieLwUj10ORQAxlix0GI4HYK0bZzS9MjTTbrRbRgD0vIF9L2qJtRtptikPOJQ==", + "version": "0.46.5-dev2", + "resolved": "https://registry.npmjs.org/ununifi-client/-/ununifi-client-0.46.5-dev2.tgz", + "integrity": "sha512-T9evt/03cUxl/5R6QJEJ0eUIssE1CK1+cZd2mrKfV7Cj0GVi8Yj00vCjO2TEURWXd35vIghtTujd8mpcfWg6kQ==", "dependencies": { "axios": "^0.21.1", "protobufjs": "^6.11.2" @@ -71540,9 +71540,9 @@ "dev": true }, "ununifi-client": { - "version": "0.46.5-dev1", - "resolved": "https://registry.npmjs.org/ununifi-client/-/ununifi-client-0.46.5-dev1.tgz", - "integrity": "sha512-a2C8cqZNA2tWVHxN/dvOu+Y7NUieLwUj10ORQAxlix0GI4HYK0bZzS9MjTTbrRbRgD0vIF9L2qJtRtptikPOJQ==", + "version": "0.46.5-dev2", + "resolved": "https://registry.npmjs.org/ununifi-client/-/ununifi-client-0.46.5-dev2.tgz", + "integrity": "sha512-T9evt/03cUxl/5R6QJEJ0eUIssE1CK1+cZd2mrKfV7Cj0GVi8Yj00vCjO2TEURWXd35vIghtTujd8mpcfWg6kQ==", "requires": { "axios": "^0.21.1", "protobufjs": "^6.11.2" diff --git a/package.json b/package.json index 9afa4a773..d757fc45c 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "stream-browserify": "^3.0.0", "stream-http": "^3.2.0", "tslib": "^2.3.0", - "ununifi-client": "^0.46.5-dev1", + "ununifi-client": "^0.46.5-dev2", "zone.js": "~0.11.4" }, "devDependencies": { diff --git a/projects/portal/src/app/models/copy-trading/copy-trading.application.service.ts b/projects/portal/src/app/models/copy-trading/copy-trading.application.service.ts new file mode 100644 index 000000000..48b2cfe46 --- /dev/null +++ b/projects/portal/src/app/models/copy-trading/copy-trading.application.service.ts @@ -0,0 +1,8 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root', +}) +export class CopyTradingApplicationService { + constructor() {} +} diff --git a/projects/portal/src/app/models/copy-trading/copy-trading.model.ts b/projects/portal/src/app/models/copy-trading/copy-trading.model.ts new file mode 100644 index 000000000..35194b36a --- /dev/null +++ b/projects/portal/src/app/models/copy-trading/copy-trading.model.ts @@ -0,0 +1,29 @@ +export type CreateExemplaryTraderRequest = { + sender: string; + name: string; + description: string; + profitCommissionRate: number; +}; + +export type UpdateExemplaryTraderRequest = { + sender: string; + name: string; + description: string; + profitCommissionRate: number; +}; + +export type DeleteExemplaryTraderRequest = { + sender: string; +}; + +export type CreateTracingRequest = { + sender: string; + exemplaryTrader: string; + sizeCoef: number; + leverageCoef: number; + reverse: boolean; +}; + +export type DeleteTracingRequest = { + sender: string; +}; diff --git a/projects/portal/src/app/models/copy-trading/copy-trading.query.service.ts b/projects/portal/src/app/models/copy-trading/copy-trading.query.service.ts new file mode 100644 index 000000000..a66b6414e --- /dev/null +++ b/projects/portal/src/app/models/copy-trading/copy-trading.query.service.ts @@ -0,0 +1,58 @@ +import { CosmosSDKService } from '../cosmos-sdk.service'; +import { Injectable } from '@angular/core'; +import { CosmosSDK } from '@cosmos-client/core/cjs/sdk'; +import { Observable } from 'rxjs'; +import { map, mergeMap, pluck } from 'rxjs/operators'; +import ununificlient from 'ununifi-client'; +import { + ExemplaryTraderAll200ResponseExemplaryTraderInner, + ExemplaryTraderTracing200ResponseTracingInner, +} from 'ununifi-client/esm/openapi'; + +@Injectable({ providedIn: 'root' }) +export class CopyTradingQueryService { + private restSdk$: Observable; + + constructor(private cosmosSDK: CosmosSDKService) { + this.restSdk$ = this.cosmosSDK.sdk$.pipe(pluck('rest')); + } + + listExemplaryTraders$(): Observable { + return this.restSdk$.pipe( + mergeMap((sdk) => ununificlient.rest.copyTrading.exemplaryTraderAll(sdk)), + map((res) => res.data.exemplaryTrader!), + ); + } + + getExemplaryTrader$( + address: string, + ): Observable { + return this.restSdk$.pipe( + mergeMap((sdk) => ununificlient.rest.copyTrading.exemplaryTrader(sdk, address)), + map((res) => res.data.exemplaryTrader!), + ); + } + + listTracingsExemplaryTrader$( + address: string, + ): Observable { + return this.restSdk$.pipe( + mergeMap((sdk) => ununificlient.rest.copyTrading.exemplaryTraderTracing(sdk, address)), + map((res) => res.data.tracing!), + ); + } + + listAllTracings$(): Observable { + return this.restSdk$.pipe( + mergeMap((sdk) => ununificlient.rest.copyTrading.tracingAll(sdk)), + map((res) => res.data.tracing!), + ); + } + + getTracing$(address: string): Observable { + return this.restSdk$.pipe( + mergeMap((sdk) => ununificlient.rest.copyTrading.tracing(sdk, address)), + map((res) => res.data.tracing!), + ); + } +} diff --git a/projects/portal/src/app/models/copy-trading/copy-trading.service.ts b/projects/portal/src/app/models/copy-trading/copy-trading.service.ts new file mode 100644 index 000000000..8cd83bcad --- /dev/null +++ b/projects/portal/src/app/models/copy-trading/copy-trading.service.ts @@ -0,0 +1,78 @@ +import { TxCommonService } from '../cosmos/tx-common.service'; +import { Injectable } from '@angular/core'; +import ununificlient from 'ununifi-client'; + +@Injectable({ + providedIn: 'root', +}) +export class CopyTradingService { + constructor(private readonly txCommon: TxCommonService) {} + + buildMsgCreateExemplaryTrader( + sender: string, + name: string, + description: string, + profitCommissionRate: number, + ) { + const decProfitCommissionRate = this.txCommon.numberToDecString(profitCommissionRate); + const msgCreateExemplaryTrader = + new ununificlient.proto.ununifi.copytrading.MsgCreateExemplaryTrader({ + sender, + name, + description, + profit_commission_rate: decProfitCommissionRate, + }); + return msgCreateExemplaryTrader; + } + + buildMsgUpdateExemplaryTrader( + sender: string, + name: string, + description: string, + profitCommissionRate: number, + ) { + const decProfitCommissionRate = this.txCommon.numberToDecString(profitCommissionRate); + const msgUpdateExemplaryTrader = + new ununificlient.proto.ununifi.copytrading.MsgUpdateExemplaryTrader({ + sender, + name, + description, + profit_commission_rate: decProfitCommissionRate, + }); + return msgUpdateExemplaryTrader; + } + + buildMsgDeleteExemplaryTrader(sender: string) { + const msgDeleteExemplaryTrader = + new ununificlient.proto.ununifi.copytrading.MsgDeleteExemplaryTrader({ + sender, + }); + return msgDeleteExemplaryTrader; + } + + buildMsgCreateTracing( + sender: string, + exemplaryTrader: string, + sizeCoef: number, + leverageCoef: number, + reverse: boolean, + ) { + const decSizeCoef = this.txCommon.numberToDecString(sizeCoef); + const decLeverageCoef = this.txCommon.numberToDecString(leverageCoef); + const msgCreateTracing = new ununificlient.proto.ununifi.copytrading.MsgCreateTracing({ + sender, + exemplary_trader: exemplaryTrader, + size_coefficient: decSizeCoef, + leverage_coefficient: decLeverageCoef, + reverse, + }); + return msgCreateTracing; + } + + buildMsgDeleteTracing(sender: string) { + const msgDeleteTracing = new ununificlient.proto.ununifi.copytrading.MsgDeleteTracing({ + sender, + }); + return msgDeleteTracing; + } +} diff --git a/projects/portal/src/app/models/derivatives/derivatives.service.ts b/projects/portal/src/app/models/derivatives/derivatives.service.ts index 14fa421cf..29d29ee67 100644 --- a/projects/portal/src/app/models/derivatives/derivatives.service.ts +++ b/projects/portal/src/app/models/derivatives/derivatives.service.ts @@ -57,7 +57,7 @@ export class DerivativesService { )[0]; const msgMintLiquidityProviderToken = - new ununificlient.proto.ununifi.derivatives.MsgMintLiquidityProviderToken({ + new ununificlient.proto.ununifi.derivatives.MsgDepositToPool({ sender: senderAddress, amount: coin, }); @@ -79,9 +79,9 @@ export class DerivativesService { const redeemDenom = symbolMetadataMap?.[redeemSymbol].base; const msgMintLiquidityProviderToken = - new ununificlient.proto.ununifi.derivatives.MsgBurnLiquidityProviderToken({ + new ununificlient.proto.ununifi.derivatives.MsgWithdrawFromPool({ sender: senderAddress, - amount: coin.amount, + lpt_amount: coin.amount, redeem_denom: redeemDenom, }); return msgMintLiquidityProviderToken; From d9079f6c0d66a9f24d55ecd18a7c16a4209914ad Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 5 Apr 2023 17:26:13 +0900 Subject: [PATCH 08/16] feat: new query type & msg --- .../derivatives.application.service.ts | 8 +-- .../derivatives/derivatives.query.service.ts | 8 +-- .../models/derivatives/derivatives.service.ts | 11 +-- .../nft-pawnshop.query.service.ts | 11 ++- .../pages/derivatives/pool/pool.component.ts | 1 - .../borrower-nft/borrow/borrow.component.ts | 8 ++- .../borrower-nft/borrower-nft.component.ts | 6 +- .../borrower-nft/repay/repay.component.ts | 9 +-- .../borrowers/borrower/borrower.component.ts | 9 ++- .../borrowers/borrowers.component.ts | 2 +- .../lender-nft/lender-nft.component.ts | 4 +- .../place-bid/place-bid.component.ts | 4 +- .../lenders/lender/lender.component.ts | 4 +- .../nft-pawnshop/lenders/lenders.component.ts | 7 +- .../derivatives/pool/pool.component.html | 4 +- .../views/derivatives/pool/pool.component.ts | 4 +- .../borrower-nft/borrow/borrow.component.ts | 4 +- .../borrower-nft/borrower-nft.component.ts | 4 +- .../borrower-nft/repay/repay.component.ts | 4 +- .../borrower/borrower.component.html | 68 ++++++++++--------- .../lender-nft/lender-nft.component.ts | 4 +- .../place-bid/place-bid.component.ts | 4 +- .../lenders/lender/lender.component.ts | 4 +- 23 files changed, 100 insertions(+), 92 deletions(-) diff --git a/projects/portal/src/app/models/derivatives/derivatives.application.service.ts b/projects/portal/src/app/models/derivatives/derivatives.application.service.ts index 9a6fa8608..6ca723957 100644 --- a/projects/portal/src/app/models/derivatives/derivatives.application.service.ts +++ b/projects/portal/src/app/models/derivatives/derivatives.application.service.ts @@ -172,13 +172,7 @@ export class DerivativesApplicationService { .toPromise(); const perpetualFuturesPositionInstance = - this.derivativesService.buildPerpetualFuturesPositionInstance( - baseSymbol, - positionType, - size * 10 ** 12, - leverage, - symbolMetadataMap, - ); + this.derivativesService.buildPerpetualFuturesPositionInstance(positionType, size, leverage); const positionInstance: cosmosclient.proto.google.protobuf.IAny = cosmosclient.codec.instanceToProtoAny(perpetualFuturesPositionInstance); diff --git a/projects/portal/src/app/models/derivatives/derivatives.query.service.ts b/projects/portal/src/app/models/derivatives/derivatives.query.service.ts index 1216b0389..5274fa9b3 100644 --- a/projects/portal/src/app/models/derivatives/derivatives.query.service.ts +++ b/projects/portal/src/app/models/derivatives/derivatives.query.service.ts @@ -2,14 +2,14 @@ import { CosmosSDKService } from '../cosmos-sdk.service'; import { Injectable } from '@angular/core'; import cosmosclient from '@cosmos-client/core'; import { CosmosSDK } from '@cosmos-client/core/cjs/sdk'; -import { AccAddress } from '@cosmos-client/core/cjs/types'; -import { Observable, zip } from 'rxjs'; -import { filter, map, mergeMap, pluck } from 'rxjs/operators'; +import { Observable } from 'rxjs'; +import { map, mergeMap, pluck } from 'rxjs/operators'; import ununificlient from 'ununifi-client'; import { AllPositions200ResponsePositionsInner, DerivativesParams200ResponseParams, EstimateDLPTokenAmount200Response, + EstimateRedeemAmount200Response, PerpetualFutures200Response, PerpetualFuturesMarket200Response, Pool200Response, @@ -45,7 +45,7 @@ export class DerivativesQueryService { getEstimateRedeemTokenAmount( redeemDenom: string, lptAmount: string, - ): Observable { + ): Observable { return this.restSdk$.pipe( mergeMap((sdk) => ununificlient.rest.derivatives.estimateRedeemAmount(sdk, redeemDenom, lptAmount), diff --git a/projects/portal/src/app/models/derivatives/derivatives.service.ts b/projects/portal/src/app/models/derivatives/derivatives.service.ts index 29d29ee67..f8ff026f5 100644 --- a/projects/portal/src/app/models/derivatives/derivatives.service.ts +++ b/projects/portal/src/app/models/derivatives/derivatives.service.ts @@ -1,5 +1,6 @@ import { CosmosSDKService } from '../cosmos-sdk.service'; import { BankService } from '../cosmos/bank.service'; +import { TxCommonService } from '../cosmos/tx-common.service'; import { Injectable } from '@angular/core'; import cosmosclient from '@cosmos-client/core'; import ununificlient from 'ununifi-client'; @@ -10,6 +11,7 @@ import ununificlient from 'ununifi-client'; export class DerivativesService { constructor( private readonly cosmosSDK: CosmosSDKService, + private readonly txCommonService: TxCommonService, private readonly bankService: BankService, ) {} @@ -88,21 +90,14 @@ export class DerivativesService { } buildPerpetualFuturesPositionInstance( - baseSymbol: string, positionType: ununificlient.proto.ununifi.derivatives.PositionType, size: number, leverage: number, - symbolMetadataMap: { [symbol: string]: cosmosclient.proto.cosmos.bank.v1beta1.IMetadata }, ) { - const position = this.bankService.convertSymbolAmountMapToCoins( - { [baseSymbol]: size }, - symbolMetadataMap, - )[0]; - const perpetualFuturesPositionInstance = new ununificlient.proto.ununifi.derivatives.PerpetualFuturesPositionInstance({ position_type: positionType, - size: position.amount, + size: this.txCommonService.numberToDecString(size), leverage: Math.floor(leverage), }); return perpetualFuturesPositionInstance; diff --git a/projects/portal/src/app/models/nft-pawnshops/nft-pawnshop.query.service.ts b/projects/portal/src/app/models/nft-pawnshops/nft-pawnshop.query.service.ts index f3822964e..7e670742e 100644 --- a/projects/portal/src/app/models/nft-pawnshops/nft-pawnshop.query.service.ts +++ b/projects/portal/src/app/models/nft-pawnshops/nft-pawnshop.query.service.ts @@ -12,6 +12,7 @@ import { Liquidation200ResponseLiquidations, ListedClass200Response, ListedNfts200ResponseListingsInner, + ListedNfts200ResponseListingsInnerListing, Loan200Response, Loans200ResponseLoansInner, NftmarketParams200ResponseParams, @@ -31,14 +32,20 @@ export class NftPawnshopQueryService { ); } - getNftListing$(classID: string, nftID: string): Observable { + getNftListing$( + classID: string, + nftID: string, + ): Observable { return this.restSdk$.pipe( mergeMap((sdk) => ununifi.rest.nftmarket.nftListing(sdk, classID, nftID)), map((res) => res.data.listing!), ); } - async getNftListing(classID: string, nftID: string): Promise { + async getNftListing( + classID: string, + nftID: string, + ): Promise { const sdk = await this.cosmosSDK.sdk().then((sdk) => sdk.rest); const res = await ununifi.rest.nftmarket.nftListing(sdk, classID, nftID); return res.data.listing!; diff --git a/projects/portal/src/app/pages/derivatives/pool/pool.component.ts b/projects/portal/src/app/pages/derivatives/pool/pool.component.ts index fd875e503..1aafbe861 100644 --- a/projects/portal/src/app/pages/derivatives/pool/pool.component.ts +++ b/projects/portal/src/app/pages/derivatives/pool/pool.component.ts @@ -6,7 +6,6 @@ import { StoredWallet } from '../../../models/wallets/wallet.model'; import { WalletService } from '../../../models/wallets/wallet.service'; import { BurnLPTEvent, MintLPTEvent } from '../../../views/derivatives/pool/pool.component'; import { Component, OnInit } from '@angular/core'; -import cosmosclient from '@cosmos-client/core'; import { BehaviorSubject, combineLatest, of, timer } from 'rxjs'; import { filter, map, mergeMap } from 'rxjs/operators'; diff --git a/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/borrow/borrow.component.ts b/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/borrow/borrow.component.ts index 6d400c566..1a0614639 100644 --- a/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/borrow/borrow.component.ts +++ b/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/borrow/borrow.component.ts @@ -9,7 +9,7 @@ import { Metadata } from 'projects/shared/src/lib/models/ununifi/query/nft/nft.m import { Observable, combineLatest, of } from 'rxjs'; import { map, mergeMap } from 'rxjs/operators'; import { - ListedNfts200ResponseListingsInner, + ListedNfts200ResponseListingsInnerListing, BidderBids200ResponseBidsInner, Loans200ResponseLoansInner, } from 'ununifi-client/esm/openapi'; @@ -22,7 +22,7 @@ import { export class BorrowComponent implements OnInit { classID$: Observable; nftID$: Observable; - listingInfo$: Observable; + listingInfo$: Observable; bidders$: Observable; loans$: Observable; nftMetadata$: Observable; @@ -48,7 +48,9 @@ export class BorrowComponent implements OnInit { this.bidders$ = nftCombine$.pipe( mergeMap(([classID, nftID]) => this.pawnshopQuery.listNftBids$(classID, nftID)), map((bidders) => - bidders.sort((a, b) => parseInt(b.deposit_amount?.amount!) - parseInt(a.deposit_amount?.amount!)), + bidders.sort( + (a, b) => parseInt(b.deposit_amount?.amount!) - parseInt(a.deposit_amount?.amount!), + ), ), ); this.borrowAmount$ = this.bidders$.pipe( diff --git a/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/borrower-nft.component.ts b/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/borrower-nft.component.ts index 32a9f1610..20ef0b096 100644 --- a/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/borrower-nft.component.ts +++ b/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/borrower-nft.component.ts @@ -6,9 +6,9 @@ import { NftPawnshopQueryService } from 'projects/portal/src/app/models/nft-pawn import { NftPawnshopService } from 'projects/portal/src/app/models/nft-pawnshops/nft-pawnshop.service'; import { Metadata } from 'projects/shared/src/lib/models/ununifi/query/nft/nft.model'; import { Observable, combineLatest } from 'rxjs'; -import { first, map, mergeMap } from 'rxjs/operators'; +import { map, mergeMap } from 'rxjs/operators'; import { - ListedNfts200ResponseListingsInner, + ListedNfts200ResponseListingsInnerListing, BidderBids200ResponseBidsInner, Loan200Response, Liquidation200ResponseLiquidations, @@ -22,7 +22,7 @@ import { export class BorrowerNftComponent implements OnInit { classID$: Observable; nftID$: Observable; - listingInfo$: Observable; + listingInfo$: Observable; bidders$: Observable; loan$: Observable; liquidation$: Observable; diff --git a/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/repay/repay.component.ts b/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/repay/repay.component.ts index 25ca1541c..60442be2d 100644 --- a/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/repay/repay.component.ts +++ b/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/repay/repay.component.ts @@ -8,12 +8,11 @@ import { NftPawnshopService } from 'projects/portal/src/app/models/nft-pawnshops import { Metadata } from 'projects/shared/src/lib/models/ununifi/query/nft/nft.model'; import { Observable, combineLatest, of } from 'rxjs'; import { map, mergeMap } from 'rxjs/operators'; -import { rewards } from 'ununifi-client/cjs/rest/nftmarket/module'; import { - ListedNfts200ResponseListingsInner, BidderBids200ResponseBidsInner, Loans200ResponseLoansInner, Liquidation200ResponseLiquidations, + ListedNfts200ResponseListingsInnerListing, } from 'ununifi-client/esm/openapi'; @Component({ @@ -24,7 +23,7 @@ import { export class RepayComponent implements OnInit { classID$: Observable; nftID$: Observable; - listingInfo$: Observable; + listingInfo$: Observable; bidders$: Observable; loans$: Observable; liquidation$: Observable; @@ -52,7 +51,9 @@ export class RepayComponent implements OnInit { mergeMap(([classID, nftID]) => this.pawnshopQuery.listNftBids$(classID, nftID)), map((bidders) => bidders.filter((bidder) => bidder.borrowings?.length)), map((bidders) => - bidders.sort((a, b) => parseInt(b.deposit_amount?.amount!) - parseInt(a.deposit_amount?.amount!)), + bidders.sort( + (a, b) => parseInt(b.deposit_amount?.amount!) - parseInt(a.deposit_amount?.amount!), + ), ), ); this.loans$ = nftCombine$.pipe( diff --git a/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrower/borrower.component.ts b/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrower/borrower.component.ts index 27e0aaef9..ec8028ad2 100644 --- a/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrower/borrower.component.ts +++ b/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrower/borrower.component.ts @@ -48,7 +48,7 @@ export class BorrowerComponent implements OnInit { mergeMap((address) => this.pawnshopQuery .listAllListedNfts$() - .pipe(map((nfts) => nfts.filter((nft) => nft.owner == address))), + .pipe(map((nfts) => nfts.filter((nft) => nft.listing?.owner == address))), ), ); @@ -56,8 +56,11 @@ export class BorrowerComponent implements OnInit { mergeMap((nfts) => Promise.all( nfts.map(async (nft) => { - if (nft.nft_id && nft.nft_id.class_id && nft.nft_id.nft_id) { - const res = await this.pawnshopQuery.getNft(nft.nft_id.class_id, nft.nft_id.nft_id); + if (nft.listing?.nft_id?.class_id && nft.listing?.nft_id?.nft_id) { + const res = await this.pawnshopQuery.getNft( + nft.listing.nft_id.class_id, + nft.listing.nft_id.nft_id, + ); return res.nft?.uri; } else { return ''; diff --git a/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrowers.component.ts b/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrowers.component.ts index faa5d5289..fcaf30c2d 100644 --- a/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrowers.component.ts +++ b/projects/portal/src/app/pages/nft-pawnshop/borrowers/borrowers.component.ts @@ -34,7 +34,7 @@ export class BorrowersComponent implements OnInit { mergeMap((address) => this.pawnshopQuery .listAllListedNfts$() - .pipe(map((nfts) => nfts.filter((nft) => nft.owner == address))), + .pipe(map((nfts) => nfts.filter((nft) => nft.listing?.owner == address))), ), ); } diff --git a/projects/portal/src/app/pages/nft-pawnshop/lenders/lender-nfts/lender-nft/lender-nft.component.ts b/projects/portal/src/app/pages/nft-pawnshop/lenders/lender-nfts/lender-nft/lender-nft.component.ts index 4b10aefed..869a0f3e4 100644 --- a/projects/portal/src/app/pages/nft-pawnshop/lenders/lender-nfts/lender-nft/lender-nft.component.ts +++ b/projects/portal/src/app/pages/nft-pawnshop/lenders/lender-nfts/lender-nft/lender-nft.component.ts @@ -12,7 +12,7 @@ import { combineLatest, Observable } from 'rxjs'; import { filter, map, mergeMap } from 'rxjs/operators'; import { BidderBids200ResponseBidsInner, - ListedNfts200ResponseListingsInner, + ListedNfts200ResponseListingsInnerListing, } from 'ununifi-client/esm/openapi'; @Component({ @@ -25,7 +25,7 @@ export class LenderNftComponent implements OnInit { address$: Observable; classID$: Observable; nftID$: Observable; - listingInfo$: Observable; + listingInfo$: Observable; bidders$: Observable; nftMetadata$: Observable; nftImage$: Observable; diff --git a/projects/portal/src/app/pages/nft-pawnshop/lenders/lender-nfts/lender-nft/place-bid/place-bid.component.ts b/projects/portal/src/app/pages/nft-pawnshop/lenders/lender-nfts/lender-nft/place-bid/place-bid.component.ts index 3a4a9a9e0..caf9e7962 100644 --- a/projects/portal/src/app/pages/nft-pawnshop/lenders/lender-nfts/lender-nft/place-bid/place-bid.component.ts +++ b/projects/portal/src/app/pages/nft-pawnshop/lenders/lender-nfts/lender-nft/place-bid/place-bid.component.ts @@ -13,7 +13,7 @@ import { combineLatest, Observable, zip } from 'rxjs'; import { filter, map, mergeMap } from 'rxjs/operators'; import { BidderBids200ResponseBidsInner, - ListedNfts200ResponseListingsInner, + ListedNfts200ResponseListingsInnerListing, } from 'ununifi-client/esm/openapi'; @Component({ @@ -27,7 +27,7 @@ export class PlaceBidComponent implements OnInit { symbol$: Observable; currentStoredWallet$: Observable; balance$: Observable; - listingInfo$: Observable; + listingInfo$: Observable; bidders$: Observable; nftMetadata$: Observable; nftImage$: Observable; diff --git a/projects/portal/src/app/pages/nft-pawnshop/lenders/lender/lender.component.ts b/projects/portal/src/app/pages/nft-pawnshop/lenders/lender/lender.component.ts index 407ea7571..812e6d8d7 100644 --- a/projects/portal/src/app/pages/nft-pawnshop/lenders/lender/lender.component.ts +++ b/projects/portal/src/app/pages/nft-pawnshop/lenders/lender/lender.component.ts @@ -7,7 +7,7 @@ import { NftPawnshopService } from 'projects/portal/src/app/models/nft-pawnshops import { Metadata } from 'projects/shared/src/lib/models/ununifi/query/nft/nft.model'; import { Observable, pipe } from 'rxjs'; import { filter, map, mergeMap } from 'rxjs/operators'; -import { ListedNfts200ResponseListingsInner } from 'ununifi-client/esm/openapi'; +import { ListedNfts200ResponseListingsInnerListing } from 'ununifi-client/esm/openapi'; @Component({ selector: 'app-lender', @@ -16,7 +16,7 @@ import { ListedNfts200ResponseListingsInner } from 'ununifi-client/esm/openapi'; }) export class LenderComponent implements OnInit { address$: Observable; - biddingNfts$: Observable; + biddingNfts$: Observable; nftsMetadata$: Observable; nftImages$: Observable; diff --git a/projects/portal/src/app/pages/nft-pawnshop/lenders/lenders.component.ts b/projects/portal/src/app/pages/nft-pawnshop/lenders/lenders.component.ts index dfc09b3cd..27e8d08e7 100644 --- a/projects/portal/src/app/pages/nft-pawnshop/lenders/lenders.component.ts +++ b/projects/portal/src/app/pages/nft-pawnshop/lenders/lenders.component.ts @@ -14,6 +14,7 @@ import { BidderBids200ResponseBidsInner, ListedClass200Response, ListedNfts200ResponseListingsInner, + ListedNfts200ResponseListingsInnerListing, } from 'ununifi-client/esm/openapi'; export interface BidderNftsInfo { @@ -34,7 +35,7 @@ export class LendersComponent implements OnInit { bidderBids$: Observable; depositCoins$: Observable; lendCoins$: Observable; - biddingNfts$: Observable; + biddingNfts$: Observable; biddingNftsInfo$: Observable; rewards$: Observable; listedClasses$: Observable; @@ -160,10 +161,10 @@ export class LendersComponent implements OnInit { return []; } const filteredNfts = nfts.filter( - (nft) => nft.bid_token == selectedMetadata.denom_units![0].denom, + (nft) => nft.listing?.bid_token == selectedMetadata.denom_units![0].denom, ); return classes.filter((value) => - filteredNfts.find((nft) => nft.nft_id?.class_id == value.class_id), + filteredNfts.find((nft) => nft.listing?.nft_id?.class_id == value.class_id), ); }), ); diff --git a/projects/portal/src/app/views/derivatives/pool/pool.component.html b/projects/portal/src/app/views/derivatives/pool/pool.component.html index 44d80315b..75b928e7e 100644 --- a/projects/portal/src/app/views/derivatives/pool/pool.component.html +++ b/projects/portal/src/app/views/derivatives/pool/pool.component.html @@ -148,8 +148,8 @@

    Liquidity Provider Token (Buy/Sell)

    Are you sure to buy DLP?

    - Estimated DLP amount is {{ estimatedLPTAmount.amount | coin }} (Fee is - {{ estimatedLPTAmount.fee | coin }}), do you proceed? + Estimated DLP amount is {{ estimatedLPTAmount.estimated_dlp_amount | coin }} (Fee + is {{ estimatedLPTAmount.deposit_fee | coin }}), do you proceed?

    Estimated DLP amount is {{ calculatedDLPAmount | number }}DLP, and fees will be diff --git a/projects/portal/src/app/views/derivatives/pool/pool.component.ts b/projects/portal/src/app/views/derivatives/pool/pool.component.ts index 731d84b60..bb3a98491 100644 --- a/projects/portal/src/app/views/derivatives/pool/pool.component.ts +++ b/projects/portal/src/app/views/derivatives/pool/pool.component.ts @@ -9,7 +9,7 @@ import { } from '@angular/core'; import cosmosclient from '@cosmos-client/core'; import ununificlient from 'ununifi-client'; -import { EstimateDLPTokenAmount200Response } from 'ununifi-client/esm/openapi'; +import { EstimateDLPTokenAmount200Response, EstimateRedeemAmount200Response } from 'ununifi-client/esm/openapi'; export type MintLPTEvent = { symbol: string; @@ -49,7 +49,7 @@ export class PoolComponent implements OnInit, OnChanges { estimatedLPTAmount?: EstimateDLPTokenAmount200Response | null; @Input() - estimatedRedeemAmount?: EstimateDLPTokenAmount200Response | null; + estimatedRedeemAmount?: EstimateRedeemAmount200Response | null; @Output() estimateMint = new EventEmitter(); diff --git a/projects/portal/src/app/views/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/borrow/borrow.component.ts b/projects/portal/src/app/views/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/borrow/borrow.component.ts index 37a88d438..39aab5d8b 100644 --- a/projects/portal/src/app/views/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/borrow/borrow.component.ts +++ b/projects/portal/src/app/views/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/borrow/borrow.component.ts @@ -13,7 +13,7 @@ import { NftPawnshopChartService } from 'projects/portal/src/app/models/nft-pawn import { BorrowRequest } from 'projects/portal/src/app/models/nft-pawnshops/nft-pawnshop.model'; import { Metadata } from 'projects/shared/src/lib/models/ununifi/query/nft/nft.model'; import { - ListedNfts200ResponseListingsInner, + ListedNfts200ResponseListingsInnerListing, BidderBids200ResponseBidsInner, Loans200ResponseLoansInner, } from 'ununifi-client/esm/openapi'; @@ -29,7 +29,7 @@ export class BorrowComponent implements OnInit { @Input() nftID?: string | null; @Input() - listingInfo?: ListedNfts200ResponseListingsInner | null; + listingInfo?: ListedNfts200ResponseListingsInnerListing | null; @Input() bidders?: BidderBids200ResponseBidsInner[] | null; @Input() diff --git a/projects/portal/src/app/views/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/borrower-nft.component.ts b/projects/portal/src/app/views/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/borrower-nft.component.ts index ff29ad9bf..47922dab5 100644 --- a/projects/portal/src/app/views/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/borrower-nft.component.ts +++ b/projects/portal/src/app/views/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/borrower-nft.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { NftRequest } from 'projects/portal/src/app/models/nft-pawnshops/nft-pawnshop.model'; import { Metadata } from 'projects/shared/src/lib/models/ununifi/query/nft/nft.model'; import { - ListedNfts200ResponseListingsInner, + ListedNfts200ResponseListingsInnerListing, BidderBids200ResponseBidsInner, Loan200Response, Liquidation200ResponseLiquidations, @@ -19,7 +19,7 @@ export class BorrowerNftComponent implements OnInit { @Input() nftID?: string | null; @Input() - listingInfo?: ListedNfts200ResponseListingsInner | null; + listingInfo?: ListedNfts200ResponseListingsInnerListing | null; @Input() bidders?: BidderBids200ResponseBidsInner[] | null; @Input() diff --git a/projects/portal/src/app/views/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/repay/repay.component.ts b/projects/portal/src/app/views/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/repay/repay.component.ts index b9d72d4ee..710ab132f 100644 --- a/projects/portal/src/app/views/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/repay/repay.component.ts +++ b/projects/portal/src/app/views/nft-pawnshop/borrowers/borrower-nfts/borrower-nft/repay/repay.component.ts @@ -13,10 +13,10 @@ import { NftPawnshopChartService } from 'projects/portal/src/app/models/nft-pawn import { RepayRequest } from 'projects/portal/src/app/models/nft-pawnshops/nft-pawnshop.model'; import { Metadata } from 'projects/shared/src/lib/models/ununifi/query/nft/nft.model'; import { - ListedNfts200ResponseListingsInner, BidderBids200ResponseBidsInner, Loans200ResponseLoansInner, Liquidation200ResponseLiquidations, + ListedNfts200ResponseListingsInnerListing, } from 'ununifi-client/esm/openapi'; @Component({ @@ -30,7 +30,7 @@ export class RepayComponent implements OnInit { @Input() nftID?: string | null; @Input() - listingInfo?: ListedNfts200ResponseListingsInner | null; + listingInfo?: ListedNfts200ResponseListingsInnerListing | null; @Input() bidders?: BidderBids200ResponseBidsInner[] | null; @Input() diff --git a/projects/portal/src/app/views/nft-pawnshop/borrowers/borrower/borrower.component.html b/projects/portal/src/app/views/nft-pawnshop/borrowers/borrower/borrower.component.html index a637998f6..2054c30eb 100644 --- a/projects/portal/src/app/views/nft-pawnshop/borrowers/borrower/borrower.component.html +++ b/projects/portal/src/app/views/nft-pawnshop/borrowers/borrower/borrower.component.html @@ -74,42 +74,48 @@

    Listed NFTs

    *ngFor="let nft of listedOwnNfts; let i = index" class="sm:pr-12 pb-12 md:w-1/3 lg:w-1/4 xl:w-1/5" > -
    -
    - - -
    -
    - {{ nft.state }} -

    - {{ listedOwnNftsMetadata[i].name + '/' + nft.nft_id?.nft_id }} -

    -

    - {{ nft.nft_id?.nft_id }} -

    - +
    + {{ nft.listing?.state }} +
    +
    + + +
    +
    +

    + {{ + listedOwnNftsMetadata[i].name || + nft.listing?.nft_id?.class_id + '/' + nft.listing?.nft_id?.nft_id + }} +

    +

    + {{ nft.listing?.nft_id?.class_id + '/' + nft.listing?.nft_id?.nft_id }} +

    + +
    -

    There is no listed NFT.

    -

    Please list your NFTs.

    +

    There is no listed NFT. Please list your NFTs.
    diff --git a/projects/portal/src/app/views/nft-pawnshop/lenders/lender-nfts/lender-nft/lender-nft.component.ts b/projects/portal/src/app/views/nft-pawnshop/lenders/lender-nfts/lender-nft/lender-nft.component.ts index f70341605..c84f647b2 100644 --- a/projects/portal/src/app/views/nft-pawnshop/lenders/lender-nfts/lender-nft/lender-nft.component.ts +++ b/projects/portal/src/app/views/nft-pawnshop/lenders/lender-nfts/lender-nft/lender-nft.component.ts @@ -4,7 +4,7 @@ import { StoredWallet } from 'projects/shared/src/common'; import { Metadata } from 'projects/shared/src/lib/models/ununifi/query/nft/nft.model'; import { BidderBids200ResponseBidsInner, - ListedNfts200ResponseListingsInner, + ListedNfts200ResponseListingsInnerListing, } from 'ununifi-client/esm/openapi'; @Component({ @@ -20,7 +20,7 @@ export class LenderNftComponent implements OnInit { @Input() currentStoredWallet?: StoredWallet | null; @Input() - listingInfo?: ListedNfts200ResponseListingsInner | null; + listingInfo?: ListedNfts200ResponseListingsInnerListing | null; @Input() bidders?: BidderBids200ResponseBidsInner[] | null; @Input() diff --git a/projects/portal/src/app/views/nft-pawnshop/lenders/lender-nfts/lender-nft/place-bid/place-bid.component.ts b/projects/portal/src/app/views/nft-pawnshop/lenders/lender-nfts/lender-nft/place-bid/place-bid.component.ts index 84d7d90af..9ce2ce9aa 100644 --- a/projects/portal/src/app/views/nft-pawnshop/lenders/lender-nfts/lender-nft/place-bid/place-bid.component.ts +++ b/projects/portal/src/app/views/nft-pawnshop/lenders/lender-nfts/lender-nft/place-bid/place-bid.component.ts @@ -15,7 +15,7 @@ import { NftPawnshopPocService } from 'projects/portal/src/app/models/nft-pawnsh import { StoredWallet } from 'projects/portal/src/app/models/wallets/wallet.model'; import { Metadata } from 'projects/shared/src/lib/models/ununifi/query/nft/nft.model'; import { - ListedNfts200ResponseListingsInner, + ListedNfts200ResponseListingsInnerListing, BidderBids200ResponseBidsInner, } from 'ununifi-client/esm/openapi'; @@ -36,7 +36,7 @@ export class PlaceBidComponent implements OnInit { @Input() balance?: number | null; @Input() - listingInfo?: ListedNfts200ResponseListingsInner | null; + listingInfo?: ListedNfts200ResponseListingsInnerListing | null; @Input() bidders?: BidderBids200ResponseBidsInner[] | null; @Input() diff --git a/projects/portal/src/app/views/nft-pawnshop/lenders/lender/lender.component.ts b/projects/portal/src/app/views/nft-pawnshop/lenders/lender/lender.component.ts index 04124049f..a4e2310d5 100644 --- a/projects/portal/src/app/views/nft-pawnshop/lenders/lender/lender.component.ts +++ b/projects/portal/src/app/views/nft-pawnshop/lenders/lender/lender.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { Metadata } from 'projects/shared/src/lib/models/ununifi/query/nft/nft.model'; -import { ListedNfts200ResponseListingsInner } from 'ununifi-client/esm/openapi'; +import { ListedNfts200ResponseListingsInnerListing } from 'ununifi-client/esm/openapi'; @Component({ selector: 'view-lender', @@ -11,7 +11,7 @@ export class LenderComponent implements OnInit { @Input() address?: string | null; @Input() - biddingNfts?: ListedNfts200ResponseListingsInner[] | null; + biddingNfts?: ListedNfts200ResponseListingsInnerListing[] | null; @Input() nftsMetadata?: Metadata[] | null; @Input() From e56cfe0aca50c1146ffafb3edf5a4b341d479287 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 5 Apr 2023 15:16:48 +0900 Subject: [PATCH 09/16] fix: 10^6 10^12 --- .../derivatives/perpetual-futures/market/market.component.ts | 4 ---- .../perpetual-futures/perpetual-futures.component.html | 2 +- .../position/perpetual-futures/perpetual-futures.component.ts | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/projects/portal/src/app/views/derivatives/perpetual-futures/market/market.component.ts b/projects/portal/src/app/views/derivatives/perpetual-futures/market/market.component.ts index f61411d86..9fc81a8bc 100644 --- a/projects/portal/src/app/views/derivatives/perpetual-futures/market/market.component.ts +++ b/projects/portal/src/app/views/derivatives/perpetual-futures/market/market.component.ts @@ -219,8 +219,4 @@ export class MarketComponent implements OnInit, AfterViewInit, OnChanges { onSubmitClose(positionId: string) { this.closePosition.emit(positionId); } - - calcMarginRate(decRate: string) { - return Number(decRate) / 10 ** 6; - } } diff --git a/projects/portal/src/app/views/derivatives/positions/position/perpetual-futures/perpetual-futures.component.html b/projects/portal/src/app/views/derivatives/positions/position/perpetual-futures/perpetual-futures.component.html index 7a9c3937c..d61eaca5d 100644 --- a/projects/portal/src/app/views/derivatives/positions/position/perpetual-futures/perpetual-futures.component.html +++ b/projects/portal/src/app/views/derivatives/positions/position/perpetual-futures/perpetual-futures.component.html @@ -26,7 +26,7 @@

    Margin Maintenance Rate
    - {{ calcMarginRate(position?.margin_maintenance_rate!) | percentage }} + {{ position?.margin_maintenance_rate | percentage }}
    Under 50% will initiate liquidation
    diff --git a/projects/portal/src/app/views/derivatives/positions/position/perpetual-futures/perpetual-futures.component.ts b/projects/portal/src/app/views/derivatives/positions/position/perpetual-futures/perpetual-futures.component.ts index eef6ef884..1618d2184 100644 --- a/projects/portal/src/app/views/derivatives/positions/position/perpetual-futures/perpetual-futures.component.ts +++ b/projects/portal/src/app/views/derivatives/positions/position/perpetual-futures/perpetual-futures.component.ts @@ -78,8 +78,4 @@ export class PerpetualFuturesComponent implements OnInit { onClickClose() { this.closePosition.emit(this.position?.position?.id); } - - calcMarginRate(decRate: string) { - return Number(decRate) / 10 ** 6; - } } From 672dd6974b762dfc8c1dad98973f984bc9819df6 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Tue, 11 Apr 2023 21:53:49 +0900 Subject: [PATCH 10/16] fix: conflict changes --- .../src/app/models/derivatives/derivatives.query.service.ts | 3 +-- .../portal/src/app/views/derivatives/pool/pool.component.html | 4 ++-- .../portal/src/app/views/derivatives/pool/pool.component.ts | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/projects/portal/src/app/models/derivatives/derivatives.query.service.ts b/projects/portal/src/app/models/derivatives/derivatives.query.service.ts index 5274fa9b3..ee458b060 100644 --- a/projects/portal/src/app/models/derivatives/derivatives.query.service.ts +++ b/projects/portal/src/app/models/derivatives/derivatives.query.service.ts @@ -9,7 +9,6 @@ import { AllPositions200ResponsePositionsInner, DerivativesParams200ResponseParams, EstimateDLPTokenAmount200Response, - EstimateRedeemAmount200Response, PerpetualFutures200Response, PerpetualFuturesMarket200Response, Pool200Response, @@ -45,7 +44,7 @@ export class DerivativesQueryService { getEstimateRedeemTokenAmount( redeemDenom: string, lptAmount: string, - ): Observable { + ): Observable { return this.restSdk$.pipe( mergeMap((sdk) => ununificlient.rest.derivatives.estimateRedeemAmount(sdk, redeemDenom, lptAmount), diff --git a/projects/portal/src/app/views/derivatives/pool/pool.component.html b/projects/portal/src/app/views/derivatives/pool/pool.component.html index 75b928e7e..44d80315b 100644 --- a/projects/portal/src/app/views/derivatives/pool/pool.component.html +++ b/projects/portal/src/app/views/derivatives/pool/pool.component.html @@ -148,8 +148,8 @@

    Liquidity Provider Token (Buy/Sell)

    Are you sure to buy DLP?

    - Estimated DLP amount is {{ estimatedLPTAmount.estimated_dlp_amount | coin }} (Fee - is {{ estimatedLPTAmount.deposit_fee | coin }}), do you proceed? + Estimated DLP amount is {{ estimatedLPTAmount.amount | coin }} (Fee is + {{ estimatedLPTAmount.fee | coin }}), do you proceed?

    Estimated DLP amount is {{ calculatedDLPAmount | number }}DLP, and fees will be diff --git a/projects/portal/src/app/views/derivatives/pool/pool.component.ts b/projects/portal/src/app/views/derivatives/pool/pool.component.ts index bb3a98491..731d84b60 100644 --- a/projects/portal/src/app/views/derivatives/pool/pool.component.ts +++ b/projects/portal/src/app/views/derivatives/pool/pool.component.ts @@ -9,7 +9,7 @@ import { } from '@angular/core'; import cosmosclient from '@cosmos-client/core'; import ununificlient from 'ununifi-client'; -import { EstimateDLPTokenAmount200Response, EstimateRedeemAmount200Response } from 'ununifi-client/esm/openapi'; +import { EstimateDLPTokenAmount200Response } from 'ununifi-client/esm/openapi'; export type MintLPTEvent = { symbol: string; @@ -49,7 +49,7 @@ export class PoolComponent implements OnInit, OnChanges { estimatedLPTAmount?: EstimateDLPTokenAmount200Response | null; @Input() - estimatedRedeemAmount?: EstimateRedeemAmount200Response | null; + estimatedRedeemAmount?: EstimateDLPTokenAmount200Response | null; @Output() estimateMint = new EventEmitter(); From 7c0b63108c60e20882f135ecb50ef1fece77cd8a Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 12 Apr 2023 16:57:04 +0900 Subject: [PATCH 11/16] feat: traders --- .../traders/traders.component.html | 7 +++- .../copy-trading/traders/traders.component.ts | 34 ++++++++++++++++--- .../copy-trading/traders/traders.component.ts | 18 ++++++---- 3 files changed, 48 insertions(+), 11 deletions(-) diff --git a/projects/portal/src/app/pages/copy-trading/traders/traders.component.html b/projects/portal/src/app/pages/copy-trading/traders/traders.component.html index 1c2094e14..1d879f6ba 100644 --- a/projects/portal/src/app/pages/copy-trading/traders/traders.component.html +++ b/projects/portal/src/app/pages/copy-trading/traders/traders.component.html @@ -1 +1,6 @@ - + diff --git a/projects/portal/src/app/pages/copy-trading/traders/traders.component.ts b/projects/portal/src/app/pages/copy-trading/traders/traders.component.ts index 9430c6a88..846e04abb 100644 --- a/projects/portal/src/app/pages/copy-trading/traders/traders.component.ts +++ b/projects/portal/src/app/pages/copy-trading/traders/traders.component.ts @@ -1,15 +1,41 @@ +import { CopyTradingQueryService } from '../../../models/copy-trading/copy-trading.query.service'; +import { StoredWallet } from '../../../models/wallets/wallet.model'; +import { WalletService } from '../../../models/wallets/wallet.service'; import { Component, OnInit } from '@angular/core'; +import cosmosclient from '@cosmos-client/core'; +import { Observable } from 'rxjs'; +import { filter, map, mergeMap } from 'rxjs/operators'; +import { + ExemplaryTraderAll200ResponseExemplaryTraderInner, + ExemplaryTraderTracing200ResponseTracingInner, +} from 'ununifi-client/esm/openapi'; @Component({ selector: 'app-traders', templateUrl: './traders.component.html', - styleUrls: ['./traders.component.css'] + styleUrls: ['./traders.component.css'], }) export class TradersComponent implements OnInit { + address$: Observable; + exemplaryTraders$: Observable; + tracing$: Observable; + availableTracings$: Observable; - constructor() { } - - ngOnInit(): void { + constructor( + private readonly walletService: WalletService, + private readonly copyTradingQuery: CopyTradingQueryService, + ) { + const currentStoredWallet$ = this.walletService.currentStoredWallet$; + this.address$ = currentStoredWallet$.pipe( + filter((wallet): wallet is StoredWallet => wallet !== undefined && wallet !== null), + map((wallet) => cosmosclient.AccAddress.fromString(wallet.address).toString()), + ); + this.tracing$ = this.address$.pipe( + mergeMap((address) => this.copyTradingQuery.getTracing$(address)), + ); + this.exemplaryTraders$ = this.copyTradingQuery.listExemplaryTraders$(); + this.availableTracings$ = this.copyTradingQuery.listAllTracings$(); } + ngOnInit(): void {} } diff --git a/projects/portal/src/app/views/copy-trading/traders/traders.component.ts b/projects/portal/src/app/views/copy-trading/traders/traders.component.ts index 6b3c5f92c..f48ebcef6 100644 --- a/projects/portal/src/app/views/copy-trading/traders/traders.component.ts +++ b/projects/portal/src/app/views/copy-trading/traders/traders.component.ts @@ -1,15 +1,21 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; +import { + ExemplaryTraderAll200ResponseExemplaryTraderInner, + ExemplaryTraderTracing200ResponseTracingInner, +} from 'ununifi-client/esm/openapi'; @Component({ selector: 'view-traders', templateUrl: './traders.component.html', - styleUrls: ['./traders.component.css'] + styleUrls: ['./traders.component.css'], }) export class TradersComponent implements OnInit { + @Input() address?: string | null; + @Input() tracing?: ExemplaryTraderTracing200ResponseTracingInner | null; + @Input() exemplaryTraders?: ExemplaryTraderAll200ResponseExemplaryTraderInner[] | null; + @Input() availableTracings?: ExemplaryTraderTracing200ResponseTracingInner[] | null; - constructor() { } - - ngOnInit(): void { - } + constructor() {} + ngOnInit(): void {} } From cccb39f83f2ffdbf01908843f10acea441dbbcd7 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 12 Apr 2023 17:02:17 +0900 Subject: [PATCH 12/16] feat: add routing --- .../app/pages/derivatives/derivatives-routing.module.ts | 5 +++++ .../apps/app-derivatives/app-derivatives.component.html | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/projects/portal/src/app/pages/derivatives/derivatives-routing.module.ts b/projects/portal/src/app/pages/derivatives/derivatives-routing.module.ts index 96dd53bb0..4f55a5861 100644 --- a/projects/portal/src/app/pages/derivatives/derivatives-routing.module.ts +++ b/projects/portal/src/app/pages/derivatives/derivatives-routing.module.ts @@ -25,6 +25,11 @@ const routes: Routes = [ (m) => m.AppPerpetualFuturesModule, ), }, + { + path: 'copy-trading', + loadChildren: () => + import('../copy-trading/copy-trading.module').then((m) => m.AppCopyTradingModule), + }, ]; @NgModule({ diff --git a/projects/portal/src/app/views/apps/app-derivatives/app-derivatives.component.html b/projects/portal/src/app/views/apps/app-derivatives/app-derivatives.component.html index f75e5dc19..d949cd632 100644 --- a/projects/portal/src/app/views/apps/app-derivatives/app-derivatives.component.html +++ b/projects/portal/src/app/views/apps/app-derivatives/app-derivatives.component.html @@ -72,6 +72,14 @@ Pool

    • +
  • + +
  • Apps From b8ec19b00b635546dd6b87d0ce1b1a1ba81c313b Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 12 Apr 2023 17:39:33 +0900 Subject: [PATCH 13/16] feat: traders list --- .../models/copy-trading/copy-trading.model.ts | 11 - .../traders/traders.component.html | 4 +- .../copy-trading/traders/traders.component.ts | 11 +- .../traders/traders.component.html | 192 +++++++----------- .../copy-trading/traders/traders.component.ts | 11 +- 5 files changed, 95 insertions(+), 134 deletions(-) diff --git a/projects/portal/src/app/models/copy-trading/copy-trading.model.ts b/projects/portal/src/app/models/copy-trading/copy-trading.model.ts index 35194b36a..0b2dfb7db 100644 --- a/projects/portal/src/app/models/copy-trading/copy-trading.model.ts +++ b/projects/portal/src/app/models/copy-trading/copy-trading.model.ts @@ -1,29 +1,18 @@ export type CreateExemplaryTraderRequest = { - sender: string; name: string; description: string; profitCommissionRate: number; }; export type UpdateExemplaryTraderRequest = { - sender: string; name: string; description: string; profitCommissionRate: number; }; -export type DeleteExemplaryTraderRequest = { - sender: string; -}; - export type CreateTracingRequest = { - sender: string; exemplaryTrader: string; sizeCoef: number; leverageCoef: number; reverse: boolean; }; - -export type DeleteTracingRequest = { - sender: string; -}; diff --git a/projects/portal/src/app/pages/copy-trading/traders/traders.component.html b/projects/portal/src/app/pages/copy-trading/traders/traders.component.html index 1d879f6ba..a9fc81da2 100644 --- a/projects/portal/src/app/pages/copy-trading/traders/traders.component.html +++ b/projects/portal/src/app/pages/copy-trading/traders/traders.component.html @@ -1,6 +1,8 @@ diff --git a/projects/portal/src/app/pages/copy-trading/traders/traders.component.ts b/projects/portal/src/app/pages/copy-trading/traders/traders.component.ts index 846e04abb..c5507e396 100644 --- a/projects/portal/src/app/pages/copy-trading/traders/traders.component.ts +++ b/projects/portal/src/app/pages/copy-trading/traders/traders.component.ts @@ -3,7 +3,7 @@ import { StoredWallet } from '../../../models/wallets/wallet.model'; import { WalletService } from '../../../models/wallets/wallet.service'; import { Component, OnInit } from '@angular/core'; import cosmosclient from '@cosmos-client/core'; -import { Observable } from 'rxjs'; +import { Observable, combineLatest } from 'rxjs'; import { filter, map, mergeMap } from 'rxjs/operators'; import { ExemplaryTraderAll200ResponseExemplaryTraderInner, @@ -19,6 +19,7 @@ export class TradersComponent implements OnInit { address$: Observable; exemplaryTraders$: Observable; tracing$: Observable; + tracingTrader$: Observable; availableTracings$: Observable; constructor( @@ -30,12 +31,18 @@ export class TradersComponent implements OnInit { filter((wallet): wallet is StoredWallet => wallet !== undefined && wallet !== null), map((wallet) => cosmosclient.AccAddress.fromString(wallet.address).toString()), ); + this.exemplaryTraders$ = this.copyTradingQuery.listExemplaryTraders$(); this.tracing$ = this.address$.pipe( mergeMap((address) => this.copyTradingQuery.getTracing$(address)), ); - this.exemplaryTraders$ = this.copyTradingQuery.listExemplaryTraders$(); + this.tracingTrader$ = combineLatest([this.tracing$, this.exemplaryTraders$]).pipe( + map(([tracing, traders]) => traders.find((trader) => trader.address == tracing.address)), + ); + this.availableTracings$ = this.copyTradingQuery.listAllTracings$(); } ngOnInit(): void {} + + onDeleteTracing() {} } diff --git a/projects/portal/src/app/views/copy-trading/traders/traders.component.html b/projects/portal/src/app/views/copy-trading/traders/traders.component.html index d542751b9..4bf69eae2 100644 --- a/projects/portal/src/app/views/copy-trading/traders/traders.component.html +++ b/projects/portal/src/app/views/copy-trading/traders/traders.component.html @@ -1,63 +1,64 @@
    -
    +

    Your Subscribing Trader

    -
    -
    -
    -
    -
    -
    #1
    -
    -

    UnUniFi Exemplary traders 1

    -
    -
    -
    Size Coefficient
    -
    10%
    -
    -
    -
    -
    Leverage Coefficient
    -
    100%
    -
    -
    -
    -
    Current APY
    -
    1.234%
    -
    +
    +
    +
    +
    +
    Reverse
    -
    -
    Commission Fee
    -
    1.23%
    -
    +

    {{ tracingTrader?.name || tracing.address }}

    +
    +
    +
    Size Coefficient
    +
    + {{ tracing.size_coefficient | percent : '1.2-2' }} +
    +
    +
    +
    +
    Leverage Coefficient
    +
    + {{ tracing.leverage_coefficient | percent : '1.2-2' }} +
    +
    +
    +
    +
    Commission Fee
    +
    + {{ tracingTrader?.profit_commission_rate | percent : '1.2-2' }} +
    +
    +
    -
    -
    - - -
    - -
    -
    -

    Are you sure to unsubscribe this Trader?

    - -
    - - -
    - +
    + + +
    + +
    +
    +

    Are you sure to unsubscribe this Trader?

    +
    + + +
    +
    -
    + -
    +

    Exemplary Traders

    -
    -
    -
    -
    -
    #1
    -
    -

    UnUniFi Exemplary traders 1

    -
    -
    -
    Current APY
    -
    12.34%
    -
    -
    -
    -
    Commission Fee
    -
    1.23%
    -
    + +
    +
    +
    +

    {{ trader.name }}

    +
    +
    +
    Commission Fee
    +
    {{ trader.profit_commission_rate | percent : '1.2-2' }}
    +
    +
    +
    +
    Users
    +
    1024
    +
    +
    -
    -
    Users
    -
    1024
    -
    -
    -
    - -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    #2
    -
    -

    UnUniFi Exemplary traders 2

    -
    -
    -
    Current APY
    -
    10.23%
    -
    -
    -
    -
    Commission Fee
    -
    1.23%
    -
    -
    -
    -
    Users
    -
    24
    -
    +
    +
    - -
    - -
    -
    +
    diff --git a/projects/portal/src/app/views/copy-trading/traders/traders.component.ts b/projects/portal/src/app/views/copy-trading/traders/traders.component.ts index f48ebcef6..f163ef948 100644 --- a/projects/portal/src/app/views/copy-trading/traders/traders.component.ts +++ b/projects/portal/src/app/views/copy-trading/traders/traders.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { ExemplaryTraderAll200ResponseExemplaryTraderInner, ExemplaryTraderTracing200ResponseTracingInner, @@ -11,11 +11,16 @@ import { }) export class TradersComponent implements OnInit { @Input() address?: string | null; - @Input() tracing?: ExemplaryTraderTracing200ResponseTracingInner | null; @Input() exemplaryTraders?: ExemplaryTraderAll200ResponseExemplaryTraderInner[] | null; + @Input() tracing?: ExemplaryTraderTracing200ResponseTracingInner | null; + @Input() tracingTrader?: ExemplaryTraderAll200ResponseExemplaryTraderInner | null; @Input() availableTracings?: ExemplaryTraderTracing200ResponseTracingInner[] | null; - + @Output() deleteTracing = new EventEmitter<{}>(); constructor() {} ngOnInit(): void {} + + onClickDelete() { + this.deleteTracing.emit(); + } } From 3e245c6bc8eb505ddd1264cc1385b653efbd135a Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 12 Apr 2023 19:29:57 +0900 Subject: [PATCH 14/16] feat: user count --- .../traders/traders.component.html | 2 +- .../copy-trading/traders/traders.component.ts | 16 ++++++++-- .../traders/traders.component.html | 32 +++++++++++-------- .../copy-trading/traders/traders.component.ts | 2 +- 4 files changed, 33 insertions(+), 19 deletions(-) diff --git a/projects/portal/src/app/pages/copy-trading/traders/traders.component.html b/projects/portal/src/app/pages/copy-trading/traders/traders.component.html index a9fc81da2..273f496d2 100644 --- a/projects/portal/src/app/pages/copy-trading/traders/traders.component.html +++ b/projects/portal/src/app/pages/copy-trading/traders/traders.component.html @@ -3,6 +3,6 @@ [exemplaryTraders]="exemplaryTraders$ | async" [tracing]="tracing$ | async" [tracingTrader]="tracingTrader$ | async" - [availableTracings]="availableTracings$ | async" + [userCounts]="userCounts$ | async" (deleteTracing)="onDeleteTracing()" > diff --git a/projects/portal/src/app/pages/copy-trading/traders/traders.component.ts b/projects/portal/src/app/pages/copy-trading/traders/traders.component.ts index c5507e396..a11016173 100644 --- a/projects/portal/src/app/pages/copy-trading/traders/traders.component.ts +++ b/projects/portal/src/app/pages/copy-trading/traders/traders.component.ts @@ -20,7 +20,7 @@ export class TradersComponent implements OnInit { exemplaryTraders$: Observable; tracing$: Observable; tracingTrader$: Observable; - availableTracings$: Observable; + userCounts$: Observable; constructor( private readonly walletService: WalletService, @@ -36,10 +36,20 @@ export class TradersComponent implements OnInit { mergeMap((address) => this.copyTradingQuery.getTracing$(address)), ); this.tracingTrader$ = combineLatest([this.tracing$, this.exemplaryTraders$]).pipe( - map(([tracing, traders]) => traders.find((trader) => trader.address == tracing.address)), + map(([tracing, traders]) => + traders.find((trader) => trader.address == tracing.exemplary_trader), + ), ); - this.availableTracings$ = this.copyTradingQuery.listAllTracings$(); + const availableTracings$ = this.copyTradingQuery.listAllTracings$(); + this.userCounts$ = combineLatest([this.exemplaryTraders$, availableTracings$]).pipe( + map(([traders, tracings]) => + traders.map( + (trader) => + tracings.filter((tracing) => tracing.exemplary_trader == trader.address).length, + ), + ), + ); } ngOnInit(): void {} diff --git a/projects/portal/src/app/views/copy-trading/traders/traders.component.html b/projects/portal/src/app/views/copy-trading/traders/traders.component.html index 4bf69eae2..7c83c6112 100644 --- a/projects/portal/src/app/views/copy-trading/traders/traders.component.html +++ b/projects/portal/src/app/views/copy-trading/traders/traders.component.html @@ -12,14 +12,14 @@

    {{ tracingTrader?.name || tracing.address }}

    Size Coefficient
    - {{ tracing.size_coefficient | percent : '1.2-2' }} + x {{ tracing.size_coefficient || 0 | number }}
    Leverage Coefficient
    - {{ tracing.leverage_coefficient | percent : '1.2-2' }} + x {{ tracing.leverage_coefficient || 0 | number }}
    @@ -47,10 +47,10 @@

    {{ tracingTrader?.name || tracing.address }}

    Are you sure to unsubscribe this Trader?

    -
    - - -
    +
    + + +
    @@ -58,15 +58,15 @@

    Are you sure to unsubscribe this Trader?

    -
    +

    Exemplary Traders

    -
    - +
    @@ -74,13 +74,17 @@

    {{ trader.name }}

    Commission Fee
    -
    {{ trader.profit_commission_rate | percent : '1.2-2' }}
    +
    + {{ trader.profit_commission_rate | percent : '1.2-2' }} +
    -
    -
    Users
    -
    1024
    -
    +
    +
    +
    + {{ userCounts[i] || 0 }} +
    +
    Users
    diff --git a/projects/portal/src/app/views/copy-trading/traders/traders.component.ts b/projects/portal/src/app/views/copy-trading/traders/traders.component.ts index f163ef948..1c47a1355 100644 --- a/projects/portal/src/app/views/copy-trading/traders/traders.component.ts +++ b/projects/portal/src/app/views/copy-trading/traders/traders.component.ts @@ -14,7 +14,7 @@ export class TradersComponent implements OnInit { @Input() exemplaryTraders?: ExemplaryTraderAll200ResponseExemplaryTraderInner[] | null; @Input() tracing?: ExemplaryTraderTracing200ResponseTracingInner | null; @Input() tracingTrader?: ExemplaryTraderAll200ResponseExemplaryTraderInner | null; - @Input() availableTracings?: ExemplaryTraderTracing200ResponseTracingInner[] | null; + @Input() userCounts?: number[] | null; @Output() deleteTracing = new EventEmitter<{}>(); constructor() {} From 2ae5b1247de98ce2ef7826c4afec8cd5b6dd7427 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 12 Apr 2023 19:30:12 +0900 Subject: [PATCH 15/16] feat: trader detail & tx --- .../traders/trader/trader.component.html | 11 +- .../traders/trader/trader.component.ts | 58 +++++- .../traders/trader/trader.component.html | 190 +++++++++++------- .../traders/trader/trader.component.ts | 60 +++++- 4 files changed, 235 insertions(+), 84 deletions(-) diff --git a/projects/portal/src/app/pages/copy-trading/traders/trader/trader.component.html b/projects/portal/src/app/pages/copy-trading/traders/trader/trader.component.html index fe2d753c1..018db91d0 100644 --- a/projects/portal/src/app/pages/copy-trading/traders/trader/trader.component.html +++ b/projects/portal/src/app/pages/copy-trading/traders/trader/trader.component.html @@ -1 +1,10 @@ - + diff --git a/projects/portal/src/app/pages/copy-trading/traders/trader/trader.component.ts b/projects/portal/src/app/pages/copy-trading/traders/trader/trader.component.ts index 81f5bf4a5..6a0880713 100644 --- a/projects/portal/src/app/pages/copy-trading/traders/trader/trader.component.ts +++ b/projects/portal/src/app/pages/copy-trading/traders/trader/trader.component.ts @@ -1,15 +1,65 @@ +import { CopyTradingQueryService } from '../../../../models/copy-trading/copy-trading.query.service'; +import { StoredWallet } from '../../../../models/wallets/wallet.model'; +import { WalletService } from '../../../../models/wallets/wallet.service'; import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import cosmosclient from '@cosmos-client/core'; +import { Observable, combineLatest } from 'rxjs'; +import { filter, map, mergeMap } from 'rxjs/operators'; +import { + ExemplaryTraderAll200ResponseExemplaryTraderInner, + ExemplaryTraderTracing200ResponseTracingInner, +} from 'ununifi-client/esm/openapi'; @Component({ selector: 'app-trader', templateUrl: './trader.component.html', - styleUrls: ['./trader.component.css'] + styleUrls: ['./trader.component.css'], }) export class TraderComponent implements OnInit { + address$: Observable; + exemplaryTraderAddress$: Observable; + trader$: Observable; + tracing$: Observable; + isTracing$: Observable; + userCount$: Observable; + commissionRate$: Observable; + description$: Observable; - constructor() { } - - ngOnInit(): void { + constructor( + private route: ActivatedRoute, + private readonly walletService: WalletService, + private readonly copyTradingQuery: CopyTradingQueryService, + ) { + const currentStoredWallet$ = this.walletService.currentStoredWallet$; + this.address$ = currentStoredWallet$.pipe( + filter((wallet): wallet is StoredWallet => wallet !== undefined && wallet !== null), + map((wallet) => cosmosclient.AccAddress.fromString(wallet.address).toString()), + ); + this.exemplaryTraderAddress$ = this.route.params.pipe(map((params) => params.address)); + this.trader$ = this.exemplaryTraderAddress$.pipe( + mergeMap((exAddress) => this.copyTradingQuery.getExemplaryTrader$(exAddress)), + ); + this.tracing$ = this.address$.pipe( + mergeMap((address) => this.copyTradingQuery.getTracing$(address)), + ); + this.isTracing$ = combineLatest([this.tracing$, this.exemplaryTraderAddress$]).pipe( + map(([tracing, exAddress]) => tracing.exemplary_trader == exAddress), + ); + this.userCount$ = combineLatest([ + this.exemplaryTraderAddress$, + this.copyTradingQuery.listAllTracings$(), + ]).pipe( + map( + ([exAddress, tracings]) => + tracings.filter((tracing) => tracing.exemplary_trader == exAddress).length, + ), + ); + this.commissionRate$ = this.trader$.pipe( + map((trader) => Number(trader.profit_commission_rate || 0)), + ); + this.description$ = this.trader$.pipe(map((trader) => trader.description)); } + ngOnInit(): void {} } diff --git a/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.html b/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.html index 09043fe86..e2e904820 100644 --- a/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.html +++ b/projects/portal/src/app/views/copy-trading/traders/trader/trader.component.html @@ -1,98 +1,126 @@
    -
    -

    Exemplary traders

    -
    +

    Exemplary traders

    -
    -
    #1
    -
    -

    UnUniFi Exemplary traders 1

    +

    {{ trader?.name }}

    - + - - + + + + + + + + + + + + + +
    Addressununifi155u042u8wk3al32h3vzxu989jj76k4zcu44v6w{{ exemplaryTraderAddress }}
    Registered Date2023-3-14 AM 12:50:08 GMT+9Exemplary trader name{{ trader?.name }}
    Commission Fee{{ trader?.profit_commission_rate | percent : '1.2-2' }}
    Users{{ userCount || 0 }}
    Current APYComing Soon
    -

    - The momentum trading strategy involves identifying a cryptocurrency that is on an upward - trend and has high trading volume. Traders can use technical analysis to identify these - trends through analyzing charts and indicators like moving averages, relative strength - index (RSI), and stochastic oscillators. -

    -

    - Once a promising cryptocurrency has been identified, the trader opens a position by buying - in at a relatively low price. The goal is to ride the upward trend and sell off the - position as the price continues to rise. -

    -
    -
    -
    Current APY
    -
    12.34%
    -
    -
    -
    -
    Commission Fee
    -
    1.23%
    -
    +

    {{ trader?.description }}

    + + +

    Tracing Info

    +
    +
    Reverse
    -
    -
    Users
    -
    1024
    -
    +
    +
    +
    Size Coefficient
    +
    + x {{ tracing?.size_coefficient || 0 | number }} +
    +
    +
    +
    +
    Leverage Coefficient
    +
    + x {{ tracing?.leverage_coefficient || 0 | number }} +
    +
    +
    -
    +
    - - - - + + + +

    Are you sure to subscribe this Trader?

    -
    +
    @@ -100,32 +128,43 @@

    Are you sure to subscribe this Trader?

    Enter Coefficient of Leverage
    +
    + + +
    @@ -138,12 +177,10 @@

    Are you sure to subscribe this Trader?

    Are you sure to unsubscribe this Trader?

    - -
    - - -
    - +
    + + +
    @@ -151,12 +188,10 @@

    Are you sure to unsubscribe this Trader?

    Are you sure to delete yor Exemplary trader?

    -
    -
    - - -
    -
    +
    + + +
    @@ -166,12 +201,15 @@

    Are you sure to delete yor Exemplary trader?

    Are you sure to update your Exemplary trader settings?

    -
    +
    @@ -182,7 +220,9 @@

    diff --git a/projects/portal/src/app/views/copy-trading/traders/traders.component.ts b/projects/portal/src/app/views/copy-trading/traders/traders.component.ts index 1c47a1355..0c92db1e6 100644 --- a/projects/portal/src/app/views/copy-trading/traders/traders.component.ts +++ b/projects/portal/src/app/views/copy-trading/traders/traders.component.ts @@ -12,6 +12,7 @@ import { export class TradersComponent implements OnInit { @Input() address?: string | null; @Input() exemplaryTraders?: ExemplaryTraderAll200ResponseExemplaryTraderInner[] | null; + @Input() myExemplaryTrader?: ExemplaryTraderAll200ResponseExemplaryTraderInner | null; @Input() tracing?: ExemplaryTraderTracing200ResponseTracingInner | null; @Input() tracingTrader?: ExemplaryTraderAll200ResponseExemplaryTraderInner | null; @Input() userCounts?: number[] | null;