diff --git a/app/views/accounts/connected_accounts/show.html.erb b/app/views/accounts/connected_accounts/show.html.erb index 51be9673146..88a96202814 100644 --- a/app/views/accounts/connected_accounts/show.html.erb +++ b/app/views/accounts/connected_accounts/show.html.erb @@ -1,3 +1,5 @@ +<% title t('account.navigation.connected_accounts') %> +

<%= t('headings.account.connected_accounts') %>

diff --git a/app/views/accounts/history/show.html.erb b/app/views/accounts/history/show.html.erb index 907c0034284..417dd771de4 100644 --- a/app/views/accounts/history/show.html.erb +++ b/app/views/accounts/history/show.html.erb @@ -1,3 +1,5 @@ +<% title t('account.navigation.history') %> +

<%= t('account.navigation.history') %>

diff --git a/app/views/accounts/two_factor_authentication/show.html.erb b/app/views/accounts/two_factor_authentication/show.html.erb index 3c0331d3163..e5619d0e7dd 100644 --- a/app/views/accounts/two_factor_authentication/show.html.erb +++ b/app/views/accounts/two_factor_authentication/show.html.erb @@ -1,3 +1,5 @@ +<% title t('account.navigation.two_factor_authentication') %> +

<%= t('headings.account.two_factor') %>

diff --git a/app/views/layouts/account_side_nav.html.erb b/app/views/layouts/account_side_nav.html.erb index d6fdeb764e9..fa190914634 100644 --- a/app/views/layouts/account_side_nav.html.erb +++ b/app/views/layouts/account_side_nav.html.erb @@ -2,6 +2,10 @@ <%= render 'accounts/nav_auth', enable_mobile_nav: true, greeting: @view_model.header_personalization %> <% end %> +<% content_for(:mobile_nav) do %> + <%= render 'accounts/mobile_nav' %> +<% end %> + <% content_for :content do %>
@@ -29,5 +33,4 @@
<% end %> -<%= render 'accounts/mobile_nav' %> <%= render template: 'layouts/base', locals: { disable_card: true } %> diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb index e3dbbc06620..b6f3f8566b3 100644 --- a/app/views/layouts/base.html.erb +++ b/app/views/layouts/base.html.erb @@ -54,6 +54,8 @@ +
+ <%= yield(:mobile_nav) if content_for?(:mobile_nav) %>
<%= render 'shared/banner' %>
diff --git a/spec/views/accounts/_nav_auth.html.erb_spec.rb b/spec/views/accounts/_nav_auth.html.erb_spec.rb index 5a9b44adbd7..31b9900346e 100644 --- a/spec/views/accounts/_nav_auth.html.erb_spec.rb +++ b/spec/views/accounts/_nav_auth.html.erb_spec.rb @@ -1,9 +1,12 @@ require 'rails_helper' describe 'accounts/_nav_auth.html.erb' do + include Devise::Test::ControllerHelpers + before do - @user = build_stubbed(:user, :signed_up) + @user = build_stubbed(:user, :with_backup_code) allow(view).to receive(:greeting).and_return(@user.email) + allow(view).to receive(:current_user).and_return(@user) end context 'user is signed in' do