Merge branch 'main' into ui3

Author: manuthecoder

app/services/user_service/enroll_sms_auth.rb

@@ -12,11 +12,15 @@ def start_verification
       # doing this here to be safe.
       raise ArgumentError.new("phone number for user: #{@user.id} not in E.164 format") unless @user.phone_number =~ /\A\+[1-9]\d{1,14}\z/
 
+      disallow_fresh_users
+
       TwilioVerificationService.new.send_verification_request(@user.phone_number)
     end
 
     # Completing the phone number verification by checking that exchanging code works
     def complete_verification(verification_code)
+      disallow_fresh_users
+
       begin
         verified = TwilioVerificationService.new.check_verification_token(@user.phone_number, verification_code)
       rescue Twilio::REST::RestError
@@ -33,6 +37,8 @@ def enroll_sms_auth
       raise SMSEnrollmentError("user has no phone number") if @user.phone_number.blank?
       raise SMSEnrollmentError("user has not verified phone number") unless @user.phone_number_verified
 
+      disallow_fresh_users
+
       @user.use_sms_auth = true
       @user.save!
     end
@@ -47,5 +53,11 @@ def disable_sms_auth
     class SMSEnrollmentError < StandardError
     end
 
+    def disallow_fresh_users
+      return if @user.created_at < 1.day.ago
+
+      raise SMSEnrollmentError("Please wait at least 24 hours after creating your account before enrolling in SMS authentication.")
+    end
+
   end
 end

app/views/events/_donate_button.html.erb

@@ -0,0 +1,8 @@
+<%# locals: (event:) %>
+
+<% if event.donation_page_available? && event.is_public && !organizer_signed_in? %>
+  <%= link_to start_donation_donations_path(event), target: "_blank", class: "btn bg-blue flex items-center" do %>
+    <%= inline_icon "purse" %>
+    Donate
+  <% end %>
+<% end %>

app/views/events/_heading.html.erb

@@ -0,0 +1,16 @@
+<%# locals: (event:, event_follow: nil) %>
+
+<h1 class="flex items-center gap-4">
+  <%= yield %>
+  <% admin_tool("badge", "span") do %>
+    <span class="m0 badge bg-muted">
+      #<%= event.id %>
+    </span>
+    <span class="m0 badge bg-muted ml1">
+      SL<%= event.service_level %>
+    </span>
+  <% end %>
+
+  <%= render "events/follow_button", event:, event_follow: %>
+  <%= render "events/donate_button", event: %>
+</h1>

app/views/events/show.html.erb

@@ -27,21 +27,9 @@
   <% end %>
 <% end %>
 
-<h1 class="flex items-center border-0 mb-0">
-  <span class="flex-grow">
-    <%= @event.name %>
-  </span>
-  <% admin_tool("p0 m2 my-0 badge bg-transparent", "span") do %>
-    <span class="m0 badge bg-muted">
-      #<%= @event.id %>
-    </span>
-    <span class="m0 badge bg-muted ml1">
-      SL<%= @event.service_level %>
-    </span>
-  <% end %>
-
-  <%= render "events/follow_button", event: @event, event_follow: @event_follow %>
-</h1>
+<%= render "events/heading", event: @event, event_follow: @event_follow do %>
+  <span class="flex-grow">Home</span>
+<% end %>
 
 <div class="flex flex-col gap-[20px] -mt-3" data-controller="event-home">
   <% if organizer_signed_in?(as: :member) %>

app/views/events/transactions.html.erb

@@ -27,35 +27,9 @@
 
 <%= render "events/nav", selected: :transactions %>
 
-<%# Demo mode callout thing %>
-<% if organizer_signed_in? && @event.demo_mode && !Flipper.enabled?(:event_home_page_redesign_2024_09_21, @event) %>
-  <div class="mt-4 card border pb0 mb-4" style="text-wrap: pretty;" id="playground-callout" data-tour-step="playground_mode">
-    <p class="mt0">
-      <strong>Welcome to Playground Mode</strong>
-      <br>
-      While in Playground mode, explore the dashboard with mock data, and invite your team.
-    </p>
-
-    <%= link_to({ show_mock_data: !show_mock_data? }, class: "btn btn-small mb-4 w-fit shrink-none nowrap") do %>
-      <%= inline_icon "view" %>
-      <%= show_mock_data? ? "Hide" : "Show" %> mock data
-    <% end %>
-  </div>
-<% end %>
-
-<h1 class="flex items-center flex-wrap mb-0 border-0">
+<%= render "events/heading", event: @event, event_follow: @event_follow do %>
   <span class="flex-grow">Transactions</span>
-  <% admin_tool("p0 m2 my-0 badge bg-transparent", "span") do %>
-    <span class="m0 badge bg-muted">
-      #<%= @event.id %>
-    </span>
-    <span class="m0 badge bg-muted ml1">
-      SL<%= @event.service_level %>
-    </span>
-  <% end %>
-
-  <%= render "events/follow_button", event: @event, event_follow: @event_follow %>
-</h1>
+<% end %>
 
 <div class="statset mb-2">
   <div class="stat">