Update

hyle-team · Nov 22, 2023 · e3ce933 · e3ce933
1 parent 858678b
commit e3ce933
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 30 deletions.
diff --git a/html_source/src/app/pages/pages.module.ts b/html_source/src/app/pages/pages.module.ts
@@ -32,8 +32,7 @@ import {
     IntToMoneyPipeModule,
     IsAvailableAliasNamePipeModule,
     MoneyToIntPipeModule,
-    SafeHtmlPipeModule,
-    ShortStringPipeModule,
+    SafeHtmlPipeModule, ShortStringPipe,
 } from '@parts/pipes';
 import { InputValidateModule } from '@parts/directives/input-validate';
 import { InputDisableSelectionModule } from '@parts/directives/input-disable-selection';
@@ -86,7 +85,7 @@ import { BackButtonComponent } from '@parts/components/back-button/back-button.c
         IsAvailableAliasNamePipeModule,
         MoneyToIntPipeModule,
         SafeHtmlPipeModule,
-        ShortStringPipeModule,
+        ShortStringPipe,
         InputValidateModule,
         InputDisableSelectionModule,
         CheckboxComponent,

diff --git a/html_source/src/app/pages/wallet/tabs/send/send.component.ts b/html_source/src/app/pages/wallet/tabs/send/send.component.ts
@@ -16,7 +16,6 @@ import { DeeplinkParams, defaultSendMoneyParams } from '@api/models/wallet.model
 import { WrapInfo } from '@api/models/wrap-info';
 import { WrapInfoService } from '@api/services/wrap-info.service';
 import { SendMoneyParams } from '@api/models/send-money.model';
-import { ControlsOf } from '@parts/utils/controls-of';
 import { defaultImgSrc, zanoAssetInfo } from '@parts/data/assets';
 
 @Component({
@@ -396,7 +395,7 @@ export class SendComponent implements OnInit, OnDestroy {
 
     lowerCaseDisabled$ = new BehaviorSubject(true);
 
-    sendMoneyParamsForm = this.fb.group<ControlsOf<SendMoneyParams>>({
+    sendMoneyParamsForm = this.fb.group({
         wallet_id: this.fb.control(undefined, {
             validators: [Validators.required],
         }),

diff --git a/html_source/src/app/pages/wallet/tabs/swap/pages/create-swap/create-swap.component.ts b/html_source/src/app/pages/wallet/tabs/swap/pages/create-swap/create-swap.component.ts
@@ -6,7 +6,13 @@ import { BreadcrumbsComponent } from '@parts/components/breadcrumbs/breadcrumbs.
 import { BreadcrumbItems } from '@parts/components/breadcrumbs/breadcrumbs.models';
 import { DefaultImgModule, InputValidateModule, LowerCaseDirective } from '@parts/directives';
 import { AbstractControl, FormBuilder, FormControl, FormsModule, ReactiveFormsModule, ValidationErrors, Validators } from '@angular/forms';
-import { IntToMoneyPipe, IntToMoneyPipeModule, MoneyToIntPipe, MoneyToIntPipeModule, ShortStringPipeModule } from '@parts/pipes';
+import {
+    IntToMoneyPipe,
+    IntToMoneyPipeModule,
+    MoneyToIntPipe,
+    MoneyToIntPipeModule,
+    ShortStringPipe
+} from '@parts/pipes';
 import { NgSelectModule } from '@ng-select/ng-select';
 import { VariablesService } from '@parts/services/variables.service';
 import { Asset } from '@api/models/assets.model';
@@ -36,7 +42,7 @@ import { LoaderComponent } from '@parts/components/loader.component';
         DefaultImgModule,
         NgSelectModule,
         LowerCaseDirective,
-        ShortStringPipeModule,
+        ShortStringPipe,
         FormsModule,
         IntToMoneyPipeModule,
         MoneyToIntPipeModule,

diff --git a/html_source/src/app/pages/wallet/wallet.module.ts b/html_source/src/app/pages/wallet/wallet.module.ts
@@ -9,8 +9,7 @@ import {
     ContractStatusMessagesPipeModule,
     HistoryTypeMessagesPipeModule,
     IntToMoneyPipeModule,
-    IsAvailableAliasNamePipeModule,
-    ShortStringPipeModule,
+    IsAvailableAliasNamePipeModule, ShortStringPipe,
 } from '@parts/pipes';
 import { TranslateModule } from '@ngx-translate/core';
 import { ConfirmModalModule } from '@parts/modals/confirm-modal/confirm-modal.module';
@@ -55,7 +54,7 @@ import { GetAssetPipe } from '@parts/pipes/get-asset.pipe';
         WalletRoutingModule,
         FlexModule,
         TooltipModule,
-        ShortStringPipeModule,
+        ShortStringPipe,
         TranslateModule,
         IsAvailableAliasNamePipeModule,
         ConfirmModalModule,

diff --git a/html_source/src/app/parts/pipes/index.ts b/html_source/src/app/parts/pipes/index.ts
@@ -5,5 +5,5 @@ export * from './int-to-money-pipe';
 export * from './is-available-alias-name-pipe';
 export * from './money-to-int-pipe';
 export * from './safe-html-pipe';
-export * from './short-string-pipe';
 export * from './get-asset.pipe';
+export * from './short-string.pipe';
diff --git a/html_source/src/app/parts/pipes/short-string-pipe/index.ts b/html_source/src/app/parts/pipes/short-string-pipe/index.ts
diff --git a/html_source/src/app/parts/pipes/short-string-pipe/short-string-pipe.module.ts b/html_source/src/app/parts/pipes/short-string-pipe/short-string-pipe.module.ts
diff --git a/...es/short-string-pipe/short-string.pipe.ts → .../src/app/parts/pipes/short-string.pipe.ts b/...es/short-string-pipe/short-string.pipe.ts → .../src/app/parts/pipes/short-string.pipe.ts
@@ -2,6 +2,7 @@ import { Pipe, PipeTransform } from '@angular/core';
 
 @Pipe({
     name: 'zanoShortString',
+    standalone: true
 })
 export class ShortStringPipe implements PipeTransform {
     transform(value: string | null | undefined, left = 6, right = 6): string | null | undefined {

diff --git a/html_source/src/app/parts/services/wallets.service.ts b/html_source/src/app/parts/services/wallets.service.ts
@@ -61,7 +61,7 @@ export class WalletsService {
         this.backendService.getWalletInfo(wallet_id, callback);
     }
 
-    closeWallet(wallet_id): void {
+    closeWallet(wallet_id: number): void {
         const callback = async (): Promise<void> => {
             this.wallets = this.wallets.filter(w => w.wallet_id !== wallet_id);
 

diff --git a/html_source/src/app/parts/utils/controls-of.ts b/html_source/src/app/parts/utils/controls-of.ts