Merge branch 'master' into live

db/migrate/20240607123654_add_settled_at_to_zaps.rb

@@ -3,7 +3,7 @@ class AddSettledAtToZaps < ActiveRecord::Migration[7.1]
     add_column :zaps, :settled_at, :datetime, default: nil
 
     Zap.where.not(receipt: nil).each do |zap|
-      zap.update! settled_at: zap.receipt_event.created_at
+      zap.update! settled_at: Time.at(zap.receipt_event.created_at).to_datetime
     end
   end
 end