lib/sendgrid_actionmailer.rb in sendgrid-actionmailer-2.3.0 vs lib/sendgrid_actionmailer.rb in sendgrid-actionmailer-2.4.0

@@ -161,12 +161,14 @@
       if mail['custom_args']
         json_parse(mail['custom_args'].value, false).each do |key, value|
           sendgrid_mail.add_custom_arg(CustomArg.new(key: key, value: value))
         end
       end
-      if mail['send_at'] && mail['batch_id']
+      if mail['send_at']
         sendgrid_mail.send_at = mail['send_at'].value.to_i
-        sendgrid_mail.batch_id= mail['batch_id'].to_s
+      end
+      if mail['batch_id']
+        sendgrid_mail.batch_id = mail['batch_id'].to_s
       end
       if mail['asm']
         asm = json_parse(mail['asm'].value)
         asm =  asm.delete_if { |key, value| !key.to_s.match(/(group_id)|(groups_to_display)/) }
         if asm[:group_id]