From 050e4ef1a81cf545b1f6753ec0f022ac9281c8ab Mon Sep 17 00:00:00 2001
From: Zach Botterman <zbotterman@gmail.com>
Date: Tue, 25 Feb 2025 11:27:54 -0800
Subject: [PATCH] fix default complex action

---
 v3/examples/notifications/main.go             | 20 +++++--------------
 .../notifications/notifications_windows.go    |  7 +++----
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/v3/examples/notifications/main.go b/v3/examples/notifications/main.go
index a1d34dd5e..9dbc07c23 100644
--- a/v3/examples/notifications/main.go
+++ b/v3/examples/notifications/main.go
@@ -19,7 +19,7 @@ func main() {
 	notificationService := notifications.New()
 
 	app := application.New(application.Options{
-		Name:        "notifications_demo",
+		Name:        "Notifications",
 		Description: "A demo of using raw HTML & CSS",
 		Services: []application.Service{
 			application.NewService(notificationService),
@@ -33,7 +33,7 @@ func main() {
 	})
 
 	app.NewWebviewWindowWithOptions(application.WebviewWindowOptions{
-		Title: "Window 1",
+		Title: "Notifications",
 		Mac: application.MacWindow{
 			InvisibleTitleBarHeight: 50,
 			Backdrop:                application.MacBackdropTranslucent,
@@ -58,13 +58,8 @@ func main() {
 			})
 			time.Sleep(time.Second * 2)
 
-			var uuid1 string = "Wails Notification Demo"
-			if application.Get().Environment().OS == "darwin" {
-				uuid1 = "uuid1"
-			}
-
 			notificationService.SendNotification(notifications.NotificationOptions{
-				ID:    uuid1,
+				ID:    "uuid1",
 				Title: "Title!",
 				Body:  "Body!",
 				Data: map[string]interface{}{
@@ -76,11 +71,6 @@ func main() {
 
 			time.Sleep(time.Second * 2)
 
-			var uuid2 string = "Wails Notification Demo"
-			if application.Get().Environment().OS == "darwin" {
-				uuid2 = "uuid2"
-			}
-
 			notificationService.RegisterNotificationCategory(notifications.NotificationCategory{
 				ID: "BACKEND_NOTIF",
 				Actions: []notifications.NotificationAction{
@@ -94,9 +84,9 @@ func main() {
 			})
 
 			notificationService.SendNotificationWithActions(notifications.NotificationOptions{
-				ID:         uuid2,
+				ID:         "uuid2",
 				Title:      "Complex Backend Notification",
-				Subtitle:   "Should not show on Windows",
+				Subtitle:   "From: Jane Doe",
 				Body:       "Is it raining today where you are?",
 				CategoryID: "BACKEND_NOTIF",
 				Data: map[string]interface{}{
diff --git a/v3/pkg/services/notifications/notifications_windows.go b/v3/pkg/services/notifications/notifications_windows.go
index 390679b06..f19b9035e 100644
--- a/v3/pkg/services/notifications/notifications_windows.go
+++ b/v3/pkg/services/notifications/notifications_windows.go
@@ -152,11 +152,10 @@ func (ns *Service) SendNotificationWithActions(options NotificationOptions) erro
 	}
 
 	if options.Data != nil {
+		n.ActivationArguments, _ = encodePayload(n.ActivationArguments, options.Data)
+
 		for index := range n.Actions {
-			encodedPayload, err := encodePayload(n.Actions[index].Arguments, options.Data)
-			if err == nil {
-				n.Actions[index].Arguments = encodedPayload
-			}
+			n.Actions[index].Arguments, _ = encodePayload(n.Actions[index].Arguments, options.Data)
 		}
 	}