Merge branch 'main' into lro-improve-edit-user-ui

Author: Luke-Oldenburg

.github/workflows/claude-code-review.yml

@@ -0,0 +1,57 @@
+name: Claude Code Review
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+    # Optional: Only run on specific file changes
+    # paths:
+    #   - "src/**/*.ts"
+    #   - "src/**/*.tsx"
+    #   - "src/**/*.js"
+    #   - "src/**/*.jsx"
+
+jobs:
+  claude-review:
+    # Optional: Filter by PR author
+    # if: |
+    #   github.event.pull_request.user.login == 'external-contributor' ||
+    #   github.event.pull_request.user.login == 'new-developer' ||
+    #   github.event.pull_request.author_association == 'FIRST_TIME_CONTRIBUTOR'
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+      issues: read
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Run Claude Code Review
+        id: claude-review
+        uses: anthropics/claude-code-action@v1
+        with:
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+          prompt: |
+            REPO: ${{ github.repository }}
+            PR NUMBER: ${{ github.event.pull_request.number }}
+
+            Please review this pull request and provide feedback on:
+            - Code quality and best practices
+            - Potential bugs or issues
+            - Performance considerations
+            - Security concerns
+            - Test coverage
+
+            Use the repository's CLAUDE.md for guidance on style and conventions. Be constructive and helpful in your feedback.
+
+            Use `gh pr comment` with your Bash tool to leave your review as a comment on the PR.
+
+          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
+          # or https://docs.claude.com/en/docs/claude-code/cli-reference for available options
+          claude_args: '--allowed-tools "Bash(gh issue view:*),Bash(gh search:*),Bash(gh issue list:*),Bash(gh pr comment:*),Bash(gh pr diff:*),Bash(gh pr view:*),Bash(gh pr list:*)"'
+

.github/workflows/claude.yml

@@ -0,0 +1,50 @@
+name: Claude Code
+
+on:
+  issue_comment:
+    types: [created]
+  pull_request_review_comment:
+    types: [created]
+  issues:
+    types: [opened, assigned]
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  claude:
+    if: |
+      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
+      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+      issues: read
+      id-token: write
+      actions: read # Required for Claude to read CI results on PRs
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Run Claude Code
+        id: claude
+        uses: anthropics/claude-code-action@v1
+        with:
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+
+          # This is an optional setting that allows Claude to read CI results on PRs
+          additional_permissions: |
+            actions: read
+
+          # Optional: Give a custom prompt to Claude. If this is not specified, Claude will perform the instructions specified in the comment that tagged it.
+          # prompt: 'Update the pull request description to include a summary of changes.'
+
+          # Optional: Add claude_args to customize behavior and configuration
+          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
+          # or https://docs.claude.com/en/docs/claude-code/cli-reference for available options
+          # claude_args: '--allowed-tools Bash(gh pr:*)'
+

app/controllers/admin_controller.rb

@@ -717,15 +717,18 @@ def wise_transfers
     @per = params[:per] || 20
     @q = params[:q].presence
     @event_id = params[:event_id].presence
+    @status = WiseTransfer.aasm.states.collect(&:name).include?(params[:status]&.to_sym) ? params[:status] : nil
 
     @wise_transfers = WiseTransfer.all
 
     @wise_transfers = @wise_transfers.search_recipient(@q) if @q
 
-    @wise_transfers.where(event_id: @event_id) if @event_id
+    @wise_transfers = @wise_transfers.where(event_id: @event_id) if @event_id
+    @wise_transfers = @wise_transfers.where(aasm_state: @status) if @status
 
     @wise_transfers = @wise_transfers.page(@page).per(@per).order(
       Arel.sql("aasm_state = 'pending' DESC"),
+      Arel.sql("aasm_state = 'approved' DESC"),
       "created_at desc"
     )
   end

app/services/twilio_verification_service.rb

@@ -16,6 +16,9 @@ def send_verification_request(phone_number)
           .services(VERIFY_SERVICE_ID)
           .verifications
           .create(to: phone_number, channel: "sms")
+  rescue => e
+    Rails.error.report(e)
+    raise
   end
 
   def check_verification_token(phone_number, code)
@@ -24,6 +27,9 @@ def check_verification_token(phone_number, code)
                          .verification_checks
                          .create(to: phone_number, code:)
     verification.status == "approved"
+  rescue => e
+    Rails.error.report(e)
+    raise
   end
 
 end

app/views/admin/wise_transfers.html.erb

@@ -3,6 +3,7 @@
 <%= form_with local: true, url: wise_transfers_admin_index_path, method: :get do |form| %>
   <%= form.text_field :q, value: params[:q], placeholder: "Search" %>
   <%= form.collection_select(:event_id, Event.reorder(Event::CUSTOM_SORT), :id, :admin_dropdown_description, { include_blank: "Select An Event", selected: @event_id }, { width: 250, style: "max-width: 250px" }) %>
+  <%= form.collection_select(:status, WiseTransfer.aasm.states, :name, :human_name, { include_blank: "Filter by status", selected: @status }, { width: 250, style: "max-width: 250px" }) %>
   <%= form.submit "Search" %>
 <% end %>
 
@@ -27,7 +28,7 @@
   </thead>
   <tbody>
     <% @wise_transfers.each do |wise_transfer| %>
-      <tr class="<%= "admin-bg-pending" if wise_transfer.pending? %>">
+      <tr class="<%= "admin-bg-pending" if wise_transfer.pending? %> <%= "admin-bg-transit" if wise_transfer.approved? %>">
         <td><%= wise_transfer.id %></td>
         <td><%= wise_transfer.created_at.strftime("%Y-%m-%d") %></td>
         <td><%= wise_transfer.event.name %></td>

app/views/disbursements/_select_organization.html.erb

@@ -1,47 +1,46 @@
 <%# locals: (form:, field_name:, disabled:, events:, default_event:, lazy_load_balances: false, sending: false, receiving: false, allow_custom_events: false) %>
 
 <div class="field" data-controller="organization-select">
-    <%= form.label field_name, sending ? "From" : "To" %>
-    <select name="disbursement[<%= field_name %>]" id="disbursement_<%= field_name %>" <%= "disabled" if disabled %> class="bg-[transparent] dark:bg-darkless input input--select flex items-center select-none cursor-pointer disabled:cursor-default" data-organization-select-target="dropdown">
-        <option value>Select one...</option>
-        <option <%= "default" if default_event.present? %> value="<%= default_event.public_id if default_event.present? %>"><%= default_event.name if default_event.present? %></option>
-    </select>
+  <%= form.label field_name, sending ? "From" : "To" %>
+  <select name="disbursement[<%= field_name %>]" id="disbursement_<%= field_name %>" <%= "disabled" if disabled %> class="bg-[transparent] dark:bg-darkless input input--select flex items-center select-none cursor-pointer disabled:cursor-default" data-organization-select-target="dropdown">
+    <option value>Select one...</option>
+    <option <%= "default" if default_event.present? %> value="<%= default_event.public_id if default_event.present? %>"><%= default_event.name if default_event.present? %></option>
+  </select>
 
-    <div data-organization-select-target="wrapper" style="max-width: 384px;">
-        <input data-organization-select-target="search" style="display: none; border-bottom-left-radius: 0px; border-bottom-right-radius: 0px;" type="text" placeholder="Search">
+  <div data-organization-select-target="wrapper" style="max-width: 384px;">
+    <input data-organization-select-target="search" style="display: none; border-bottom-left-radius: 0px; border-bottom-right-radius: 0px;" type="text" placeholder="Search">
 
-        <div data-organization-select-target="menu" style="display: none; border-width: 1px; border-style: solid; border-top: none; max-width: 384px; border-top-left-radius: 0px; border-top-right-radius: 0px;" class="border-smoke rounded-md dark:border-black overflow-hidden h-40">
-            <div class="w-full h-full rounded-md overflow-y-scroll" style="border-top-left-radius: 0px; border-top-right-radius: 0px; content-visibility: auto;">
-                <div>
-                    <% events.each_with_index.map do |event, i| %>
-                    <% disabled_message = nil %>
-                    <% disabled_message = "Insufficient balance" if sending && !admin_signed_in? && event.balance_available <= 0 %>
-                    <% disabled_message = "HCB transfers disabled" if sending && !policy(event).create_transfer? %>
-                    <div data-id="<%= event.public_id %>" data-slug="<%= event.slug %>" data-name="<%= event.name %>" data-organization-select-target="organization" style="<%= i > 50 ? "display: none" : "" %>" data-index="<%= i %>">
-                        <button <%= "disabled" if disabled_message %> aria-label="<%= disabled_message %>" class="<%= "tooltipped tooltipped--i" if disabled_message %> text-[length:inherit] border-none bg-[transparent] w-full flex justify-between p-2 cursor-pointer disabled:cursor-default hover:bg-smoke hover:dark:bg-darkless transition-colors duration-150" type="button">
-                            <div class="text-left <%= "tooltipped tooltipped--e" if admin_signed_in? %>" aria-label="<%= "ID: #{event.id}" if admin_signed_in? %>"><%= event.name %></div>
+    <div data-organization-select-target="menu" style="display: none; border-width: 1px; border-style: solid; border-top: none; max-width: 384px; border-top-left-radius: 0px; border-top-right-radius: 0px;" class="border-smoke rounded-md dark:border-black overflow-hidden h-40">
+      <div class="w-full h-full rounded-md overflow-y-scroll" style="border-top-left-radius: 0px; border-top-right-radius: 0px; content-visibility: auto;">
+        <div>
+          <% events.each_with_index.map do |event, i| %>
+            <% disabled_message = nil %>
+            <% disabled_message = "Insufficient balance" if sending && !admin_signed_in? && event.balance_available <= 0 %>
+            <% disabled_message = "HCB transfers disabled" if sending && !policy(event).create_transfer? %>
+            <div data-id="<%= event.public_id %>" data-slug="<%= event.slug %>" data-name="<%= event.name %>" data-organization-select-target="organization" style="<%= i > 50 ? "display: none" : "" %>" data-index="<%= i %>">
+              <button <%= "disabled" if disabled_message %> aria-label="<%= disabled_message %>" class="<%= "tooltipped tooltipped--i" if disabled_message %> text-[length:inherit] border-none bg-[transparent] w-full flex justify-between p-2 cursor-pointer disabled:cursor-default hover:bg-smoke hover:dark:bg-darkless transition-colors duration-150" type="button">
+                <div class="text-left <%= "tooltipped tooltipped--e" if admin_signed_in? %>" aria-label="<%= "ID: #{event.id}" if admin_signed_in? %>"><%= event.name %></div>
 
-                            <div class="text-muted pl-2">
-                              <%= turbo_frame_tag "event_balance_#{event.public_id}", src: event_async_balance_path(event, symbol: true), data: { turbo_permanent: true, controller: "cached-frame", action: "turbo:frame-render->cached-frame#cache" }, loading: :lazy do %>
-                                  <strong>-</strong>
-                              <% end %>
-                            </div>
-                        </button>
-                        <hr class="my-0">
-                    </div>
-                    <% end %>
-                    <% if receiving && allow_custom_events %>
-                    <div data-id="other" data-organization-select-target="other">
-                        <button class="text-[length:inherit] border-none bg-[transparent] w-full flex justify-between p-2 cursor-pointer disabled:cursor-default hover:bg-smoke hover:dark:bg-darkless transition-colors duration-150">
-                            <div class="text-left other-name"></div>
-                            <div></div>
-                        </button>
-                        <hr class="my-0">
-                    </div>
-                    <% end %>
+                <div class="text-muted pl-2">
+                  <%= turbo_frame_tag "event_balance_#{event.public_id}", src: event_async_balance_path(event, symbol: true), data: { turbo_permanent: true, controller: "cached-frame", action: "turbo:frame-render->cached-frame#cache" }, loading: :lazy do %>
+                    <strong>-</strong>
+                  <% end %>
                 </div>
+              </button>
+              <hr class="my-0">
             </div>
+          <% end %>
+          <% if receiving && allow_custom_events %>
+            <div data-id="other" data-organization-select-target="other">
+              <button class="text-[length:inherit] border-none bg-[transparent] w-full flex justify-between p-2 cursor-pointer disabled:cursor-default hover:bg-smoke hover:dark:bg-darkless transition-colors duration-150">
+                <div class="text-left other-name"></div>
+                <div></div>
+              </button>
+              <hr class="my-0">
+            </div>
+          <% end %>
         </div>
+      </div>
     </div>
-
+  </div>
 </div>

app/views/events/perks/_premium_pins.html.erb

@@ -28,7 +28,7 @@
 
   <p>
     Ever wish you were just a little more dripped out in HCB swag?
-    We'll ship you some super cool custom HCB pins and keychains for free if you have 5 or more active teenagers!
+    We'll ship you some super cool custom HCB pins and keychains for free if you have 5 or more active teenagers! At the moment, only US-based teams are eligible for this.
   </p>
   <section class="card__banner card__darker secondary border-top italic">
     You currently have <%= active_teenagers_count %>/5 active teenagers in your organization!

app/views/organizer_position/spending/controls/allowances/_form.html.erb

@@ -26,6 +26,6 @@
   <p x-show="amount && amount >= 0 && operation"><%= @active_control.organizer_position.user.name %>'s spending balance will be <span x-html="formatter.format(balance + (operation == 'add' ? Number(amount) : -Number(amount)))"></span></p>
 
   <div class="actions">
-    <%= form.submit %>
+    <%= form.submit "Create allowance" %>
   </div>
 <% end %>

app/views/organizer_position/spending/controls/index.html.erb

@@ -1,10 +1,10 @@
-<% title "Spending allowances for #{@organizer_position.user.name}" %>
+<% title "Allowances for #{@organizer_position.user.name}" %>
 <% page_md %>
 <%= render "events/nav" %>
 
 <h1 class="heading justify-between">
   <span class="inline-flex items-center justify-center">
-    <%= @organizer_position.user.name %>'s Spending
+    <%= @organizer_position.user.possessive_name %> allowances
     <% if @active_control %>
       <% admin_tool("w-fit h5 ml1 muted", "span") do %>
         Control ID: <%= @active_control&.id %>
@@ -30,7 +30,7 @@
 
 <% if @active_control %>
   <div class="modal modal--scroll bg-snow" data-behavior="modal" role="dialog" id="new">
-    <%= modal_header "New spending allowance" %>
+    <%= modal_header "New allowance" %>
     <%= render "organizer_position/spending/controls/allowances/form" %>
   </div>
 <% end %>
@@ -68,7 +68,7 @@
       <% end %>
     <% else %>
       <% control_enable_button = form_with url: event_organizer_position_spending_controls_path(@event, @organizer_position), method: :post, local: true do |form| %>
-        <%= form.submit "Enable controls for #{@organizer_position.user.first_name}", class: "btn btn-small bg-info tooltipped tooltipped--e #{"disabled" unless policy(@provisional_control).new?}" %>
+        <%= form.submit "Enable spending controls for #{@organizer_position.user.first_name}", class: "btn btn-small bg-info tooltipped tooltipped--e #{"disabled" unless policy(@provisional_control).new?}" %>
       <% end %>
 
       <% if policy(@provisional_control).new? %>
@@ -119,7 +119,7 @@
 <div class="mixed-grid grid--spacious mt-20">
   <%= link_to "#", data: { behavior: "modal_trigger", modal: "past-controls" }, class: "card flex justify-between #{"opacity-50 pointer-events-none" if @inactive_control_count.zero?}" do %>
     <div class="flex flex-col">
-      <p class="bold black">Past controls</p>
+      <p class="bold black">Past spending controls</p>
       <p class="muted">
         <% if @inactive_control_count.zero? %>
           There are no previous spending controls

app/views/users/_user_session.html.erb

@@ -17,7 +17,7 @@
         <%= inline_icon "door-leave", size: home_action_size %>
       <% end %>
     <% elsif !session.expired? %>
-      <%= link_to logout_session_users_path(user: @user, id: session.id), data: { turbo_method: :delete, turbo_frame: "_top" }, class: "muted tooltipped tooltipped--w z5", 'aria-label': "Sign out of this session" do %>
+      <%= link_to logout_session_users_path(user: @user, id: session.id), data: { turbo_method: :delete, turbo_frame: "_top" }, class: "muted tooltipped tooltipped--w z5", 'aria-label': "Sign out of this session", disabled: !policy(@user).logout_session? do %>
         <%= inline_icon "door-leave", size: home_action_size %>
       <% end %>
     <% end %>