rebase to incorporate phone_setup changes. add to error handling from…

… FromResponse
18F · Apr 30, 2024 · 07a7ceb · 07a7ceb
1 parent b7d77ce
commit 07a7ceb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/controllers/users/phone_setup_controller.rb b/app/controllers/users/phone_setup_controller.rb
@@ -36,7 +36,7 @@ def create
       if result.success?
         handle_create_success(@new_phone_form.phone)
       else
-        flash.now[:error] = result.first_error_message(:recaptcha_token)
+        flash.now[:error] = result.first_error_message(:recaptcha_token, :rate_limited)
         render :index
       end
     end

diff --git a/app/services/form_response.rb b/app/services/form_response.rb
@@ -39,10 +39,11 @@ def merge(other)
     end
   end
 
-  def first_error_message(key = nil)
+  def first_error_message(*keys)
     return if errors.blank?
-    key ||= errors.keys.first
-    errors[key].first
+    [*keys, errors.keys.first].each do |key|
+      return errors[key].first if errors.key?(key)
+    end
   end
 
   def ==(other)