app/controllers/concerns/api/v1/users/controller_base.rb in bullet_train-api-1.4.2 vs app/controllers/concerns/api/v1/users/controller_base.rb in bullet_train-api-1.4.3

@@ -3,16 +3,16 @@
 
   module StrongParameters
     # Only allow a list of trusted parameters through.
     def user_params
       password_fields = [
+        :email,
         :password,
         :current_password,
         :password_confirmation
       ]
       general_fields = [
-        :email,
         :first_name,
         :last_name,
         :time_zone,
         :locale,
         :profile_photo_id, # For Cloudinary
@@ -21,10 +21,10 @@
       ]
 
       selected_fields = if params.is_a?(BulletTrain::Api::StrongParametersReporter)
         password_fields + general_fields
       else
-        (params["commit"] == t(".buttons.update_password")) ? password_fields : general_fields
+        (params["commit"] == t(".buttons.update_email_and_password")) ? password_fields : general_fields
       end
 
       strong_params = params.require(:user).permit(
         *permitted_fields,
         *selected_fields,