Fix sender email for invited users to be of the correct org

app/controllers/accounts/organizations_controller.rb

@@ -15,8 +15,8 @@ def teams
       [2, "Team", teams_accounts_organization_path(current_organization), "v2/user_cog.svg"]
     ]
     @teams = current_organization.teams
-    @users = current_organization.users.includes(:invitations)
-    @invited_users = current_organization.invites.includes(:sender).not_accepted
+    @users = current_organization.members
+    @invited_users = current_organization.pending_invites
   end
 
   def rotate_api_key

app/models/accounts/organization.rb

@@ -81,6 +81,14 @@ def default_app
     apps.first
   end
 
+  def members
+    users.includes(memberships: :organization, invitations: :organization)
+  end
+
+  def pending_invites
+    invites.includes(:sender).not_accepted
+  end
+
   def team_colors
     colors = teams.pluck(:name, :color).to_h || {}
     colors[Accounts::Team::UNKNOWN_TEAM_NAME] = Accounts::Team::UNKNOWN_TEAM_COLOR

app/models/accounts/user.rb

@@ -117,8 +117,10 @@ def owner_for?(organization)
     access_for(organization).owner?
   end
 
-  def successful_invite
-    invitations.find(&:accepted?)
+  def successful_invite_for(organization)
+    invitations
+      .filter { |i| i.organization == organization }
+      .find(&:accepted?)
   end
 
   def release_monitoring?

app/views/accounts/organizations/_teams.html.erb

@@ -92,7 +92,7 @@
           <%= render V2::TeamPillComponent.new(member.team_for(current_organization)) %>
         <% end %>
         <% row.with_cell do %>
-          <%= member.successful_invite&.sender&.email || "–" %>
+          <%= member.successful_invite_for(current_organization)&.sender&.email || "–" %>
         <% end %>
       <% end %>
     <% end %>