Merge pull request #506 from persistenceOne/feedback_updates

Feedback updates
persistenceOne · Jan 15, 2024 · 7b41eaa · 7b41eaa
2 parents aee4fe0 + 4ba6b0f
commit 7b41eaa
Show file tree

Hide file tree

Showing 26 changed files with 846 additions and 576 deletions.
diff --git a/src/App.js b/src/App.js
@@ -78,17 +78,15 @@ const Main = () => {
   let address;
 
   address = loginInfo && loginInfo.address;
-
+  const page = location.pathname;
   useEffect(() => {
-    const page = location.pathname;
-    console.log(page, "page-tt");
     if (page === "/dashboard/wallet") {
       history.push("/#/dashboard/wallet");
     } else if (page === "/dashboard/staking") {
       history.push("/#/dashboard/staking");
     }
     trackPage(page);
-  }, [location]);
+  }, [page]);
 
   useEffect(() => {
     const fetchApi = async () => {

diff --git a/src/assets/images/icons.svg b/src/assets/images/icons.svg
diff --git a/src/assets/scss/_common.scss b/src/assets/scss/_common.scss
@@ -28,27 +28,26 @@ body {
 }
 
 .button.button-primary {
-  background: #e50913;
-  font-weight: bold;
-  font-size: 16.5455px;
-  color: #ffffff;
-  border-color: #e50913;
+  background: #C73238;
+  font-weight: 600;
+  font-size: 16px;
+  color: #FCFCFC;
+  border-color: #C73238;
   padding: 0.375rem 1.2rem;
-  border-radius: 0;
+  border-radius: 6px;
 }
 
 .button:disabled {
   opacity: 0.6 !important;
 }
 
 .button.button-secondary {
-  background: #313238;
-  font-weight: bold;
+  background: transparent;
+  font-weight: 600;
   font-size: 16.5455px;
-  color: #ffffff;
   padding: 0.375rem 1.2rem;
-  border-color: #313238;
-  border-radius: 0;
+  border-color: #C73238;
+  border-radius: 6px;
 }
 
 .flex-center {
@@ -95,14 +94,18 @@ body {
 
 .list-modal.modal-custom {
   .modal-dialog {
-    max-width: 700px;
+    max-width: 620px;
   }
 
   .list-modal-body {
-    padding: 0px 60px 30px 60px;
+    padding: 0px 30px 30px 30px;
   }
 }
 
+.actions-modal .modal-dialog{
+  max-width: 600px;
+}
+
 .help-before-login {
   .faq-modal-body .nav-pills .box .nav-link {
     border-color: #e3e5f4;
@@ -178,12 +181,12 @@ body {
     line-height: 27px;
     font-family: "Poppins", sans-serif;
     text-align: center;
-    padding: 30px;
+    padding: 24px;
     color: #313238;
   }
 
   .modal-header .heading {
-    font-weight: 600;
+    font-weight: 500;
     font-size: 18px;
     line-height: 27px;
     font-family: "Poppins", sans-serif;
@@ -440,14 +443,15 @@ body {
 
 .modal-header {
   button.close {
-    font-weight: 500;
+    font-weight: 200;
     text-shadow: none;
     position: absolute;
     right: 50px;
     top: 40px;
     padding: 0;
     outline: none !important;
-    font-size: 34px;
+    font-size: 24px;
+    opacity: 1 !important;
   }
 
   .previous-section.txn-header button {
@@ -760,7 +764,7 @@ body {
   color: #FCFCFC;
   cursor: pointer;
   padding: 5px 10px;
-  background: #e50913;
+  background: #C73238;
   border-radius: 4px;
   margin-right: 4px;
 }
@@ -1184,3 +1188,81 @@ ul li em {
     color: #e50913 !important;
   }
 }
+
+.notice-banner-section{
+  position: relative;
+  .notice-banner {
+    border-radius: 6px;
+    border-left: 5px red solid;
+    margin-top: 16px;
+    padding: 12px 24px;
+    .content {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .left {
+        flex: 1;
+        .title-text {
+          font-weight: 500;
+          margin-bottom: 4px;
+        }
+        .sub-text{
+          font-size: 12px;
+          font-weight: 300;
+          margin-bottom: 0;
+        }
+      }
+
+      .right {
+        width: 250px;
+        .link{
+          font-size: 12px;
+          font-weight: 400;
+          border: 1px solid red;
+          border-radius: 6px;
+          padding: 4px 16px;
+          &:hover{
+            text-decoration: none;
+          }
+        }
+      }
+    }
+    .icon-close {
+      width: 8px;
+      cursor: pointer;
+      position: absolute;
+      right: 28px;
+      top: 13px;
+    }
+  }
+}
+
+.modal-open .modal{
+  background: #00000099;
+  backdrop-filter: blur(4px);
+}
+
+.status-symbol.active{
+  background: #2E855C;
+  padding: 2px 12px;
+  width: 68px;
+  border-radius: 12px;
+  p{
+      font-weight: 400;
+    color: #FFFFFF;
+    font-size: 14px;
+    margin:0;
+  }
+}
+.status-symbol.inactive{
+  background: #e50913;
+  padding: 2px 12px;
+  width: 89px;
+  border-radius: 12px;
+  p{
+    font-weight: 400;
+    color: #FFFFFF;
+    font-size: 14px;
+    margin:0;
+  }
+}