commit 9a2791a9cf71551053467236240ec567bcf780b1
author Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Mon Oct 28 10:38:11 2019 -0400
committer Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Mon Oct 28 10:38:11 2019 -0400
tree 2409b75329fa4d046a25776b2adcbd23cc5bd90f
parent 2d621cbeb22f925e063df70902555b908b1eefa7

account settings: fix button visibility

Fix visibility for register name button for non jams accounts

Change-Id: I23aa8aa32ff0dabf352ca323fecb12b15ed470d0

src/AccRingGeneralVC.mm

diff --git a/src/AccRingGeneralVC.mm b/src/AccRingGeneralVC.mm
index e9e8461..90381ec 100644
--- a/src/AccRingGeneralVC.mm
+++ b/src/AccRingGeneralVC.mm
@@ -157,7 +157,15 @@
     NSString* displayName = @(account.profileInfo.alias.c_str());
     [displayNameField setStringValue:displayName];
     [ringIDField setStringValue:@(account.profileInfo.uri.c_str())];
-    if(account.registeredName.empty()) {
+
+    lrc::api::account::ConfProperties_t accountProperties = self.accountModel->getAccountConfig(self.selectedAccountID);
+    bool hideLocalAccountConfig = !accountProperties.managerUri.empty();
+    [passwordButton setHidden:hideLocalAccountConfig];
+    [linkDeviceButton setHidden:hideLocalAccountConfig];
+    [passwordField setHidden:hideLocalAccountConfig];
+    [exportAccountButton setHidden: hideLocalAccountConfig];
+
+    if(account.registeredName.empty() && !hideLocalAccountConfig) {
         [registerNameButton setHidden:NO];
         buttonRegisterWidthConstraint.constant = 260.0;
     } else {
@@ -167,17 +175,9 @@
 
     [registeredNameField setStringValue:@(account.registeredName.c_str())];
 
-    lrc::api::account::ConfProperties_t accountProperties = self.accountModel->getAccountConfig(self.selectedAccountID);
     [passwordButton setTitle:accountProperties.archiveHasPassword ? @"Change password" : @"Create password"];
     self.accountEnabled = account.enabled;
 
-    bool hideLocalAccountConfig = !accountProperties.managerUri.empty();
-    [registerNameButton setHidden:hideLocalAccountConfig];
-    [passwordButton setHidden:hideLocalAccountConfig];
-    [linkDeviceButton setHidden:hideLocalAccountConfig];
-    [passwordField setHidden:hideLocalAccountConfig];
-    [exportAccountButton setHidden: hideLocalAccountConfig];
-
     NSMutableAttributedString *colorTitle = [[NSMutableAttributedString alloc] initWithAttributedString:[removeAccountButton attributedTitle]];
     NSRange titleRange = NSMakeRange(0, [colorTitle length]);
     [colorTitle addAttribute:NSForegroundColorAttributeName value:[NSColor errorColor] range:titleRange];