From ce364bf6aa57e61259f5f8add529be6bd6746d55 Mon Sep 17 00:00:00 2001
From: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com>
Date: Wed, 8 Jan 2025 20:53:59 +0530
Subject: [PATCH 1/4] minor css improvements

---
 .../treasury-devdao.near/widget/components/DropDown.jsx     | 2 +-
 .../widget/components/templates/AppLayout.jsx               | 6 +++---
 .../widget/pages/payments/CreatePaymentRequest.jsx          | 2 +-
 .../widget/pages/settings/Thresholds.jsx                    | 6 +++---
 .../widget/pages/settings/VotingDurationPage.jsx            | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/instances/treasury-devdao.near/widget/components/DropDown.jsx b/instances/treasury-devdao.near/widget/components/DropDown.jsx
index af101017..39ccef41 100644
--- a/instances/treasury-devdao.near/widget/components/DropDown.jsx
+++ b/instances/treasury-devdao.near/widget/components/DropDown.jsx
@@ -44,7 +44,7 @@ return (
     <div className="dropdown w-100" data-testid="dropdown">
       <button
         disabled={disabled}
-        className="btn drop-btn text-truncate dropdown-toggle bg-dropdown border rounded-2"
+        className="btn drop-btn text-truncate dropdown-toggle bg-dropdown border rounded-2 no-transparent"
         type="button"
         data-bs-toggle="dropdown"
         aria-expanded="false"
diff --git a/instances/treasury-devdao.near/widget/components/templates/AppLayout.jsx b/instances/treasury-devdao.near/widget/components/templates/AppLayout.jsx
index 53df5cd8..fe4075de 100644
--- a/instances/treasury-devdao.near/widget/components/templates/AppLayout.jsx
+++ b/instances/treasury-devdao.near/widget/components/templates/AppLayout.jsx
@@ -286,9 +286,9 @@ function AppLayout({ page, instance, children, treasuryDaoID, accountId }) {
       color: var(--text-color) !important;
     }
 
-    .btn:disabled,
-    .btn.disabled,
-    fieldset:disabled {
+    .btn:not(.no-transparent),
+    .btn.disabled:not(.no-transparent),
+    fieldset:disabled:not(.no-transparent) {
       border-color: transparent !important;
     }
 
diff --git a/instances/treasury-devdao.near/widget/pages/payments/CreatePaymentRequest.jsx b/instances/treasury-devdao.near/widget/pages/payments/CreatePaymentRequest.jsx
index 7f988a44..47b2c9ee 100644
--- a/instances/treasury-devdao.near/widget/pages/payments/CreatePaymentRequest.jsx
+++ b/instances/treasury-devdao.near/widget/pages/payments/CreatePaymentRequest.jsx
@@ -568,7 +568,7 @@ return (
         parseFloat(selectedTokensAvailable) <=
           parseFloat(amount ? amount : 0) && (
           <div className="d-flex gap-3 align-items-center warning px-3 py-2 rounded-3">
-            <i class="bi bi-exclamation-triangle h5"></i>
+            <i class="bi bi-exclamation-triangle warning-icon h5"></i>
             <div>
               The treasury balance is insufficient to cover the payment. You can
               create the request, but it won’t be approved until the balance is
diff --git a/instances/treasury-devdao.near/widget/pages/settings/Thresholds.jsx b/instances/treasury-devdao.near/widget/pages/settings/Thresholds.jsx
index 0f50f89f..734840e0 100644
--- a/instances/treasury-devdao.near/widget/pages/settings/Thresholds.jsx
+++ b/instances/treasury-devdao.near/widget/pages/settings/Thresholds.jsx
@@ -321,7 +321,7 @@ return (
               <div className="d-flex flex-column gap-2">
                 This action will result in significant changes to the system.
                 <div className="d-flex gap-3 warning px-3 py-2 rounded-3">
-                  <i class="bi bi-exclamation-triangle h5"></i>
+                  <i class="bi bi-exclamation-triangle warning-icon h5"></i>
                   <div>
                     Changing this setting will require {requiredVotes} vote(s)
                     to approve requests. You will no longer be able to approve
@@ -341,7 +341,7 @@ return (
         />
         <div className="flex-1 border-right py-3 ">
           <div className="card-title px-3">Permission Groups</div>
-          <div className="d-flex flex-column gap-1 fw-bold">
+          <div className="d-flex flex-column gap-1" style={{ fontWeight: 600 }}>
             {rolesData.map((role) => {
               const name = role.roleName;
               return (
@@ -455,7 +455,7 @@ return (
             {isPercentageSelected &&
               selectedGroup.threshold != selectedVoteValue && (
                 <div className="d-flex gap-3 warning px-3 py-2 rounded-3">
-                  <i class="bi bi-exclamation-triangle h5"></i>
+                  <i class="bi bi-exclamation-triangle warning-icon h5"></i>
                   <div>
                     <span className="fw-bolder">Warning! </span> <br />
                     If you choose a percentage-based threshold, the number of
diff --git a/instances/treasury-devdao.near/widget/pages/settings/VotingDurationPage.jsx b/instances/treasury-devdao.near/widget/pages/settings/VotingDurationPage.jsx
index 6415453d..4e314371 100644
--- a/instances/treasury-devdao.near/widget/pages/settings/VotingDurationPage.jsx
+++ b/instances/treasury-devdao.near/widget/pages/settings/VotingDurationPage.jsx
@@ -312,7 +312,7 @@ return (
     <div className="card rounded-3 py-3" style={{ maxWidth: "50rem" }}>
       <div className="card-title px-3 mb-0">Voting Duration</div>
       <div className="p-3 d-flex flex-column gap-2">
-        <div className="fw-bold text-lg">
+        <div className="fw-semi-bold text-lg">
           Set the number of days a vote is active. A decision expires if voting
           is not completed within this period.
         </div>

From fdd0528e5ab4ca9a210ad0e0ef3cc5f42cc30a45 Mon Sep 17 00:00:00 2001
From: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com>
Date: Wed, 8 Jan 2025 21:20:31 +0530
Subject: [PATCH 2/4] refactor colors

---
 .../widget/components/templates/AppLayout.jsx            | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/instances/treasury-devdao.near/widget/components/templates/AppLayout.jsx b/instances/treasury-devdao.near/widget/components/templates/AppLayout.jsx
index fe4075de..974cdd31 100644
--- a/instances/treasury-devdao.near/widget/components/templates/AppLayout.jsx
+++ b/instances/treasury-devdao.near/widget/components/templates/AppLayout.jsx
@@ -34,8 +34,6 @@ function AppLayout({ page, instance, children, treasuryDaoID, accountId }) {
   --text-color: ${isDarkTheme ? "#CACACA" : "#1B1B18"};
   --text-secondary-color: ${isDarkTheme ? "#878787" : "#999999"};
   --text-alt-color: ${isDarkTheme ? "#FFFFFF" : "#FFFFFF"};
-  --link-inactive-color: ${isDarkTheme ? "" : "white"};
-  --link-active-color: ${isDarkTheme ? "" : "white"};
   --border-color: ${isDarkTheme ? "#3B3B3B" : "rgba(226, 230, 236, 1)"};
   --grey-01: ${isDarkTheme ? "#F4F4F4" : "#1B1B18"};
   --grey-02: ${isDarkTheme ? "#B3B3B3" : "#555555"};
@@ -115,15 +113,15 @@ function AppLayout({ page, instance, children, treasuryDaoID, accountId }) {
 
     a {
       text-decoration: none;
-      color: var(--link-inactive-color) !important;
+      color: var(--text-color) !important;
       &.active {
-        color: var(--link-active-color) !important;
+        color: var(--text-color) !important;
         font-weight: 700 !important;
       }
 
       &:hover {
         text-decoration: none;
-        color: var(--link-active-color) !important;
+        color: var(--text-color) !important;
         font-weight: 700 !important;
       }
     }
@@ -286,7 +284,6 @@ function AppLayout({ page, instance, children, treasuryDaoID, accountId }) {
       color: var(--text-color) !important;
     }
 
-    .btn:not(.no-transparent),
     .btn.disabled:not(.no-transparent),
     fieldset:disabled:not(.no-transparent) {
       border-color: transparent !important;

From 44f7ebe1e2dfc6298574557f190d108838c1ca6d Mon Sep 17 00:00:00 2001
From: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com>
Date: Wed, 8 Jan 2025 21:25:01 +0530
Subject: [PATCH 3/4] added templar deployment script

---
 .github/workflows/release-instances.yml | 2 ++
 package.json                            | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/.github/workflows/release-instances.yml b/.github/workflows/release-instances.yml
index 2e0c4b3b..e2e27ea1 100644
--- a/.github/workflows/release-instances.yml
+++ b/.github/workflows/release-instances.yml
@@ -19,6 +19,8 @@ jobs:
             deploy_command: npm run deploy:infinex
           - environment: treasury-testing-infinex.near
             deploy_command: npm run deploy:infinex-testing
+          - environment: treasury-templar.near
+            deploy_command: npm run deploy:templar
     environment: ${{ matrix.target_account.environment }}
     steps:
       - name: Checkout repository
diff --git a/package.json b/package.json
index 3eba869e..c9962594 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
     "bw:build:testing": "npm run bw:build:instance --instance=treasury-testing.near",
     "bw:build:infinex": "npm run bw:build:instance --instance=treasury-infinex.near",
     "bw:build:infinex-testing": "npm run bw:build:instance --instance=treasury-testing-infinex.near",
+    "bw:build:templar": "npm run bw:build:instance --instance=treasury-templar.near",
     "build:sandbox": "cd sandboxrpc && cargo build",
     "gateway": "bw ws dev -g web4/public_html",
     "dry-run:instances": "cd ./build/$npm_config_instance && bos components diff $npm_config_instance network-config mainnet",
@@ -50,6 +51,8 @@
     "dry-run:infinex-testing": "npm run bw:build:infinex-testing && npm run dry-run:instances --instance=treasury-testing-infinex.near",
     "deploy:infinex-testing": "npm run bw:build:infinex-testing && cd ./build/treasury-testing-infinex.near && bos components deploy",
     "dry-run:infinex": "npm run bw:build:infinex && npm run dry-run:instances --instance=treasury-infinex.near",
+    "deploy:templar": "npm run bw:build:templar && cd ./build/treasury-templar.near && bos components deploy",
+    "dry-run:templar": "npm run bw:build:templar && npm run dry-run:instances --instance=treasury-templar.near",
     "test": "npx playwright test",
     "test:watch:codespaces": "npm test -- --ui-host=0.0.0.0"
   },

From 8cb129efe129c42ab4ecd61f47360f33c4ef2b65 Mon Sep 17 00:00:00 2001
From: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com>
Date: Wed, 8 Jan 2025 23:56:55 +0530
Subject: [PATCH 4/4] fix failing test

---
 .github/workflows/dry-run.yml                          |  1 +
 .../tests/settings/voting-duration.spec.js             | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/.github/workflows/dry-run.yml b/.github/workflows/dry-run.yml
index 44b15900..dabb665d 100644
--- a/.github/workflows/dry-run.yml
+++ b/.github/workflows/dry-run.yml
@@ -15,6 +15,7 @@ jobs:
           - dry_run_command: npm run dry-run:testing
           - dry_run_command: npm run dry-run:infinex
           - dry_run_command: npm run dry-run:infinex-testing
+          - dry_run_command: npm run dry-run:templar
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
diff --git a/playwright-tests/tests/settings/voting-duration.spec.js b/playwright-tests/tests/settings/voting-duration.spec.js
index 962c4c82..f84b09cb 100644
--- a/playwright-tests/tests/settings/voting-duration.spec.js
+++ b/playwright-tests/tests/settings/voting-duration.spec.js
@@ -96,6 +96,16 @@ test.describe("User is logged in", function () {
     await page.waitForTimeout(500);
     await page.locator("button", { hasText: "Submit" }).click();
 
+    // check if there is any change in existing requests duration
+    await page.waitForTimeout(2_000);
+    const proceedButton = await page.locator(".modalfooter button", {
+      hasText: "Yes, proceed",
+    });
+
+    if (await proceedButton.isVisible({})) {
+      await proceedButton.click();
+    }
+
     const description = {
       title: "Update policy - Voting Duration",
       summary: `theori.near requested to change voting duration from ${currentDurationDays} to ${newDurationDays}.`,