From 6550966a37ecd426d1cc013d0f10b95bb560aa30 Mon Sep 17 00:00:00 2001 From: Ptera Date: Sat, 6 Jan 2024 13:17:56 -0500 Subject: [PATCH] Feat/4.7.0 (#125) * 4.7.0 * 4.7.0 * 4.7.0 --- CHANGELOG.md | 12 +++++++ package-lock.json | 4 +-- package.json | 2 +- src/app/app.component.html | 3 -- src/app/app.component.ts | 36 +++---------------- src/app/app.initializer.ts | 32 +++++++++++++++++ src/app/app.module.ts | 15 ++++++-- .../rename-address.component.scss | 8 +++-- .../rename-address.component.ts | 32 +++++++++++------ .../overlays/actions/send/send.component.ts | 6 ++-- .../address-book/address-book.component.ts | 6 +++- .../pages/dashboard/dashboard.component.html | 2 +- src/app/services/pow.service.ts | 2 +- src/app/services/signer.service.ts | 2 +- src/app/services/timeout.service.ts | 4 ++- src/app/services/wallet-events.service.ts | 4 ++- 16 files changed, 110 insertions(+), 60 deletions(-) delete mode 100644 src/app/app.component.html create mode 100644 src/app/app.initializer.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 1840d674..4c2a5c8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Change Log +## v4.7.0 (January 6, 2024) + +### Added + +- Added known account info onto address book new entry overlay. +- Added `APP_INITIALIZER` to app module. + +### Changed + +- Change address book new entry page styles. +- Stop showing `--` Balance for accounts with 0 BAN, show a zero instead. + ## v4.6.1 (December 27, 2023) ### Added diff --git a/package-lock.json b/package-lock.json index 974956f7..bcefc49d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "thebananostand", - "version": "4.0.3", + "version": "4.7.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "thebananostand", - "version": "4.0.3", + "version": "4.7.0", "dependencies": { "@angular/animations": "^16.2.0", "@angular/cdk": "^15.2.9", diff --git a/package.json b/package.json index 4112a867..71858559 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "thebananostand", - "version": "4.6.1", + "version": "4.7.0", "scripts": { "ng": "ng", "start": "ng serve --open --host 0.0.0.0", diff --git a/src/app/app.component.html b/src/app/app.component.html deleted file mode 100644 index 1729983d..00000000 --- a/src/app/app.component.html +++ /dev/null @@ -1,3 +0,0 @@ -
- -
diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 43f32f2c..8bcf033b 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,43 +1,17 @@ import { Component } from '@angular/core'; import { Data, RouterOutlet } from '@angular/router'; import { slideInAnimation } from './animation'; -import { WalletEventsService } from '@app/services/wallet-events.service'; -import { PowService } from '@app/services/pow.service'; -import { AppStateService } from '@app/services/app-state.service'; -import { environment } from '../environments/environment'; -import { TimeoutService } from '@app/services/timeout.service'; @Component({ selector: 'app-root', - templateUrl: './app.component.html', + template: ` +
+ +
+ `, animations: [slideInAnimation], }) export class AppComponent { - constructor( - private readonly _powService: PowService, - private readonly _appStoreService: AppStateService, - private readonly _walletEventService: WalletEventsService, // Required to listen to app events; don't remove. - private readonly _timeoutService: TimeoutService // Listens for user idle - ) { - const appHeight = (): void => { - const doc = document.documentElement; - doc.style.setProperty(`--app-height`, `${window.innerHeight}px`); - }; - window.addEventListener(`resize`, appHeight); - appHeight(); - - this._appStoreService.store.subscribe((data) => { - if (!environment.production) { - // eslint-disable-next-line no-console - console.log(data); - } - }); - } - - ngOnInit(): void { - this._powService.initializePowService(); - } - prepareRoute(outlet: RouterOutlet): Data { return outlet?.activatedRouteData?.['animation']; } diff --git a/src/app/app.initializer.ts b/src/app/app.initializer.ts new file mode 100644 index 00000000..3fb4f400 --- /dev/null +++ b/src/app/app.initializer.ts @@ -0,0 +1,32 @@ +import { inject } from '@angular/core'; +import { PowService } from '@app/services/pow.service'; +import { TimeoutService } from '@app/services/timeout.service'; +import { WalletEventsService } from '@app/services/wallet-events.service'; +import { AppStateService } from '@app/services/app-state.service'; +import { environment } from '../environments/environment'; + +function appHeight(): void { + const doc = document.documentElement; + doc.style.setProperty(`--app-height`, `${window.innerHeight}px`); +} + +export function initializeApp(): void { + const powService = inject(PowService); + const timeoutService = inject(TimeoutService); + const walletEventService = inject(WalletEventsService); + const appStateService = inject(AppStateService); + + powService.init(); + walletEventService.init(); + timeoutService.init(); + appStateService.store.subscribe((data) => { + if (!environment.production) { + // eslint-disable-next-line no-console + console.log(data); + } + }); + + // Respond to window height change events. + window.addEventListener(`resize`, appHeight); + appHeight(); +} diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 61ac54fb..844087a1 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -57,7 +57,7 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { MatToolbarModule } from '@angular/material/toolbar'; import { MatTooltipModule } from '@angular/material/tooltip'; import { MobileStepperModule } from '@app/components/mobile-stepper/mobile-stepper.module'; -import { NgModule } from '@angular/core'; +import { APP_INITIALIZER, NgModule } from '@angular/core'; import { QrDialogComponent } from '@app/components/qr/qr.component'; import { ReceiveBottomSheetComponent } from '@app/overlays/bottom-sheet/receive/receive-bottom-sheet.component'; import { ReceiveComponent } from '@app/overlays/actions/receive/receive.component'; @@ -98,6 +98,7 @@ import { CommaPipe } from './pipes/comma.pipe'; import { AddRpcOverlayComponent } from '@app/overlays/actions/add-rpc/add-rpc.component'; import { AddRpcDialogComponent } from '@app/overlays/dialogs/add-rpc/add-rpc-dialog.component'; import { AddRpcBottomSheetComponent } from '@app/overlays/bottom-sheet/add-rpc/add-rpc-bottom-sheet.component'; +import { initializeApp } from './app.initializer'; LOAD_WASM().subscribe((res: any) => console.log('WASM ngx-scanner-qrcode loaded', res)); @@ -205,7 +206,17 @@ LOAD_WASM().subscribe((res: any) => console.log('WASM ngx-scanner-qrcode loaded' MatSortModule, MatSliderModule, ], - providers: [provideUserIdleConfig({ idle: 600, timeout: 60 })], + providers: [ + provideUserIdleConfig({ idle: 600, timeout: 60 }), + { + provide: APP_INITIALIZER, + useFactory: (): any => { + initializeApp(); + return () => Promise.resolve(); + }, + multi: true, + }, + ], bootstrap: [AppComponent], }) export class AppModule {} diff --git a/src/app/overlays/actions/rename-address/rename-address.component.scss b/src/app/overlays/actions/rename-address/rename-address.component.scss index 8eb4eb0d..f4cc635d 100644 --- a/src/app/overlays/actions/rename-address/rename-address.component.scss +++ b/src/app/overlays/actions/rename-address/rename-address.component.scss @@ -1,4 +1,8 @@ .rename-address-overlay { - max-width: 320px; - width: 320px; + max-width: 340px; + width: 340px; + height: 540px; + &.shorter { + height: 370px; + } } diff --git a/src/app/overlays/actions/rename-address/rename-address.component.ts b/src/app/overlays/actions/rename-address/rename-address.component.ts index fd2e920f..b8cad25c 100644 --- a/src/app/overlays/actions/rename-address/rename-address.component.ts +++ b/src/app/overlays/actions/rename-address/rename-address.component.ts @@ -7,16 +7,16 @@ import { UPDATE_ADDRESS_BOOK } from '@app/services/wallet-events.service'; selector: 'app-rename-address-overlay', styleUrls: ['rename-address.component.scss'], template: ` -
-
{{ addressOrNickname ? 'Rename' : 'Add' }} Address
+
+
{{ address ? 'Rename' : 'Add' }} Address
-
- Rename "{{ addressOrNickname }} + Rename "{{ addressOrNickname }}" to something else?
-
Add a new entry to your local address book.
+
Add a new entry to your local address book.
- + Address