From f85e4d5e414a0dc8c173404bf0d078297ee7b208 Mon Sep 17 00:00:00 2001
From: lunarkid <4476442+dedywahyudi@users.noreply.github.com>
Date: Tue, 4 Oct 2022 22:26:27 +0700
Subject: [PATCH 1/2] fix: back to settings profile page

---
 .../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 0a4dd42863..a7d9afd87f 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
@@ -225,7 +225,7 @@
     <% } %>
 
     <c:if test="${isReskin}">
-        <a href="https://<%=ApplicationServer.SERVER_NAME%>/challenges" class="back-btn">
+        <a href="https://<%=ApplicationServer.SERVER_NAME%>/settings/payment" class="back-btn">
             <i class="arrow-prev-icon"></i>
         </a>
     </c:if>
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 a7bfcf28e1..df2f696446 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
@@ -74,7 +74,7 @@
     </div>
 
     <c:if test="${isReskin}">
-        <a href="https://<%=ApplicationServer.SERVER_NAME%>/challenges" class="back-btn">
+        <a href="https://<%=ApplicationServer.SERVER_NAME%>/settings/payment" class="back-btn">
             <i class="arrow-prev-icon"></i>
         </a>
     </c:if>

From d818ac5138c2b9a05cc41e6c00231b97baf7ec0d Mon Sep 17 00:00:00 2001
From: lunarkid <4476442+dedywahyudi@users.noreply.github.com>
Date: Fri, 7 Oct 2022 23:12:12 +0700
Subject: [PATCH 2/2] fix: add payment settings button

---
 .../tc/view/pacts/client/PaymentHistory.jsp   |  9 +++++++--
 .../pacts/client/PaymentStatusSummary.jsp     | 20 ++++++++++++-------
 2 files changed, 20 insertions(+), 9 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 a7d9afd87f..9c1910a163 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
@@ -215,8 +215,13 @@
 
 <div align="left" class="page-header">
     <% if(isNewStyle) { %>
-    <div style="float:right; padding-top:12px;" class="how-to-get-paid">
-        <A class="informationLink" href="https://www.topcoder.com/thrive/articles/Payment%20Policies%20and%20Instructions">How to get paid?</A>
+    <div class="page-header-right">
+        <div class="how-to-get-paid">
+            <A class="informationLink" href="https://www.topcoder.com/thrive/articles/Payment%20Policies%20and%20Instructions">How to get paid?</A>
+        </div>
+        <div class="payment-settings-btn">
+            <a href="https://<%=ApplicationServer.SERVER_NAME%>/settings/payment">Payment Settings</a>
+        </div>
     </div>
     <% } else { %>
     <div style="float:right;" class="how-to-get-paid">
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 df2f696446..32a3491aae 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
@@ -63,15 +63,21 @@
 </jsp:include>
 
 <div align="left" class="page-header">
+    <c:if test="${isReskin}">
+    <div class="page-header-right">
+        <div class="how-to-get-paid">
+            <A class="informationLink" href="https://www.topcoder.com/thrive/articles/Payment%20Policies%20and%20Instructions">How to get paid?</A>
+        </div>
+        <div class="payment-settings-btn">
+            <a href="https://<%=ApplicationServer.SERVER_NAME%>/settings/payment">Payment Settings</a>
+        </div>
+    </div>
+    </c:if>
+    <c:if test="${!isReskin}">
     <div style="float:right;" class="how-to-get-paid">
-       <c:if test="${isReskin}">
-       <A href="https://www.topcoder.com/thrive/articles/Payment%20Policies%20and%20Instructions">How to get paid?</A>
-       </c:if>
-
-       <c:if test="${!isReskin}">
-       <A href="https://www.topcoder.com/thrive/articles/Payment%20Policies%20and%20Instructions"><img src="/i/pacts/howToGetPaid.png" alt="How to get paid" /></A>
-       </c:if>
+        <A href="https://www.topcoder.com/thrive/articles/Payment%20Policies%20and%20Instructions"><img src="/i/pacts/howToGetPaid.png" alt="How to get paid" /></A>
     </div>
+    </c:if>
 
     <c:if test="${isReskin}">
         <a href="https://<%=ApplicationServer.SERVER_NAME%>/settings/payment" class="back-btn">