diff --git a/app/controllers/admin/partners_controller.rb b/app/controllers/admin/partners_controller.rb
index f494ce6e67..75f685c041 100644
--- a/app/controllers/admin/partners_controller.rb
+++ b/app/controllers/admin/partners_controller.rb
@@ -13,10 +13,11 @@ def edit
 
   def update
     @partner = Partner.find(params[:id])
-    if @partner.update(partner_attributes)
+    partner_update_service = PartnerUpdateService.new(@partner, partner_attributes)
+    if partner_update_service.call
       redirect_to admin_partners_path, notice: "#{@partner.name} updated!"
     else
-      flash.now[:error] = "Something didn't work quite right -- try again?"
+      flash.now[:error] = partner_update_service.error
       render action: :edit
     end
   end
diff --git a/app/models/partner.rb b/app/models/partner.rb
index ceb52556b1..6fda6defea 100644
--- a/app/models/partner.rb
+++ b/app/models/partner.rb
@@ -48,7 +48,7 @@ class Partner < ApplicationRecord
 
   has_many_attached :documents
 
-  validates :name, presence: true, uniqueness: { scope: :organization }
+  # validates :name, presence: true, uniqueness: { scope: :organization }
 
   validates :email, presence: true, uniqueness: { case_sensitive: false }, format: { with: URI::MailTo::EMAIL_REGEXP }
 
diff --git a/app/models/partners/profile.rb b/app/models/partners/profile.rb
index 2d58b93f10..c37de4d7b3 100644
--- a/app/models/partners/profile.rb
+++ b/app/models/partners/profile.rb
@@ -135,8 +135,6 @@ class Profile < Base
       twoycollege: "2YCOLLEGE",
       wic: "WIC"
 
-    validate :check_social_media, on: :edit
-
     validate :client_share_is_0_or_100
     validate :has_at_least_one_request_setting
     validate :pick_up_email_addresses
@@ -193,17 +191,42 @@ def self.agency_types_for_selection
       agency_types.keys.map(&:to_sym).sort_by { |sym| I18n.t(sym, scope: :partners_profile) }.partition { |v| v != :other }.flatten
     end
 
-    private
-
     def check_social_media
+      return if organization.one_step_partner_invite
       return if website.present? || twitter.present? || facebook.present? || instagram.present?
       return if partner.partials_to_show.exclude?("media_information")
 
       unless no_social_media_presence
-        errors.add(:no_social_media_presence, "must be checked if you have not provided any of Website, Twitter, Facebook, or Instagram.")
+        errors.add(:no_social_media_presence, "No social media presence must be checked if you have not provided any of Website, Twitter, Facebook, or Instagram.")
+      end
+      errors
+    end
+
+    def check_mandatory_fields
+      return if organization.one_step_partner_invite
+
+      mandatory_fields = [
+        :agency_type,
+        :address1,
+        :city,
+        :state,
+        :zip_code,
+        :program_name,
+        :program_description
+      ]
+      messages = []
+      messages << "Name can't be blank" if partner.name.blank?
+      mandatory_fields.each do |field|
+        if send(field).blank?
+          messages << "#{field.to_s.humanize.capitalize} can't be blank"
+        end
       end
+      errors.add(:base, messages.join(", ")) if messages.any?
+      errors
     end
 
+    private
+
     def client_share_is_0_or_100
       # business logic:  the client share has to be 0 or 100 -- although it is an estimate only,  making it 0 (not
       # specified at all) or 100 means we won't have people overallocating (> 100) and that they think about what
diff --git a/app/services/partner_profile_update_service.rb b/app/services/partner_profile_update_service.rb
index 88bbb04125..51f0783d29 100644
--- a/app/services/partner_profile_update_service.rb
+++ b/app/services/partner_profile_update_service.rb
@@ -10,18 +10,13 @@ def initialize(old_partner, new_partner_params, new_profile_params)
   end
 
   def call
-    @return_value = false
+    return self unless validation
+
     perform_profile_service do
       @partner.update(@partner_params)
-      @return_value = @partner.valid?
-
-      if @return_value
-        @profile.served_areas.destroy_all
-        @profile.attributes = @profile_params
-        @profile.save!(context: :edit)
-      else
-        @error = "Partner '#{@partner.name}' had error(s) preventing the profile from being updated: #{@partner.errors.full_messages.join(", ")}"
-      end
+      @profile.served_areas.destroy_all
+      @profile.attributes = @profile_params
+      @profile.save!(context: :edit)
     end
   end
 
@@ -48,4 +43,31 @@ def success?
   def set_error(error)
     @error = error.to_s
   end
+
+  private
+
+  def validation
+    return true unless %w[awaiting_review approved].include?(@partner.status)
+    return true if @partner.organization.one_step_partner_invite
+
+    check_social_media
+    check_mandatory_fields
+    @error.nil?
+  end
+
+  def check_mandatory_fields
+    mandatory_fields = %i[agency_type address1 city state zip_code program_name program_description]
+    missing_fields = mandatory_fields.select { |field| @profile_params[field].blank? }
+    missing_fields.prepend :agency_name if @partner_params[:name].blank?
+    if missing_fields.any?
+      @error = "Missing mandatory fields: #{missing_fields.join(', ')}"
+    end
+  end
+
+  def check_social_media
+    social_media_fields = %i[website facebook twitter instagram]
+    if social_media_fields.all? { |field| @profile_params[field].blank? } && @profile_params[:no_social_media_presence] == '0'
+      @error = "At least one social media field must be filled out or 'No social media presence' must be checked."
+    end
+  end
 end
diff --git a/app/services/partner_update_service.rb b/app/services/partner_update_service.rb
new file mode 100644
index 0000000000..43b1507700
--- /dev/null
+++ b/app/services/partner_update_service.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class PartnerUpdateService
+  attr_accessor :partner, :params, :error
+
+  def initialize(partner, params)
+    @partner = partner
+    @params = params
+  end
+
+  def call
+    return false unless validation
+
+    if partner.update(params)
+      true
+    else
+      @error = partner.errors.full_messages.join(", ")
+      false
+    end
+  end
+
+  private
+
+  def validation
+    mandatory_fields = %i[name]
+    missing_fields = mandatory_fields.select { |field| params[field].blank? }
+    if missing_fields.any?
+      @error = "Missing mandatory fields: #{missing_fields.join(', ')}"
+      return false
+    end
+    true
+  end
+end
diff --git a/app/services/partners/request_approval_service.rb b/app/services/partners/request_approval_service.rb
index 8d74bd77f0..6f3c0e432d 100644
--- a/app/services/partners/request_approval_service.rb
+++ b/app/services/partners/request_approval_service.rb
@@ -33,6 +33,9 @@ def valid?
         errors.add :base, partner.profile.errors.full_messages.join('. ')
       end
 
+      errors.merge! partner.profile.errors if partner.profile.check_social_media
+      errors.merge! partner.profile.errors if partner.profile.check_mandatory_fields
+
       errors.none?
     end
   end
diff --git a/app/views/partners/profiles/edit/_agency_information.html.erb b/app/views/partners/profiles/edit/_agency_information.html.erb
index ce8e4c5ee3..2498eba786 100644
--- a/app/views/partners/profiles/edit/_agency_information.html.erb
+++ b/app/views/partners/profiles/edit/_agency_information.html.erb
@@ -2,7 +2,7 @@
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-12">
-        <div class="card">
+        <div id="agency_information" class="card">
           <div class="card-header bg-white">
             <h3 class="card-title"><strong>Agency Information</strong></h3>
           </div>
diff --git a/spec/requests/partners/profiles_requests_spec.rb b/spec/requests/partners/profiles_requests_spec.rb
index f4fd5d7ef7..45af1c91ed 100644
--- a/spec/requests/partners/profiles_requests_spec.rb
+++ b/spec/requests/partners/profiles_requests_spec.rb
@@ -100,11 +100,34 @@
     end
 
     context "with no social media" do
+      before do
+        partner.awaiting_review!
+      end
+      let(:params) do
+        {
+          partner: {
+            name: "Partnerdude", profile: {
+              no_social_media_presence: '0',
+              website: "",
+              twitter: "",
+              facebook: "",
+              instagram: "",
+              agency_type: 'OTHER',
+              address1: '123 Main St',
+              city: 'Anytown',
+              state: 'CA',
+              zip_code: '12345',
+              program_name: 'Test Program',
+              program_description: 'Test Description'
+            }
+          }
+        }
+      end
+
       it "shows an error" do
-        put partners_profile_path(partner,
-          partner: {name: "Partnerdude", profile: {no_social_media_presence: false}})
+        put partners_profile_path(partner, params)
         expect(response).not_to redirect_to(anything)
-        expect(response.body).to include("No social media presence must be checked if you have not provided any of Website, Twitter, Facebook, or Instagram.")
+        expect(response.body).to include("At least one social media field must be filled out or 'No social media presence' must be checked")
       end
     end
 
diff --git a/spec/system/partner_system_spec.rb b/spec/system/partner_system_spec.rb
index ff0d6ad839..9ff8732f9c 100644
--- a/spec/system/partner_system_spec.rb
+++ b/spec/system/partner_system_spec.rb
@@ -93,7 +93,7 @@
 
           click_on 'New Partner Agency'
 
-          fill_in 'Name *', with: partner_attributes[:name]
+          fill_in 'Name', with: partner_attributes[:name]
           fill_in 'E-mail *', with: partner_attributes[:email]
           fill_in 'Quota', with: partner_attributes[:quota]
           fill_in 'Notes', with: partner_attributes[:notes]
@@ -125,7 +125,7 @@
           assert page.has_content? "Partner Agencies for #{organization.name}"
           click_on 'New Partner Agency'
 
-          fill_in 'Name *', with: partner_attributes[:name]
+          fill_in 'Name', with: partner_attributes[:name]
 
           find('button', text: 'Add Partner Agency').click
         end
@@ -384,14 +384,6 @@
         expect(partner.name).to eq(name)
       end
 
-      it "prevents a user from updating a partner with empty name" do
-        visit subject
-        fill_in "Name", with: ""
-        click_button "Update Partner"
-
-        expect(page.find(".alert")).to have_content "Something didn't work quite right -- try again?"
-      end
-
       it "User can uncheck send_reminders" do
         visit subject
         uncheck 'send_reminders'
@@ -458,12 +450,11 @@
 
     describe "#edit_profile" do
       let!(:partner) { create(:partner, name: "Frank") }
-      subject { edit_profile_path(partner.id) }
 
       context "when step-wise editing is enabled" do
         before do
           Flipper.enable(:partner_step_form)
-          visit subject
+          visit edit_profile_path(partner.id)
         end
 
         it "displays all sections in a closed state by default" do
@@ -531,12 +522,10 @@
 
           # Expect an alert-danger message containing validation errors
           expect(page).to have_css(".alert-danger", text: /There is a problem/)
-          expect(page).to have_content("No social media presence must be checked if you have not provided any of Website, Twitter, Facebook, or Instagram.")
           expect(page).to have_content("Enable child based requests At least one request type must be set")
           expect(page).to have_content("Pick up email can't have more than three email addresses")
 
           # Expect media section, pick up person section, and partner settings section to be opened
-          expect(page).to have_css("#media_information.accordion-collapse.collapse.show", visible: true)
           expect(page).to have_css("#pick_up_person.accordion-collapse.collapse.show", visible: true)
           expect(page).to have_css("#partner_settings.accordion-collapse.collapse.show", visible: true)
 
@@ -545,15 +534,172 @@
 
           # Expect an alert-danger message containing validation errors
           expect(page).to have_css(".alert-danger", text: /There is a problem/)
-          expect(page).to have_content("No social media presence must be checked if you have not provided any of Website, Twitter, Facebook, or Instagram.")
           expect(page).to have_content("Enable child based requests At least one request type must be set")
           expect(page).to have_content("Pick up email can't have more than three email addresses")
 
           # Expect media section, pick up person section, and partner settings section to be opened
-          expect(page).to have_css("#media_information.accordion-collapse.collapse.show", visible: true)
           expect(page).to have_css("#pick_up_person.accordion-collapse.collapse.show", visible: true)
           expect(page).to have_css("#partner_settings.accordion-collapse.collapse.show", visible: true)
         end
+
+        context "Mandatory fields validation" do
+          subject { all("input[type='submit'][value='Save Progress']").last.click }
+
+          before do
+            find("button[data-bs-target='#agency_information']").click
+            within "#agency_information" do
+              fill_in "Agency Name", with: "Agency1"
+              select "Basic Needs Bank", from: "Agency Type"
+              fill_in "Address (line 1)", with: "123 Main St"
+              fill_in "City", with: "Metropolis"
+              fill_in "State", with: "CA"
+              fill_in "Zip Code", with: "90210"
+            end
+            find("button[data-bs-target='#agency_stability']").click
+            within "#agency_stability" do
+              fill_in "Program Name(s)", with: "Program 1"
+              fill_in "Program Description(s)", with: "Really great program"
+            end
+          end
+
+          context "No social media filled" do
+            before do
+              find("button[data-bs-target='#media_information']").click
+              within "#media_information" do
+                fill_in "Website", with: ""
+                uncheck "No Social Media Presence"
+              end
+            end
+
+            context "partner status is invited" do
+              before do
+                partner.invited!
+              end
+
+              it "displays success message" do
+                expect {
+                  subject
+                }.to change { partner.reload.updated_at }
+
+                expect(page).to have_content("Details were successfully updated.")
+              end
+            end
+
+            context "partner status is awaiting_review" do
+              before do
+                partner.awaiting_review!
+              end
+
+              it "displays validation errors" do
+                expect {
+                  subject
+                }.not_to change { partner.reload.updated_at }
+                expect(page).to have_content("At least one social media field must be filled out or 'No social media presence' must be checked.")
+              end
+            end
+
+            context "partner status is approved" do
+              before do
+                partner.approved!
+              end
+
+              it "displays validation errors" do
+                expect {
+                  subject
+                }.not_to change { partner.reload.updated_at }
+
+                expect(page).to have_content("At least one social media field must be filled out or 'No social media presence' must be checked.")
+              end
+
+              context "partner's organization one_step_partner_invite is true" do
+                before do
+                  partner.organization.update!(one_step_partner_invite: true)
+                end
+
+                it "displays success message" do
+                  expect {
+                    subject
+                  }.to change { partner.reload.updated_at }
+
+                  expect(page).to have_content("Details were successfully updated.")
+                end
+              end
+            end
+          end
+
+          context "Mandatory fields empty" do
+            before do
+              # find("button[data-bs-target='#agency_information']").click
+              within "#agency_information" do
+                fill_in "Agency Name", with: ""
+                select "", from: "Agency Type"
+                fill_in "Address (line 1)", with: ""
+                fill_in "City", with: ""
+                fill_in "State", with: ""
+                fill_in "Zip Code", with: ""
+              end
+              # find("button[data-bs-target='#agency_stability']").click
+              within "#agency_stability" do
+                fill_in "Program Name(s)", with: ""
+                fill_in "Program Description(s)", with: ""
+              end
+            end
+            context "partner status is invited" do
+              before do
+                partner.invited!
+              end
+
+              it "displays success message" do
+                expect {
+                  subject
+                }.to change { partner.reload.updated_at }
+
+                expect(page).to have_content("Details were successfully updated.")
+              end
+            end
+
+            context "partner status is awaiting_review" do
+              before do
+                partner.awaiting_review!
+              end
+
+              it "displays validation errors" do
+                expect {
+                  subject
+                }.not_to change { partner.reload.updated_at }
+                expect(page).to have_content("Missing mandatory fields: agency_name, agency_type, address1, city, state, zip_code, program_name, program_description")
+              end
+            end
+
+            context "partner status is approved" do
+              before do
+                partner.approved!
+              end
+
+              it "displays validation errors" do
+                expect {
+                  subject
+                }.not_to change { partner.reload.updated_at }
+
+                expect(page).to have_content("Missing mandatory fields: agency_name, agency_type, address1, city, state, zip_code, program_name, program_description")
+              end
+
+              context "partner's organization one_step_partner_invite is true" do
+                before do
+                  partner.organization.update!(one_step_partner_invite: true)
+                end
+
+                it "displays success message" do
+                  expect {
+                    subject
+                  }.to change { partner.reload.updated_at }
+
+                  expect(page).to have_content("Details were successfully updated.")
+                end
+              end
+            end
+          end
+        end
       end
     end
 
diff --git a/spec/system/partners/approval_process_spec.rb b/spec/system/partners/approval_process_spec.rb
index 4b4f6305e7..ff6ef51e03 100644
--- a/spec/system/partners/approval_process_spec.rb
+++ b/spec/system/partners/approval_process_spec.rb
@@ -35,7 +35,16 @@
         fill_in 'Executive Director Phone', with: '8889990000'
         fill_in 'Executive Director Email', with: 'lorem@example.com'
         fill_in 'Primary Contact Phone', with: '8889990000'
+        select "Basic Needs Bank", from: "Agency Type"
+        within "#agency_information" do
+          fill_in 'Address (line 1)', with: '1234 Main St'
+          fill_in 'City', with: 'Anytown'
+          fill_in 'State', with: 'CA'
+          fill_in 'Zip', with: '12345'
+        end
         check 'No Social Media Presence'
+        fill_in 'Program Name(s)', with: 'Test Program'
+        fill_in 'Program Description', with: 'This is a test program description.'
 
         click_on 'Update Information'
         assert page.has_content? 'Details were successfully updated.'
@@ -59,7 +68,16 @@
           fill_in 'Executive Director Name', with: 'Lorem'
           fill_in 'Executive Director Phone', with: '8889990000'
           fill_in 'Executive Director Email', with: 'lorem@example.com'
+          within "#agency_information" do
+            fill_in 'Address (line 1)', with: '1234 Main St'
+            fill_in 'City', with: 'Anytown'
+            fill_in 'State', with: 'CA'
+            fill_in 'Zip', with: '12345'
+          end
           fill_in 'Primary Contact Phone', with: '8889990000'
+          select "Basic Needs Bank", from: "Agency Type"
+          fill_in 'Program Name(s)', with: 'Test Program'
+          fill_in 'Program Description', with: 'This is a test program description.'
           check 'No Social Media Presence'
 
           click_on 'Update Information'
@@ -97,15 +115,83 @@
     let(:partner) { FactoryBot.create(:partner) }
 
     before do
-      partner.profile.update(website: '', facebook: '', twitter: '', instagram: '', no_social_media_presence: false)
       login_as(partner_user)
       visit partner_user_root_path
       click_on 'My Profile'
-      all('button', text: 'Submit for Approval').last.click
     end
 
-    it "should render an error message", :aggregate_failures do
-      assert page.has_content? 'No social media presence must be checked if you have not provided any of Website, Twitter, Facebook, or Instagram.'
+    subject { all('button', text: 'Submit for Approval').last.click }
+
+    context "Social media information is absent" do
+      before do
+        partner.profile.update(website: '', facebook: '', twitter: '', instagram: '', no_social_media_presence: false)
+      end
+
+      context "partner status is invited" do
+        before do
+          partner.update(status: :invited)
+        end
+
+        it "should render an error message", :aggregate_failures do
+          subject
+          assert page.has_content? 'No social media presence must be checked if you have not provided any of Website, Twitter, Facebook, or Instagram.'
+        end
+
+        context "partner's organization one_step_partner_invite is true" do
+          before do
+            partner.organization.update(one_step_partner_invite: true)
+          end
+
+          it "should render an error message about social media presence only", :aggregate_failures do
+            subject
+            assert page.has_content? 'You have submitted your details for approval.'
+          end
+        end
+      end
+
+      context "partner status is awaiting_review" do
+        before do
+          partner.update(status: :awaiting_review)
+        end
+
+        it "should render an error message", :aggregate_failures do
+          subject
+          assert page.has_content? 'This partner has already requested approval.'
+        end
+      end
+    end
+
+    context "Mandatory fields are empty" do
+      before do
+        partner.update(name: '')
+        partner.profile.update(
+          agency_type: '',
+          address1: '',
+          city: '',
+          state: '',
+          zip_code: '',
+          program_name: '',
+          program_description: ''
+        )
+      end
+
+      context "partner status is invited" do
+        before do
+          partner.update(status: :invited)
+        end
+
+        it "should render error messages for each missing field", :aggregate_failures do
+          subject
+          assert page.has_content? "Name can't be blank"
+          assert page.has_content? "Agency type can't be blank"
+          assert page.has_content? "Address1 can't be blank"
+          assert page.has_content? "City can't be blank"
+          assert page.has_content? "State can't be blank"
+          assert page.has_content? "Zip code can't be blank"
+          assert page.has_content? "Program name can't be blank"
+          assert page.has_content? "Program description can't be blank"
+        end
+      end
     end
   end
 end
diff --git a/spec/system/partners/profile_edit_system_spec.rb b/spec/system/partners/profile_edit_system_spec.rb
index 9fbb487aa7..507b1e779c 100644
--- a/spec/system/partners/profile_edit_system_spec.rb
+++ b/spec/system/partners/profile_edit_system_spec.rb
@@ -50,13 +50,6 @@
     end
 
     it "displays the edit view with sections containing validation errors expanded" do
-      # Open up Media section and clear out website value
-      find("button[data-bs-target='#media_information']").click
-      within "#media_information" do
-        fill_in "Website", with: ""
-        uncheck "No Social Media Presence"
-      end
-
       # Open Pick up person section and fill in 4 email addresses
       find("button[data-bs-target='#pick_up_person']").click
       within "#pick_up_person" do
@@ -76,12 +69,10 @@
 
       # Expect an alert-danger message containing validation errors
       expect(page).to have_css(".alert-danger", text: /There is a problem/)
-      expect(page).to have_content("No social media presence must be checked if you have not provided any of Website, Twitter, Facebook, or Instagram.")
       expect(page).to have_content("Enable child based requests At least one request type must be set")
       expect(page).to have_content("Pick up email can't have more than three email addresses")
 
-      # Expect media section, pick up person section, and partner settings section to be opened
-      expect(page).to have_css("#media_information.accordion-collapse.collapse.show", visible: true)
+      # Expect pick up person section, and partner settings section to be opened
       expect(page).to have_css("#pick_up_person.accordion-collapse.collapse.show", visible: true)
       expect(page).to have_css("#partner_settings.accordion-collapse.collapse.show", visible: true)
 
@@ -90,12 +81,10 @@
 
       # Expect an alert-danger message containing validation errors
       expect(page).to have_css(".alert-danger", text: /There is a problem/)
-      expect(page).to have_content("No social media presence must be checked if you have not provided any of Website, Twitter, Facebook, or Instagram.")
       expect(page).to have_content("Enable child based requests At least one request type must be set")
       expect(page).to have_content("Pick up email can't have more than three email addresses")
 
-      # Expect media section, pick up person section, and partner settings section to be opened
-      expect(page).to have_css("#media_information.accordion-collapse.collapse.show", visible: true)
+      # Expect pick up person section, and partner settings section to be opened
       expect(page).to have_css("#pick_up_person.accordion-collapse.collapse.show", visible: true)
       expect(page).to have_css("#partner_settings.accordion-collapse.collapse.show", visible: true)
     end
@@ -303,5 +292,164 @@
         expect(page).to have_link("document2.md")
       end
     end
+
+    context "Mandatory fields validation" do
+      subject { all("input[type='submit'][value='Save Progress']").last.click }
+
+      before do
+        find("button[data-bs-target='#agency_information']").click
+        within "#agency_information" do
+          fill_in "Agency Name", with: "Agency1"
+          select "Basic Needs Bank", from: "Agency Type"
+          fill_in "Address (line 1)", with: "123 Main St"
+          fill_in "City", with: "Metropolis"
+          fill_in "State", with: "CA"
+          fill_in "Zip Code", with: "90210"
+        end
+        find("button[data-bs-target='#agency_stability']").click
+        within "#agency_stability" do
+          fill_in "Program Name(s)", with: "Program 1"
+          fill_in "Program Description(s)", with: "Really great program"
+        end
+      end
+
+      context "No social media filled" do
+        before do
+          find("button[data-bs-target='#media_information']").click
+          within "#media_information" do
+            fill_in "Website", with: ""
+            uncheck "No Social Media Presence"
+          end
+        end
+
+        context "partner status is invited" do
+          before do
+            partner1.invited!
+          end
+
+          it "displays success message" do
+            expect {
+              subject
+            }.to change { partner1.reload.updated_at }
+
+            expect(page).to have_content("Details were successfully updated.")
+          end
+        end
+
+        context "partner status is awaiting_review" do
+          before do
+            partner1.awaiting_review!
+          end
+
+          it "displays validation errors" do
+            expect {
+              subject
+            }.not_to change { partner1.reload.updated_at }
+
+            expect(page).to have_content("At least one social media field must be filled out or 'No social media presence' must be checked.")
+          end
+        end
+
+        context "partner status is approved" do
+          before do
+            partner1.approved!
+          end
+
+          it "displays validation errors" do
+            expect {
+              subject
+            }.not_to change { partner1.reload.updated_at }
+
+            expect(page).to have_content("At least one social media field must be filled out or 'No social media presence' must be checked.")
+          end
+
+          context "partner's organization one_step_partner_invite is true" do
+            before do
+              partner1.organization.update!(one_step_partner_invite: true)
+            end
+
+            it "displays success message" do
+              expect {
+                subject
+              }.to change { partner1.reload.updated_at }
+
+              expect(page).to have_content("Details were successfully updated.")
+            end
+          end
+        end
+      end
+
+      context "Mandatory fields empty" do
+        before do
+          # find("button[data-bs-target='#agency_information']").click
+          within "#agency_information" do
+            fill_in "Agency Name", with: ""
+            select "", from: "Agency Type"
+            fill_in "Address (line 1)", with: ""
+            fill_in "City", with: ""
+            fill_in "State", with: ""
+            fill_in "Zip Code", with: ""
+          end
+          # find("button[data-bs-target='#agency_stability']").click
+          within "#agency_stability" do
+            fill_in "Program Name(s)", with: ""
+            fill_in "Program Description(s)", with: ""
+          end
+        end
+        context "partner status is invited" do
+          before do
+            partner1.invited!
+          end
+
+          it "displays success message" do
+            expect {
+              subject
+            }.to change { partner1.reload.updated_at }
+
+            expect(page).to have_content("Details were successfully updated.")
+          end
+        end
+
+        context "partner status is awaiting_review" do
+          before do
+            partner1.awaiting_review!
+          end
+
+          it "displays validation errors" do
+            expect {
+              subject
+            }.not_to change { partner1.reload.updated_at }
+            expect(page).to have_content("Missing mandatory fields: agency_name, agency_type, address1, city, state, zip_code, program_name, program_description")
+          end
+        end
+
+        context "partner status is approved" do
+          before do
+            partner1.approved!
+          end
+
+          it "displays validation errors" do
+            expect {
+              subject
+            }.not_to change { partner1.reload.updated_at }
+            expect(page).to have_content("Missing mandatory fields: agency_name, agency_type, address1, city, state, zip_code, program_name, program_description")
+          end
+
+          context "partner's organization one_step_partner_invite is true" do
+            before do
+              partner1.organization.update!(one_step_partner_invite: true)
+            end
+
+            it "displays success message" do
+              expect {
+                subject
+              }.to change { partner1.reload.updated_at }
+
+              expect(page).to have_content("Details were successfully updated.")
+            end
+          end
+        end
+      end
+    end
   end
 end