diff --git a/app/components/account/verify_account_component.html.erb b/app/components/account/verify_account_component.html.erb index 3de7bee3d..bcd6c1880 100644 --- a/app/components/account/verify_account_component.html.erb +++ b/app/components/account/verify_account_component.html.erb @@ -1,22 +1,18 @@ -
-

- <%= t("account.show.user_permission_verify") %> -

+
+ <% if account.level_three_verified? %> +

+ + <%= t("account.show.verified_account") %> +

+ <% else %> +

+ <%= t("account.show.user_permission_verify") %> +

- <% unless account.organization? %> -
- -
+ <% if account.level_two_verified? %> + <%= link_to t("account.show.finish_verification"), verification_path, class: "button success" %> + <% else %> + <%= link_to t("account.show.verify_my_account"), verification_path, class: "button success" %> + <% end %> <% end %>
diff --git a/app/components/account/verify_account_component.rb b/app/components/account/verify_account_component.rb index 93a2bb7f1..c1aa09c26 100644 --- a/app/components/account/verify_account_component.rb +++ b/app/components/account/verify_account_component.rb @@ -4,4 +4,8 @@ class Account::VerifyAccountComponent < ApplicationComponent def initialize(account) @account = account end + + def render? + !account.organization? + end end diff --git a/spec/components/account/verify_account_component_spec.rb b/spec/components/account/verify_account_component_spec.rb index bb34e506a..a7921f716 100644 --- a/spec/components/account/verify_account_component_spec.rb +++ b/spec/components/account/verify_account_component_spec.rb @@ -24,7 +24,7 @@ describe Account::VerifyAccountComponent do render_inline Account::VerifyAccountComponent.new(account) - expect(page).to have_content "To perform all the actions verify your account." + expect(page).not_to have_content "To perform all the actions verify your account." expect(page).to have_content "Account verified" end @@ -33,9 +33,6 @@ describe Account::VerifyAccountComponent do render_inline Account::VerifyAccountComponent.new(account) - expect(page).to have_content "To perform all the actions verify your account." - expect(page).not_to have_link "Verify my account" - expect(page).not_to have_link "Complete verification" - expect(page).not_to have_content "Account verified" + expect(page).not_to be_rendered end end