Fix merge conflicts pt 2

src/registrar/context_processors.py

@@ -39,14 +39,6 @@ def is_production(request):
     return {"IS_PRODUCTION": settings.IS_PRODUCTION}
 
 
-def add_path_to_context(request):
-    return {"path": getattr(request, "path", None)}
-
-
-def add_has_profile_feature_flag_to_context(request):
-    return {"has_profile_feature_flag": flag_is_active(request, "profile_feature")}
-
-
 def org_user_status(request):
     if request.user.is_authenticated:
         is_org_user = request.user.is_org_user(request)
@@ -73,6 +65,7 @@ def portfolio_permissions(request):
             "has_base_portfolio_permission": request.user.has_base_portfolio_permission(),
             "has_domains_portfolio_permission": request.user.has_domains_portfolio_permission(),
             "has_domain_requests_portfolio_permission": request.user.has_domain_requests_portfolio_permission(),
+            "portfolio": request.user.portfolio,
             "has_organization_feature_flag": flag_is_active(request, "organization_feature"),
         }
     except AttributeError:

src/registrar/templates/includes/domains_table.html

@@ -2,7 +2,7 @@
 
 <section class="section--outlined domains{% if portfolio is not None %} margin-top-0{% endif %}" id="domains">
   <div class="section--outlined__header margin-bottom-3 {% if portfolio is None %} section--outlined__header--no-portfolio justify-content-space-between{% else %} grid-row{% endif %}">
-      {% if not portfolio %}
+      {% if portfolio is None %}
         <h2 id="domains-header" class="display-inline-block">Domains</h2>
         <span class="display-none" id="no-portfolio-js-flag"></span>
       {% else %}