diff --git a/ui/src/app/modals/action-success/action-success.module.ts b/ui/src/app/modals/action-success/action-success.module.ts index eb4f2284a..4ff931628 100644 --- a/ui/src/app/modals/action-success/action-success.module.ts +++ b/ui/src/app/modals/action-success/action-success.module.ts @@ -2,9 +2,6 @@ import { NgModule } from '@angular/core' import { CommonModule } from '@angular/common' import { IonicModule } from '@ionic/angular' import { ActionSuccessPage } from './action-success.page' -import { SharingModule } from 'src/app/modules/sharing.module' -import { FormsModule } from '@angular/forms' -import { QRComponentModule } from 'src/app/components/qr/qr.component.module' import { QrCodeModule } from 'ng-qrcode' @NgModule({ @@ -12,8 +9,6 @@ import { QrCodeModule } from 'ng-qrcode' imports: [ CommonModule, IonicModule, - FormsModule, - SharingModule, QrCodeModule, ], exports: [ActionSuccessPage], diff --git a/ui/src/app/modals/action-success/action-success.page.html b/ui/src/app/modals/action-success/action-success.page.html index e989dd049..b5f74d38e 100644 --- a/ui/src/app/modals/action-success/action-success.page.html +++ b/ui/src/app/modals/action-success/action-success.page.html @@ -1,23 +1,23 @@ - {{ header }} + Execution Complete
-

{{ message }}

+

{{ actionRes.message }}

- + -

{{ value }}

+

{{ actionRes.value }}

- +
-
- +
+
@@ -26,8 +26,8 @@ - - + + Close diff --git a/ui/src/app/modals/action-success/action-success.page.scss b/ui/src/app/modals/action-success/action-success.page.scss index 8b37c91b4..e69de29bb 100644 --- a/ui/src/app/modals/action-success/action-success.page.scss +++ b/ui/src/app/modals/action-success/action-success.page.scss @@ -1,11 +0,0 @@ -.close-button { - width: 100%; - display: flex; - justify-content: center; - align-items: center; - min-height: 100px; -} - -.main-content { - color: var(--ion-color-dark); -} \ No newline at end of file diff --git a/ui/src/app/modals/action-success/action-success.page.ts b/ui/src/app/modals/action-success/action-success.page.ts index 5a560564d..e269003f1 100644 --- a/ui/src/app/modals/action-success/action-success.page.ts +++ b/ui/src/app/modals/action-success/action-success.page.ts @@ -1,5 +1,6 @@ import { Component, Input } from '@angular/core' import { ModalController, ToastController } from '@ionic/angular' +import { ActionResponse } from 'src/app/services/api/api.types' import { copyToClipboard } from 'src/app/util/web.util' @Component({ @@ -8,12 +9,8 @@ import { copyToClipboard } from 'src/app/util/web.util' styleUrls: ['./action-success.page.scss'], }) export class ActionSuccessPage { - @Input() version: string - @Input() header: string - @Input() message: string - @Input() value: string - @Input() qr: boolean = false - @Input() copyable: boolean = false + + @Input() actionRes: ActionResponse constructor ( private readonly modalCtrl: ModalController, diff --git a/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts b/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts index bb6968fb6..02cf63d56 100644 --- a/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts +++ b/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts @@ -163,11 +163,7 @@ export class AppActionsPage { component: ActionSuccessPage, cssClass: res.qr ? 'action-success-modal-qr' : 'action-success-modal', componentProps: { - header: 'Execution Complete', - message: res.message, - value: res.value, - qr: res.qr, - copyable: res.copyable, + actionRes: res, }, })