From e51ce0819226beaa3e6a862ef08bda033d08cedd Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Thu, 1 Dec 2022 16:44:20 +1100
Subject: [PATCH 01/18] Universal nav initial implementation

---
 .../tc/view/pacts/client/PaymentHistory.jsp   | 54 ++++++++++++++++---
 1 file changed, 46 insertions(+), 8 deletions(-)
diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
index 0a4dd42863..d1c41071d9 100755
--- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
+++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
@@ -38,6 +38,10 @@
 <c:set var="cr" value="<%= request.getAttribute(PaymentHistory.CODER) %>"/>
 <c:set var="paymentConfirmationTemplate" value="<%= request.getAttribute(PaymentHistory.PAYMENT_CONFIRMATION_TEMPLATE) %>"/>
 <c:set var="userPaymentMethod" value="<%= request.getAttribute(PaymentHistory.USER_PAYMENT_METHOD) %>"/>
+<c:set var="userHandle" value="<%= sessionInfo.getHandle() %>"/>
+<c:set var="userId" value="<%= sessionInfo.getUserId() %>"/>
+<c:set var="userImagePath" value="<%= sessionInfo.getImagePath() %>"/>
+<c:set var="userInitials" value="<%= sessionInfo.getHandle() %>"/>
 
 <c:set value="<%=PaymentHistory.DEFAULTS_KEY%>" var="defaults"/>
 <c:set value="<%=PaymentHistory.PAYMENT_ID%>" var="PAYMENT_ID"/>
@@ -77,6 +81,47 @@
   <jsp:param name="key" value="tc_stats"/>
   <jsp:param name="reskin" value="${isReskin ? 'paymentHistory' : ''}"/>
 </jsp:include>
+    <div id="headerNav"></div>
+    <script>
+        var currEnv = '<%=ApplicationServer.ENVIRONMENT%>';
+        var prodEnv = '<%=ApplicationServer.PROD%>'
+        var scriptURL = '//uni-nav.topcoder-dev.com/v1/tc-universal-nav.js';
+
+        if (currEnv === prodEnv) {
+            scriptURL = '//uni-nav.topcoder.com/v1/tc-universal-nav-1.js';
+        }
+
+        !function(n,t,e,a,c,i,o){n['TcUnivNavConfig']=c,n[c]=n[c]||function(){
+        (n[c].q=n[c].q??[]).push(arguments)},n[c].l=1*new Date();i=t.createElement(e),
+        o=t.getElementsByTagName(e)[0];i.async=1;i.type="module";i.src=a;o.parentNode.insertBefore(i,o)
+        }(window,document,"script",scriptURL,"tcUniNav");
+
+        var photoUrl = 'https://<%=ApplicationServer.SERVER_NAME%>' + '${userImagePath}';
+        var userId = ${userId};
+        var handle = '${userHandle}';
+        var initials = handle ? handle.substr(0, 2).toUpperCase() : '';
+
+        var user = {
+            photoUrl,
+            userId,
+            initials,
+            handle
+        };
+
+        tcUniNav('init', 'headerNav', {
+            type: 'tool',
+            toolName: 'Topcoder Payments',
+            user,
+            signOut() {
+                window.location.replace("http://<%=ApplicationServer.SERVER_NAME%>/tc?module=Logout")
+            }
+        });
+
+        tcUniNav('init', 'footerNav', {
+            type: 'footer',
+        })
+
+    </script>
 
     <script type="text/javascript">
         USER_PAYMENT_METHOD = ${userPaymentMethod eq null ? 'null' : userPaymentMethod};
@@ -186,11 +231,6 @@
 </head>
 <body>
 
-<jsp:include page="../../top.jsp" >
-    <jsp:param name="level1" value=""/>
-    <jsp:param name="isReskin" value="${isReskin}"/>
-</jsp:include>
-
 <c:if test="${isReskin}">
 <div class="page">
 </c:if>
@@ -836,9 +876,7 @@
 </div><!-- // end .page -->
 </c:if>
 
-<jsp:include page="/foot.jsp" >
-    <jsp:param name="isReskin" value="${isReskin}"/>
-</jsp:include>
+<div id="footerNav"></div>
 
 <c:if test="${isReskin}">
 <div class="modal payment-confirm-modal" id="payment-confirm-modal-id">

From 3477d04cfbb4fc44bd6e84e4347055bdc10443a8 Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Fri, 2 Dec 2022 12:56:26 +1100
Subject: [PATCH 02/18] Add universal-nav branch to deployment

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f43c2eb735..88f2b3aab9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -106,7 +106,7 @@ workflows:
             - Hold [TC-Website-Build-Deploy]       
           filters:
             branches:
-              only: [dev, reskin-payment]
+              only: [dev, reskin-payment, universal-nav]
       - build-prod:
           context : org-global   
           requires:

From 206694c072e7ccbafbb854479578dbbc8e3480cc Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Fri, 2 Dec 2022 15:43:16 +1100
Subject: [PATCH 03/18] Force dev path

---
 .../topcoder/web/tc/view/pacts/client/PaymentHistory.jsp   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
index 6d00b89296..8b73e320ea 100755
--- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
+++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
@@ -87,9 +87,10 @@
         var prodEnv = '<%=ApplicationServer.PROD%>'
         var scriptURL = '//uni-nav.topcoder-dev.com/v1/tc-universal-nav.js';
 
-        if (currEnv === prodEnv) {
-            scriptURL = '//uni-nav.topcoder.com/v1/tc-universal-nav-1.js';
-        }
+        //TODO - fix this check.  It's not working in dev, as far as I can tell.
+        /*if (currEnv === prodEnv) {
+            scriptURL = '//uni-nav.topcoder.com/v1/tc-universal-nav.js';
+        }*/
 
         !function(n,t,e,a,c,i,o){n['TcUnivNavConfig']=c,n[c]=n[c]||function(){
         (n[c].q=n[c].q??[]).push(arguments)},n[c].l=1*new Date();i=t.createElement(e),

From ea08199e007466c90ac163383b6077320321a7a3 Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Tue, 6 Dec 2022 06:59:27 +1100
Subject: [PATCH 04/18] Final review fixes

https://github.com/topcoder-platform/tc-website/issues/67
https://github.com/topcoder-platform/tc-website/issues/65
https://github.com/topcoder-platform/tc-website/issues/66
---
 .../web/tc/view/pacts/client/PaymentHistory.jsp   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
index 8b73e320ea..ca3870cf4d 100755
--- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
+++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
@@ -83,21 +83,21 @@
 </jsp:include>
     <div id="headerNav"></div>
     <script>
-        var currEnv = '<%=ApplicationServer.ENVIRONMENT%>';
-        var prodEnv = '<%=ApplicationServer.PROD%>'
+        var serverName = '<%=ApplicationServer.SERVER_NAME%>';
+        var prodUrl = 'topcoder.com';
         var scriptURL = '//uni-nav.topcoder-dev.com/v1/tc-universal-nav.js';
 
-        //TODO - fix this check.  It's not working in dev, as far as I can tell.
-        /*if (currEnv === prodEnv) {
+        if (serverName === prodUrl) {
             scriptURL = '//uni-nav.topcoder.com/v1/tc-universal-nav.js';
-        }*/
+        }
 
         !function(n,t,e,a,c,i,o){n['TcUnivNavConfig']=c,n[c]=n[c]||function(){
         (n[c].q=n[c].q??[]).push(arguments)},n[c].l=1*new Date();i=t.createElement(e),
         o=t.getElementsByTagName(e)[0];i.async=1;i.type="module";i.src=a;o.parentNode.insertBefore(i,o)
         }(window,document,"script",scriptURL,"tcUniNav");
 
-        var photoUrl = 'https://<%=ApplicationServer.SERVER_NAME%>' + '${userImagePath}';
+        var imagePath = '${userImagePath}';
+        var photoUrl = (imagePath && imagePath.length > 0) ? ('https://' + serverName + imagePath) : undefined;
         var userId = ${userId};
         var handle = '${userHandle}';
         var initials = handle ? handle.substr(0, 2).toUpperCase() : '';
@@ -113,8 +113,9 @@
             type: 'tool',
             toolName: 'Topcoder Payments',
             user,
+            toolRoot: '/PactsMemberServlet?module=PaymentHistory&full_list=true',
             signOut() {
-                window.location.replace("http://<%=ApplicationServer.SERVER_NAME%>/tc?module=Logout")
+                window.location.replace("http://" + serverName + "/tc?module=Logout");
             }
         });
 

From 4f382fb0b54da0fbf05b70d0a359fc849cf04683 Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Wed, 7 Dec 2022 07:58:19 +1100
Subject: [PATCH 05/18] Image fix

---
 .../topcoder/web/tc/view/pacts/client/PaymentHistory.jsp   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
index ca3870cf4d..9c9307c11b 100755
--- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
+++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
@@ -40,7 +40,6 @@
 <c:set var="userPaymentMethod" value="<%= request.getAttribute(PaymentHistory.USER_PAYMENT_METHOD) %>"/>
 <c:set var="userHandle" value="<%= sessionInfo.getHandle() %>"/>
 <c:set var="userId" value="<%= sessionInfo.getUserId() %>"/>
-<c:set var="userImagePath" value="<%= sessionInfo.getImagePath() %>"/>
 <c:set var="userInitials" value="<%= sessionInfo.getHandle() %>"/>
 
 <c:set value="<%=PaymentHistory.DEFAULTS_KEY%>" var="defaults"/>
@@ -96,8 +95,10 @@
         o=t.getElementsByTagName(e)[0];i.async=1;i.type="module";i.src=a;o.parentNode.insertBefore(i,o)
         }(window,document,"script",scriptURL,"tcUniNav");
 
-        var imagePath = '${userImagePath}';
-        var photoUrl = (imagePath && imagePath.length > 0) ? ('https://' + serverName + imagePath) : undefined;
+        var imagePath = '<%=sessionInfo.getImagePath()%>';
+
+        var photoUrl = (imagePath && imagePath.length > 0) ? ('https://' + serverName + '/' + imagePath) : undefined;
+
         var userId = ${userId};
         var handle = '${userHandle}';
         var initials = handle ? handle.substr(0, 2).toUpperCase() : '';

From 3eeea0055acf0b746810c60fb138a0f8c682f936 Mon Sep 17 00:00:00 2001
From: Gunasekar-K <Gunasekar.Kesavalu@wipro.com>
Date: Fri, 9 Dec 2022 18:55:38 +0530
Subject: [PATCH 06/18] Update config.yml

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 88f2b3aab9..9c8ea66794 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,7 +24,7 @@ install_dependency: &install_dependency
 install_deploysuite: &install_deploysuite
     name: Installation of install_deploysuite.
     command: |
-      git clone --branch v1.3 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+      git clone --branch hotfix_cert_error https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
       cp ./../buildscript/master_deploy.sh .
       cp ./../buildscript/buildenv.sh .
       cp ./../buildscript/awsconfiguration.sh .
@@ -106,7 +106,7 @@ workflows:
             - Hold [TC-Website-Build-Deploy]       
           filters:
             branches:
-              only: [dev, reskin-payment, universal-nav]
+              only: [dev, reskin-payment, universal-nav, ci-script-fix]
       - build-prod:
           context : org-global   
           requires:

From 25849c9938ecdcee7a806edbe6eb5e020f24bb44 Mon Sep 17 00:00:00 2001
From: Gunasekar-K <Gunasekar.Kesavalu@wipro.com>
Date: Fri, 9 Dec 2022 19:02:25 +0530
Subject: [PATCH 07/18] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9c8ea66794..fd3d20261f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,7 +24,7 @@ install_dependency: &install_dependency
 install_deploysuite: &install_deploysuite
     name: Installation of install_deploysuite.
     command: |
-      git clone --branch hotfix_cert_error https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+      git clone --branch v1.4.14 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
       cp ./../buildscript/master_deploy.sh .
       cp ./../buildscript/buildenv.sh .
       cp ./../buildscript/awsconfiguration.sh .

From c79c486f95f919339db947d0dc0a3174616e4712 Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Sun, 11 Dec 2022 07:39:26 +1100
Subject: [PATCH 08/18] Test better image path handling

---
 .../com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
index 9c9307c11b..cee4b3fbbd 100755
--- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
+++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
@@ -97,7 +97,7 @@
 
         var imagePath = '<%=sessionInfo.getImagePath()%>';
 
-        var photoUrl = (imagePath && imagePath.length > 0) ? ('https://' + serverName + '/' + imagePath) : undefined;
+        var photoUrl = imagePath;//(imagePath && imagePath.length > 0) ? ('https://' + serverName + '/' + imagePath) : undefined;
 
         var userId = ${userId};
         var handle = '${userHandle}';

From 2670f47c4cc6832d638263c8692e9c9a622fce69 Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Sun, 11 Dec 2022 07:48:28 +1100
Subject: [PATCH 09/18] Handle what appears to be PACTs being weird about user
 avatars

---
 .../topcoder/web/tc/view/pacts/client/PaymentHistory.jsp    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
index cee4b3fbbd..6e23911136 100755
--- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
+++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
@@ -96,8 +96,12 @@
         }(window,document,"script",scriptURL,"tcUniNav");
 
         var imagePath = '<%=sessionInfo.getImagePath()%>';
+        
+        if(imagePath=='nullnull'){
+            imagePath=undefined;
+        }
 
-        var photoUrl = imagePath;//(imagePath && imagePath.length > 0) ? ('https://' + serverName + '/' + imagePath) : undefined;
+        var photoUrl = imagePath;
 
         var userId = ${userId};
         var handle = '${userHandle}';

From ec4763c8bbe6a3ea930d2821b00fae8af8cc6c2c Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Mon, 12 Dec 2022 21:27:58 +1100
Subject: [PATCH 10/18] Add universal nav to payment status summary page

---
 .../pacts/client/PaymentStatusSummary.jsp     | 60 ++++++++++++++++---
 1 file changed, 53 insertions(+), 7 deletions(-)

diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp
index 32a3491aae..0509aa13a9 100644
--- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp
+++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp
@@ -14,6 +14,10 @@
 
 <c:set value="<%=true%>" var="isReskin"/>
 <c:set value="<%=request.getAttribute("NUM_PENDING")%>" var="numPending" />
+<c:set var="userHandle" value="<%= sessionInfo.getHandle() %>"/>
+<c:set var="userId" value="<%= sessionInfo.getUserId() %>"/>
+<c:set var="userImagePath" value="<%= sessionInfo.getImagePath() %>"/>
+<c:set var="userInitials" value="<%= sessionInfo.getHandle() %>"/>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
@@ -27,6 +31,54 @@
   <jsp:param name="key" value="tc_stats"/>
   <jsp:param name="reskin" value="${isReskin ? 'paymentStatusSummary' : ''}"/>
 </jsp:include>
+    <div id="headerNav"></div>
+    <script>
+        var serverName = '<%=ApplicationServer.SERVER_NAME%>';
+        var prodUrl = 'topcoder.com';
+        var scriptURL = '//uni-nav.topcoder-dev.com/v1/tc-universal-nav.js';
+
+        if (serverName === prodUrl) {
+            scriptURL = '//uni-nav.topcoder.com/v1/tc-universal-nav.js';
+        }
+
+        !function(n,t,e,a,c,i,o){n['TcUnivNavConfig']=c,n[c]=n[c]||function(){
+        (n[c].q=n[c].q??[]).push(arguments)},n[c].l=1*new Date();i=t.createElement(e),
+        o=t.getElementsByTagName(e)[0];i.async=1;i.type="module";i.src=a;o.parentNode.insertBefore(i,o)
+        }(window,document,"script",scriptURL,"tcUniNav");
+
+        var imagePath = '<%=sessionInfo.getImagePath()%>';
+        var photoUrl = imagePath;
+        
+        if(imagePath=='nullnull'){
+            photoUrl=undefined;
+        }
+
+        var userId = ${userId};
+        var handle = '${userHandle}';
+        var initials = handle ? handle.substr(0, 2).toUpperCase() : '';
+
+        var user = {
+            photoUrl,
+            userId,
+            initials,
+            handle
+        };
+
+        tcUniNav('init', 'headerNav', {
+            type: 'tool',
+            toolName: 'Topcoder Payments',
+            user,
+            toolRoot: '/PactsMemberServlet?module=PaymentHistory&full_list=true',
+            signOut() {
+                window.location.replace("http://" + serverName + "/tc?module=Logout");
+            }
+        });
+
+        tcUniNav('init', 'footerNav', {
+            type: 'footer',
+        })
+
+    </script>
 
 </head>
 <body>
@@ -35,10 +87,6 @@
     ResultSetContainer rsc = (ResultSetContainer) request.getAttribute(PaymentStatusSummary.PAYMENT_STATUS_SUMMARY);
 %>
 
-<jsp:include page="../../top.jsp" >
-    <jsp:param name="level1" value=""/>
-    <jsp:param name="isReskin" value="${isReskin}"/>
-</jsp:include>
 
 <c:if test="${isReskin}">
 <div class="page">
@@ -244,9 +292,7 @@
 </div><!-- // end .page -->
 </c:if>
 
-<jsp:include page="/foot.jsp" >
-    <jsp:param name="isReskin" value="${isReskin}"/>
-</jsp:include>
+<div id="footerNav"></div>
 
 </body>
 

From bb8816792cf3bc80e9065e6a8e372be891f548cf Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Tue, 13 Dec 2022 09:32:05 +1100
Subject: [PATCH 11/18] Parse the JWT for image usage in header

---
 .../tc/view/pacts/client/PaymentHistory.jsp   | 20 +++++++++++--------
 .../pacts/client/PaymentStatusSummary.jsp     | 19 +++++++++++-------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
index 6e23911136..d4756e708b 100755
--- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
+++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
@@ -82,6 +82,16 @@
 </jsp:include>
     <div id="headerNav"></div>
     <script>
+        function parseJwt (token) {
+            var base64Url = token.split('.')[1];
+            var base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
+            var jsonPayload = decodeURIComponent(window.atob(base64).split('').map(function(c) {
+                return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+            }).join(''));
+
+         return JSON.parse(jsonPayload);
+        }
+
         var serverName = '<%=ApplicationServer.SERVER_NAME%>';
         var prodUrl = 'topcoder.com';
         var scriptURL = '//uni-nav.topcoder-dev.com/v1/tc-universal-nav.js';
@@ -95,13 +105,7 @@
         o=t.getElementsByTagName(e)[0];i.async=1;i.type="module";i.src=a;o.parentNode.insertBefore(i,o)
         }(window,document,"script",scriptURL,"tcUniNav");
 
-        var imagePath = '<%=sessionInfo.getImagePath()%>';
-        
-        if(imagePath=='nullnull'){
-            imagePath=undefined;
-        }
-
-        var photoUrl = imagePath;
+        var photoUrl = parseJwt($.cookie('tcjwt'))["picture"];;
 
         var userId = ${userId};
         var handle = '${userHandle}';
@@ -888,7 +892,7 @@
 </div><!-- // end .page -->
 </c:if>
 
-<div id="footerNav"></div>
+<div id="footerNav" class="footerNav"></div>
 
 <c:if test="${isReskin}">
 <div class="modal payment-confirm-modal" id="payment-confirm-modal-id">
diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp
index 0509aa13a9..f75c8c9f2d 100644
--- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp
+++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp
@@ -33,6 +33,16 @@
 </jsp:include>
     <div id="headerNav"></div>
     <script>
+        function parseJwt (token) {
+            var base64Url = token.split('.')[1];
+            var base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
+            var jsonPayload = decodeURIComponent(window.atob(base64).split('').map(function(c) {
+                return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+            }).join(''));
+
+         return JSON.parse(jsonPayload);
+        }
+
         var serverName = '<%=ApplicationServer.SERVER_NAME%>';
         var prodUrl = 'topcoder.com';
         var scriptURL = '//uni-nav.topcoder-dev.com/v1/tc-universal-nav.js';
@@ -46,12 +56,7 @@
         o=t.getElementsByTagName(e)[0];i.async=1;i.type="module";i.src=a;o.parentNode.insertBefore(i,o)
         }(window,document,"script",scriptURL,"tcUniNav");
 
-        var imagePath = '<%=sessionInfo.getImagePath()%>';
-        var photoUrl = imagePath;
-        
-        if(imagePath=='nullnull'){
-            photoUrl=undefined;
-        }
+        var photoUrl = parseJwt($.cookie('tcjwt'))["picture"];;
 
         var userId = ${userId};
         var handle = '${userHandle}';
@@ -292,7 +297,7 @@
 </div><!-- // end .page -->
 </c:if>
 
-<div id="footerNav"></div>
+<div id="footerNav" class="footerNav"></div>
 
 </body>
 

From 6181c9ed4fef98753bb8f3bc49023a3eebacbf61 Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Tue, 13 Dec 2022 10:20:21 +1100
Subject: [PATCH 12/18] Typo

---
 .../com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp    | 2 +-
 .../topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
index d4756e708b..724b70dfc2 100755
--- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
+++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
@@ -105,7 +105,7 @@
         o=t.getElementsByTagName(e)[0];i.async=1;i.type="module";i.src=a;o.parentNode.insertBefore(i,o)
         }(window,document,"script",scriptURL,"tcUniNav");
 
-        var photoUrl = parseJwt($.cookie('tcjwt'))["picture"];;
+        var photoUrl = parseJwt($.cookie('tcjwt'))["picture"];
 
         var userId = ${userId};
         var handle = '${userHandle}';
diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp
index f75c8c9f2d..22048f5e04 100644
--- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp
+++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp
@@ -56,7 +56,7 @@
         o=t.getElementsByTagName(e)[0];i.async=1;i.type="module";i.src=a;o.parentNode.insertBefore(i,o)
         }(window,document,"script",scriptURL,"tcUniNav");
 
-        var photoUrl = parseJwt($.cookie('tcjwt'))["picture"];;
+        var photoUrl = parseJwt($.cookie('tcjwt'))["picture"];
 
         var userId = ${userId};
         var handle = '${userHandle}';

From 42e763ffb7009bceca84ded52719b5e35907491e Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Wed, 14 Dec 2022 17:43:53 +1100
Subject: [PATCH 13/18] Fix logout not working properly

---
 .../com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
index 724b70dfc2..6c25c04321 100755
--- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
+++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
@@ -93,6 +93,7 @@
         }
 
         var serverName = '<%=ApplicationServer.SERVER_NAME%>';
+        var auth0Server = '<%=Constants.DOMAIN_AUTH0%>';
         var prodUrl = 'topcoder.com';
         var scriptURL = '//uni-nav.topcoder-dev.com/v1/tc-universal-nav.js';
 
@@ -124,7 +125,7 @@
             user,
             toolRoot: '/PactsMemberServlet?module=PaymentHistory&full_list=true',
             signOut() {
-                window.location.replace("http://" + serverName + "/tc?module=Logout");
+                window.location.replace("https://" + auth0Server + "/?logout=true&retUrl=https://" + serverName);
             }
         });
 

From 631385d4a5e268ae4a158de23316a129f747e22e Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Wed, 14 Dec 2022 17:52:00 +1100
Subject: [PATCH 14/18] Additional logout URL fix

---
 .../com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
index 6c25c04321..f4c5e03ac8 100755
--- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
+++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
@@ -93,7 +93,8 @@
         }
 
         var serverName = '<%=ApplicationServer.SERVER_NAME%>';
-        var auth0Server = '<%=Constants.DOMAIN_AUTH0%>';
+        var auth0Server = '<%=bundle.getProperty("login_url", "");%>';
+        var logoutURL = auth0Server + "?logout=true&retUrl=https://" + serverName;
         var prodUrl = 'topcoder.com';
         var scriptURL = '//uni-nav.topcoder-dev.com/v1/tc-universal-nav.js';
 
@@ -125,7 +126,7 @@
             user,
             toolRoot: '/PactsMemberServlet?module=PaymentHistory&full_list=true',
             signOut() {
-                window.location.replace("https://" + auth0Server + "/?logout=true&retUrl=https://" + serverName);
+                window.location.replace(logoutURL);
             }
         });
 

From c71c87204ea4eea60ce2ced9f429249564dc89d5 Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Wed, 14 Dec 2022 18:08:24 +1100
Subject: [PATCH 15/18] Test different logout structure

---
 .../com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
index f4c5e03ac8..704e83419a 100755
--- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
+++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
@@ -93,8 +93,8 @@
         }
 
         var serverName = '<%=ApplicationServer.SERVER_NAME%>';
-        var auth0Server = '<%=bundle.getProperty("login_url", "");%>';
-        var logoutURL = auth0Server + "?logout=true&retUrl=https://" + serverName;
+        var auth0Server = '<%=Constants.DOMAIN_AUTH0%>';
+        var logoutURL = "https://" + auth0Server + "?logout=true&retUrl=https://" + serverName
         var prodUrl = 'topcoder.com';
         var scriptURL = '//uni-nav.topcoder-dev.com/v1/tc-universal-nav.js';
 

From 68cdbc261241f77954eb49f5f84f384e6587c3cd Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Wed, 14 Dec 2022 18:15:02 +1100
Subject: [PATCH 16/18] This should do it.

---
 .../com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
index 704e83419a..5a4d7122f2 100755
--- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
+++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
@@ -93,8 +93,8 @@
         }
 
         var serverName = '<%=ApplicationServer.SERVER_NAME%>';
-        var auth0Server = '<%=Constants.DOMAIN_AUTH0%>';
-        var logoutURL = "https://" + auth0Server + "?logout=true&retUrl=https://" + serverName
+        var logoutURL = "https://" + serverName + "/logout";
+        
         var prodUrl = 'topcoder.com';
         var scriptURL = '//uni-nav.topcoder-dev.com/v1/tc-universal-nav.js';
 

From 416482cbe1eb0dabbc415cec65c0a6dbfbdc9f30 Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Thu, 15 Dec 2022 09:06:26 +1100
Subject: [PATCH 17/18] Change footer nav ref

---
 .../com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp  | 4 ++--
 .../web/tc/view/pacts/client/PaymentStatusSummary.jsp         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
index 5a4d7122f2..169733e493 100755
--- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
+++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
@@ -94,7 +94,7 @@
 
         var serverName = '<%=ApplicationServer.SERVER_NAME%>';
         var logoutURL = "https://" + serverName + "/logout";
-        
+
         var prodUrl = 'topcoder.com';
         var scriptURL = '//uni-nav.topcoder-dev.com/v1/tc-universal-nav.js';
 
@@ -894,7 +894,7 @@
 </div><!-- // end .page -->
 </c:if>
 
-<div id="footerNav" class="footerNav"></div>
+<div id="footerNav"></div>
 
 <c:if test="${isReskin}">
 <div class="modal payment-confirm-modal" id="payment-confirm-modal-id">
diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp
index 22048f5e04..934fb93d85 100644
--- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp
+++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp
@@ -297,7 +297,7 @@
 </div><!-- // end .page -->
 </c:if>
 
-<div id="footerNav" class="footerNav"></div>
+<div id="footerNav"></div>
 
 </body>
 

From 70c9b52b8c64909e5929771f4aad033a011301d1 Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Thu, 15 Dec 2022 15:28:41 +1100
Subject: [PATCH 18/18] =?UTF-8?q?Change=20tool=20name=20to=20=E2=80=9CPaym?=
 =?UTF-8?q?ents=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://topcoder.atlassian.net/browse/PROD-3402
---
 .../com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp    | 2 +-
 .../topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
index 169733e493..5b057ba5da 100755
--- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
+++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp
@@ -122,7 +122,7 @@
 
         tcUniNav('init', 'headerNav', {
             type: 'tool',
-            toolName: 'Topcoder Payments',
+            toolName: 'Payments',
             user,
             toolRoot: '/PactsMemberServlet?module=PaymentHistory&full_list=true',
             signOut() {
diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp
index 934fb93d85..9993c753ef 100644
--- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp
+++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp
@@ -71,7 +71,7 @@
 
         tcUniNav('init', 'headerNav', {
             type: 'tool',
-            toolName: 'Topcoder Payments',
+            toolName: 'Payments',
             user,
             toolRoot: '/PactsMemberServlet?module=PaymentHistory&full_list=true',
             signOut() {
