From a3802810c84991e092b196f9b9196bf6efb133e1 Mon Sep 17 00:00:00 2001
From: Piyal Basu <pbasu235@gmail.com>
Date: Tue, 5 Nov 2024 12:22:04 -0500
Subject: [PATCH 1/2] adjust button color and fix bad merge

---
 .../SendConfirm/SubmitResult/index.tsx        |  4 ++--
 .../SendConfirm/TransactionDetails/index.tsx  |  2 +-
 extension/src/popup/views/Account/index.tsx   | 23 +------------------
 extension/src/popup/views/Account/styles.scss |  2 +-
 .../popup/views/DisplayBackupPhrase/index.tsx |  2 +-
 .../src/popup/views/SignTransaction/index.tsx |  8 +++----
 .../src/popup/views/UnlockAccount/index.tsx   |  2 +-
 7 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/extension/src/popup/components/sendPayment/SendConfirm/SubmitResult/index.tsx b/extension/src/popup/components/sendPayment/SendConfirm/SubmitResult/index.tsx
index e40f2dc17d..3d4df2fc76 100644
--- a/extension/src/popup/components/sendPayment/SendConfirm/SubmitResult/index.tsx
+++ b/extension/src/popup/components/sendPayment/SendConfirm/SubmitResult/index.tsx
@@ -242,7 +242,7 @@ export const SubmitSuccess = ({ viewDetails }: { viewDetails: () => void }) => {
       <View.Footer isInline>
         <Button
           size="md"
-          variant="secondary"
+          variant="tertiary"
           onClick={() => viewDetails()}
           data-testid="SubmitResultDetailsButton"
         >
@@ -250,7 +250,7 @@ export const SubmitSuccess = ({ viewDetails }: { viewDetails: () => void }) => {
         </Button>
         <Button
           size="md"
-          variant="primary"
+          variant="secondary"
           onClick={() => {
             navigateTo(ROUTES.account);
           }}
diff --git a/extension/src/popup/components/sendPayment/SendConfirm/TransactionDetails/index.tsx b/extension/src/popup/components/sendPayment/SendConfirm/TransactionDetails/index.tsx
index 3397e36ed1..ec58696123 100644
--- a/extension/src/popup/components/sendPayment/SendConfirm/TransactionDetails/index.tsx
+++ b/extension/src/popup/components/sendPayment/SendConfirm/TransactionDetails/index.tsx
@@ -532,7 +532,7 @@ export const TransactionDetails = ({
       <Button
         size="md"
         isFullWidth
-        variant="secondary"
+        variant="tertiary"
         onClick={() =>
           openTab(
             `${getStellarExpertUrl(networkDetails)}/tx/${transactionHash}`,
diff --git a/extension/src/popup/views/Account/index.tsx b/extension/src/popup/views/Account/index.tsx
index e8c8b5481e..ba78783083 100644
--- a/extension/src/popup/views/Account/index.tsx
+++ b/extension/src/popup/views/Account/index.tsx
@@ -1,7 +1,6 @@
 import React, { useState, useEffect } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import {
-  Button,
   CopyText,
   Icon,
   NavButton,
@@ -34,8 +33,6 @@ import {
   transactionSubmissionSelector,
   resetSubmission,
   resetAccountBalanceStatus,
-  saveAssetSelectType,
-  AssetSelectType,
   getAccountBalances,
   getSoroswapTokens,
 } from "popup/ducks/transactionSubmission";
@@ -183,25 +180,7 @@ export const Account = () => {
             setLoading={setLoading}
           />
           {/* <BlockaidAnnouncement /> */}
-          <View.Content
-            hasNoTopPadding
-            contentFooter={
-              isFunded ? (
-                <div className="AccountView__assets-button">
-                  <Button
-                    size="md"
-                    variant="secondary"
-                    onClick={() => {
-                      dispatch(saveAssetSelectType(AssetSelectType.MANAGE));
-                      navigateTo(ROUTES.manageAssets);
-                    }}
-                  >
-                    {t("Manage Assets")}
-                  </Button>
-                </div>
-              ) : null
-            }
-          >
+          <View.Content hasNoTopPadding>
             <div className="AccountView" data-testid="account-view">
               <div className="AccountView__account-actions">
                 <div className="AccountView__name-key-display">
diff --git a/extension/src/popup/views/Account/styles.scss b/extension/src/popup/views/Account/styles.scss
index 7dd01c813a..0bb111f3ea 100644
--- a/extension/src/popup/views/Account/styles.scss
+++ b/extension/src/popup/views/Account/styles.scss
@@ -44,7 +44,7 @@
         stroke: var(--sds-clr-base-01);
         width: 1rem;
         height: 1rem;
-        stroke: var(--sds-clr-gray-11);
+        stroke: var(--sds-clr-gray-12);
       }
     }
   }
diff --git a/extension/src/popup/views/DisplayBackupPhrase/index.tsx b/extension/src/popup/views/DisplayBackupPhrase/index.tsx
index 5bee5bcae8..b5a503091e 100644
--- a/extension/src/popup/views/DisplayBackupPhrase/index.tsx
+++ b/extension/src/popup/views/DisplayBackupPhrase/index.tsx
@@ -77,7 +77,7 @@ export const DisplayBackupPhrase = () => {
             <Button
               size="md"
               isFullWidth
-              variant="primary"
+              variant="tertiary"
               onClick={() => navigateTo(ROUTES.account)}
             >
               {t("Done")}
diff --git a/extension/src/popup/views/SignTransaction/index.tsx b/extension/src/popup/views/SignTransaction/index.tsx
index bc530c05b8..f72b35c0cd 100644
--- a/extension/src/popup/views/SignTransaction/index.tsx
+++ b/extension/src/popup/views/SignTransaction/index.tsx
@@ -410,7 +410,7 @@ export const SignTransaction = () => {
                   <Button
                     isFullWidth
                     size="md"
-                    variant="secondary"
+                    variant="tertiary"
                     onClick={() => rejectAndClose()}
                   >
                     {t("Reject")}
@@ -421,7 +421,7 @@ export const SignTransaction = () => {
                   <Button
                     isFullWidth
                     size="md"
-                    variant="secondary"
+                    variant="tertiary"
                     onClick={() => rejectAndClose()}
                   >
                     {t("Cancel")}
@@ -429,7 +429,7 @@ export const SignTransaction = () => {
                   {needsReviewAuth ? (
                     <Button
                       disabled={isSubmitDisabled}
-                      variant="tertiary"
+                      variant="secondary"
                       isFullWidth
                       size="md"
                       isLoading={isConfirming}
@@ -452,7 +452,7 @@ export const SignTransaction = () => {
                   ) : (
                     <Button
                       disabled={isSubmitDisabled}
-                      variant="tertiary"
+                      variant="secondary"
                       isFullWidth
                       size="md"
                       isLoading={isConfirming}
diff --git a/extension/src/popup/views/UnlockAccount/index.tsx b/extension/src/popup/views/UnlockAccount/index.tsx
index 88c98ff67d..ab571d8812 100644
--- a/extension/src/popup/views/UnlockAccount/index.tsx
+++ b/extension/src/popup/views/UnlockAccount/index.tsx
@@ -80,7 +80,7 @@ export const UnlockAccount = () => {
                     <Button
                       size="md"
                       isFullWidth
-                      variant="tertiary"
+                      variant="secondary"
                       type="submit"
                       isLoading={isSubmitting}
                       disabled={!(dirty && isValid)}

From a2b66da91fd4f78d7627b735ece87b8371d91291 Mon Sep 17 00:00:00 2001
From: Piyal Basu <pbasu235@gmail.com>
Date: Tue, 5 Nov 2024 13:06:05 -0500
Subject: [PATCH 2/2] fixing some more variants

---
 extension/src/popup/components/ErrorBoundary/index.tsx        | 4 ++--
 extension/src/popup/components/WarningMessages/index.tsx      | 4 ++--
 .../popup/components/account/BlockaidAnnouncement/index.tsx   | 2 +-
 .../popup/components/manageAssets/TrustlineError/index.tsx    | 2 +-
 .../src/popup/components/manageNetwork/NetworkForm/index.tsx  | 2 +-
 .../components/sendPayment/SendConfirm/SubmitResult/index.tsx | 2 +-
 .../sendPayment/SendSettings/SettingsFail/index.tsx           | 2 +-
 .../src/popup/components/signAuthEntry/AuthEntry/index.tsx    | 2 +-
 extension/src/popup/views/Account/styles.scss                 | 1 -
 extension/src/popup/views/AdvancedSettings/index.tsx          | 2 +-
 10 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/extension/src/popup/components/ErrorBoundary/index.tsx b/extension/src/popup/components/ErrorBoundary/index.tsx
index c0b75ae39b..b1c50068d1 100644
--- a/extension/src/popup/components/ErrorBoundary/index.tsx
+++ b/extension/src/popup/components/ErrorBoundary/index.tsx
@@ -70,7 +70,7 @@ export const UnhandledError = ({
         {isOnAccount ? (
           <Button
             isFullWidth
-            variant="secondary"
+            variant="tertiary"
             size="md"
             onClick={window.close}
           >
@@ -79,7 +79,7 @@ export const UnhandledError = ({
         ) : (
           <Button
             isFullWidth
-            variant="secondary"
+            variant="tertiary"
             size="md"
             onClick={() => {
               navigateTo(ROUTES.account);
diff --git a/extension/src/popup/components/WarningMessages/index.tsx b/extension/src/popup/components/WarningMessages/index.tsx
index 295124a2a5..8eb4ab0793 100644
--- a/extension/src/popup/components/WarningMessages/index.tsx
+++ b/extension/src/popup/components/WarningMessages/index.tsx
@@ -142,7 +142,7 @@ export const WarningMessage = ({
         <div className="WarningMessage__children-wrapper">{children}</div>
         <Button
           size="md"
-          variant="secondary"
+          variant="tertiary"
           isFullWidth
           type="button"
           onClick={() =>
@@ -1337,7 +1337,7 @@ export const BlockaidWarningModal = ({
             <Button
               data-testid="BlockaidWarningModal__button"
               size="md"
-              variant="secondary"
+              variant="tertiary"
               isFullWidth
               type="button"
               onClick={() =>
diff --git a/extension/src/popup/components/account/BlockaidAnnouncement/index.tsx b/extension/src/popup/components/account/BlockaidAnnouncement/index.tsx
index fc20dce9f4..6ea5598d93 100644
--- a/extension/src/popup/components/account/BlockaidAnnouncement/index.tsx
+++ b/extension/src/popup/components/account/BlockaidAnnouncement/index.tsx
@@ -79,7 +79,7 @@ export const BlockaidAnnouncement = () => {
             <Button
               data-testid="BlockaidAnnouncement__accept"
               size="md"
-              variant="primary"
+              variant="tertiary"
               isFullWidth
               type="button"
               onClick={handleCloseModal}
diff --git a/extension/src/popup/components/manageAssets/TrustlineError/index.tsx b/extension/src/popup/components/manageAssets/TrustlineError/index.tsx
index 7c901d0a38..a1ccbb34bc 100644
--- a/extension/src/popup/components/manageAssets/TrustlineError/index.tsx
+++ b/extension/src/popup/components/manageAssets/TrustlineError/index.tsx
@@ -207,7 +207,7 @@ export const TrustlineError = ({
               <Button
                 size="md"
                 isFullWidth
-                variant="primary"
+                variant="tertiary"
                 onClick={() => {
                   setIsModalShowing(false);
                   if (handleClose) {
diff --git a/extension/src/popup/components/manageNetwork/NetworkForm/index.tsx b/extension/src/popup/components/manageNetwork/NetworkForm/index.tsx
index 52f7091dc0..e294a69840 100644
--- a/extension/src/popup/components/manageNetwork/NetworkForm/index.tsx
+++ b/extension/src/popup/components/manageNetwork/NetworkForm/index.tsx
@@ -203,7 +203,7 @@ export const NetworkForm = ({ isEditing }: NetworkFormProps) => {
       size="md"
       type="button"
       isFullWidth
-      variant="secondary"
+      variant="tertiary"
       onClick={() => {
         setIsNetworkInUse(false);
         setIsNetworkUrlValid(false);
diff --git a/extension/src/popup/components/sendPayment/SendConfirm/SubmitResult/index.tsx b/extension/src/popup/components/sendPayment/SendConfirm/SubmitResult/index.tsx
index 3d4df2fc76..31f6b044a6 100644
--- a/extension/src/popup/components/sendPayment/SendConfirm/SubmitResult/index.tsx
+++ b/extension/src/popup/components/sendPayment/SendConfirm/SubmitResult/index.tsx
@@ -459,7 +459,7 @@ export const SubmitFail = () => {
       <View.Footer>
         <Button
           isFullWidth
-          variant="secondary"
+          variant="tertiary"
           size="md"
           onClick={() => {
             navigateTo(ROUTES.account);
diff --git a/extension/src/popup/components/sendPayment/SendSettings/SettingsFail/index.tsx b/extension/src/popup/components/sendPayment/SendSettings/SettingsFail/index.tsx
index 6960898032..0e208cf3d7 100644
--- a/extension/src/popup/components/sendPayment/SendSettings/SettingsFail/index.tsx
+++ b/extension/src/popup/components/sendPayment/SendSettings/SettingsFail/index.tsx
@@ -41,7 +41,7 @@ export const SettingsFail = () => {
       <View.Footer>
         <Button
           isFullWidth
-          variant="secondary"
+          variant="tertiary"
           size="md"
           onClick={() => {
             dispatch(resetSimulation());
diff --git a/extension/src/popup/components/signAuthEntry/AuthEntry/index.tsx b/extension/src/popup/components/signAuthEntry/AuthEntry/index.tsx
index ca2785f1e3..dcb783216a 100644
--- a/extension/src/popup/components/signAuthEntry/AuthEntry/index.tsx
+++ b/extension/src/popup/components/signAuthEntry/AuthEntry/index.tsx
@@ -85,7 +85,7 @@ const InvalidAuthEntry = ({
         <View.Footer>
           <Button
             isFullWidth
-            variant="secondary"
+            variant="tertiary"
             size="md"
             onClick={rejectAndClose}
           >
diff --git a/extension/src/popup/views/Account/styles.scss b/extension/src/popup/views/Account/styles.scss
index 0bb111f3ea..68eb4fdda4 100644
--- a/extension/src/popup/views/Account/styles.scss
+++ b/extension/src/popup/views/Account/styles.scss
@@ -38,7 +38,6 @@
     button {
       width: 2.5rem;
       height: 2.5rem;
-      border-color: var(--sds-clr-gray-11);
 
       svg {
         stroke: var(--sds-clr-base-01);
diff --git a/extension/src/popup/views/AdvancedSettings/index.tsx b/extension/src/popup/views/AdvancedSettings/index.tsx
index 93a67231d4..66cfa8f3a4 100644
--- a/extension/src/popup/views/AdvancedSettings/index.tsx
+++ b/extension/src/popup/views/AdvancedSettings/index.tsx
@@ -178,7 +178,7 @@ export const AdvancedSettings = () => {
             </Button>
             <Button
               size="md"
-              variant="secondary"
+              variant="tertiary"
               isFullWidth
               onClick={() => history.goBack()}
             >