Fix sign messages

Gabboxl · May 26, 2024 · f0a3ecb · f0a3ecb
1 parent 57d62ad
commit f0a3ecb
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/ClassevivaPCTO/Dialogs/NoticeDialogContent.xaml.cs b/ClassevivaPCTO/Dialogs/NoticeDialogContent.xaml.cs
@@ -41,22 +41,14 @@ private string JoinAlertMessage
                     return "JoinRequestedMessage".GetLocalizedStr();
                 }
 
-                return "JoinRequestedMessage".GetLocalizedStr();
+                return string.Empty;
             }
         }
 
         private string SignAlertMessage
         {
             get
             {
-                if (CurrentNotice.needJoin)
-                {
-                    if (CurrentReadResult.reply.replJoin.GetValueOrDefault())
-                        return "JoinSuccessMessage".GetLocalizedStr();
-
-                    return "JoinRequestedMessage".GetLocalizedStr();
-                }
-
                 if (CurrentNotice.needSign)
                 {
                     if (CurrentReadResult.reply.replSign == null)
@@ -67,7 +59,7 @@ private string SignAlertMessage
                     return "SignRefuseMessage".GetLocalizedStr();
                 }
 
-                return "JoinRequestedMessage".GetLocalizedStr();
+                return string.Empty;
             }
         }
 
@@ -100,9 +92,11 @@ private InfoBarSeverity SignAlertSeverityStatus
 
                 if (CurrentNotice.needSign)
                 {
-                    if (CurrentReadResult.reply.replSign != null && (bool)CurrentReadResult.reply.replSign)
+                    if (CurrentReadResult.reply.replSign == null)
+                        return InfoBarSeverity.Informational;
+                    if (CurrentReadResult.reply.replSign.GetValueOrDefault())
                         return InfoBarSeverity.Success;
-                    if (CurrentReadResult.reply.replSign != null && !(bool)CurrentReadResult.reply.replSign)
+                    if (!CurrentReadResult.reply.replSign.GetValueOrDefault())
                         return InfoBarSeverity.Error;
                 }