fix: Update account limit selection logic (#6149)

enterprise/app/models/enterprise/account.rb

@@ -15,7 +15,11 @@ module Enterprise::Account
 
   def get_limits(limit_name)
     config_name = "ACCOUNT_#{limit_name.to_s.upcase}_LIMIT"
-    self[:limits][limit_name.to_s] || GlobalConfig.get(config_name)[config_name] || ChatwootApp.max_limit
+    return self[:limits][limit_name.to_s] if self[:limits][limit_name.to_s].present?
+
+    return GlobalConfig.get(config_name)[config_name] if GlobalConfig.get(config_name)[config_name].present?
+
+    ChatwootApp.max_limit
   end
 
   def validate_limit_keys

spec/enterprise/models/account_spec.rb

@@ -38,5 +38,27 @@ RSpec.describe Account do
         }
       )
     end
+
+    it 'returns max limits from global config if account limit is absent' do
+      account.update(limits: { agents: '' })
+      expect(account.usage_limits).to eq(
+        {
+          agents: 20,
+          inboxes: ChatwootApp.max_limit
+        }
+      )
+    end
+
+    it 'returns max limits from app limit if account limit and installation config is absent' do
+      account.update(limits: { agents: '' })
+      InstallationConfig.where(name: 'ACCOUNT_AGENTS_LIMIT').update(value: '')
+
+      expect(account.usage_limits).to eq(
+        {
+          agents: ChatwootApp.max_limit,
+          inboxes: ChatwootApp.max_limit
+        }
+      )
+    end
   end
 end