fix: store color in db

status-im · Jan 19, 2024 · 04da0b0 · 04da0b0
1 parent 1e1ae57
commit 04da0b0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/protocol/messenger_response.go b/protocol/messenger_response.go
@@ -310,7 +310,8 @@ func (r *MessengerResponse) IsEmpty() bool {
 		len(r.ensUsernameDetails) == 0 &&
 		r.currentStatus == nil &&
 		r.activityCenterState == nil &&
-		r.SocialLinksInfo == nil
+		r.SocialLinksInfo == nil &&
+		r.CustomizationColor == ""
 }
 
 // Merge takes another response and appends the new Chats & new Messages and replaces

diff --git a/protocol/messenger_settings.go b/protocol/messenger_settings.go
@@ -24,14 +24,25 @@ func (m *Messenger) SetCustomNodes(request *requests.SetCustomNodes) error {
 }
 
 func (m *Messenger) SetCustomizationColor(ctx context.Context, request *requests.SetCustomizationColor) error {
-	updatedAt := timesource.GetCurrentTimeInMillis()
 
 	acc, err := m.multiAccounts.GetAccount(request.KeyUID)
 	if err != nil {
 		return err
 	}
+
 	acc.CustomizationColor = request.CustomizationColor
-	acc.CustomizationColorClock = updatedAt
+
+	tNow := timesource.GetCurrentTimeInMillis()
+	if acc.CustomizationColorClock >= tNow {
+		acc.CustomizationColorClock++
+	} else {
+		acc.CustomizationColorClock = tNow
+	}
+
+	err = m.multiAccounts.UpdateAccountCustomizationColor(request.KeyUID, string(acc.CustomizationColor), acc.CustomizationColorClock)
+	if err != nil {
+		return err
+	}
 	err = m.syncAccountCustomizationColor(ctx, acc)
 	if err != nil {
 		return err