1 files changed, 15 insertions, 18 deletions

diff --git a/app/helpers/invite_members_helper.rb b/app/helpers/invite_members_helper.rb
index 62d83ebe79e..889c058cb21 100644
--- a/app/helpers/invite_members_helper.rb
+++ b/app/helpers/invite_members_helper.rb
@@ -3,12 +3,12 @@
 module InviteMembersHelper
   include Gitlab::Utils::StrongMemoize
 
-  def can_invite_members_for_group?(group)
-    Feature.enabled?(:invite_members_group_modal, group) && can?(current_user, :admin_group_member, group)
+  def can_invite_members_for_project?(project)
+    Feature.enabled?(:invite_members_group_modal, project.group) && can_manage_project_members?(project)
   end
 
-  def can_invite_members_for_project?(project)
-    Feature.enabled?(:invite_members_group_modal, project.group) && can_import_members?
+  def can_invite_group_for_project?(project)
+    Feature.enabled?(:invite_members_group_modal, project.group) && project.allowed_to_share_with_group?
   end
 
   def directly_invite_members?
@@ -17,20 +17,6 @@ module InviteMembersHelper
     end
   end
 
-  def indirectly_invite_members?
-    strong_memoize(:indirectly_invite_members) do
-      experiment_enabled?(:invite_members_version_b) && !can_import_members?
-    end
-  end
-
-  def show_invite_members_track_event
-    if directly_invite_members?
-      'show_invite_members'
-    elsif indirectly_invite_members?
-      'show_invite_members_version_b'
-    end
-  end
-
   def invite_group_members?(group)
     experiment_enabled?(:invite_members_empty_group_version_a) && Ability.allowed?(current_user, :admin_group_member, group)
   end
@@ -46,6 +32,17 @@ module InviteMembersHelper
     end
   end
 
+  def invite_accepted_notice(member)
+    case member.source
+    when Project
+      _("You have been granted %{member_human_access} access to project %{name}.") %
+        { member_human_access: member.human_access, name: member.source.name }
+    when Group
+      _("You have been granted %{member_human_access} access to group %{name}.") %
+        { member_human_access: member.human_access, name: member.source.name }
+    end
+  end
+
   private
 
   def invite_members_url(form_model)