From b23351386b4161c57c34d89e039381214247466b Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Wed, 10 Apr 2024 16:56:59 -0500 Subject: [PATCH] using helper now Signed-off-by: Matt Bruce --- .../NotificationMoleculeView.swift | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift b/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift index 7c4643bb..38c58aa9 100644 --- a/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift +++ b/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift @@ -28,12 +28,18 @@ import VDS title = viewModel.headline.text subTitle = viewModel.body?.text - if let buttonModel = viewModel.button { - primaryButtonModel = buttonModel.toNotficationButtonModel(delegateObject: delegateObject, additionalData) + if let button = viewModel.button { + primaryButtonModel = .init(text: button.title, onClick: {[weak self] _ in + guard let self else { return } + self.executeAction(model: button, delegateObject: self.delegateObject, additionalData: self.additionalData) + }) } - if let buttonModel = viewModel.secondaryButton { - secondaryButtonModel = buttonModel.toNotficationButtonModel(delegateObject: delegateObject, additionalData) + if let secondaryButton = viewModel.secondaryButton { + secondaryButtonModel = .init(text: secondaryButton.title, onClick: {[weak self] _ in + guard let self else { return } + self.executeAction(model: secondaryButton, delegateObject: self.delegateObject, additionalData: self.additionalData) + }) } if let accessibilityIdentifier = viewModel.accessibilityIdentifier { @@ -43,9 +49,9 @@ import VDS if let closeButton = viewModel.closeButton { onCloseClick = { [weak self] _ in guard let self else { return } - closeButton.onClick(delegateObject: self.delegateObject, self.additionalData) - } + self.executeAction(model: closeButton, delegateObject: self.delegateObject, additionalData: self.additionalData) } } + hideCloseButton = viewModel.closeButton == nil style = viewModel.style.toVDSStyle }