Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

adjust button color and fix bad merge #1616

Merged
merged 2 commits into from
Nov 5, 2024
Merged

adjust button color and fix bad merge #1616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a380281
adjust button color and fix bad merge
piyalbasu Nov 5, 2024
a2b66da
fixing some more variants
piyalbasu Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions extension/src/popup/components/ErrorBoundary/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export const UnhandledError = ({
{isOnAccount ? (
<Button
isFullWidth
variant="secondary"
variant="tertiary"
size="md"
onClick={window.close}
>
Expand All @@ -79,7 +79,7 @@ export const UnhandledError = ({
) : (
<Button
isFullWidth
variant="secondary"
variant="tertiary"
size="md"
onClick={() => {
navigateTo(ROUTES.account);
Expand Down
4 changes: 2 additions & 2 deletions extension/src/popup/components/WarningMessages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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={() =>
Expand Down Expand Up @@ -1337,7 +1337,7 @@ export const BlockaidWarningModal = ({
<Button
data-testid="BlockaidWarningModal__button"
size="md"
variant="secondary"
variant="tertiary"
isFullWidth
type="button"
onClick={() =>
Expand Down
2 changes: 1 addition & 1 deletion extension/src/popup/components/account/BlockaidAnnouncement/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const BlockaidAnnouncement = () => {
<Button
data-testid="BlockaidAnnouncement__accept"
size="md"
variant="primary"
variant="tertiary"
isFullWidth
type="button"
onClick={handleCloseModal}
Expand Down
2 changes: 1 addition & 1 deletion extension/src/popup/components/manageAssets/TrustlineError/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ export const TrustlineError = ({
<Button
size="md"
isFullWidth
variant="primary"
variant="tertiary"
onClick={() => {
setIsModalShowing(false);
if (handleClose) {
Expand Down
2 changes: 1 addition & 1 deletion extension/src/popup/components/manageNetwork/NetworkForm/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ export const NetworkForm = ({ isEditing }: NetworkFormProps) => {
size="md"
type="button"
isFullWidth
variant="secondary"
variant="tertiary"
onClick={() => {
setIsNetworkInUse(false);
setIsNetworkUrlValid(false);
Expand Down
6 changes: 3 additions & 3 deletions extension/src/popup/components/sendPayment/SendConfirm/SubmitResult/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,15 +242,15 @@ export const SubmitSuccess = ({ viewDetails }: { viewDetails: () => void }) => {
<View.Footer isInline>
<Button
size="md"
variant="secondary"
variant="tertiary"
onClick={() => viewDetails()}
data-testid="SubmitResultDetailsButton"
>
{t("Details")}
</Button>
<Button
size="md"
variant="primary"
variant="secondary"
onClick={() => {
navigateTo(ROUTES.account);
}}
Expand Down Expand Up @@ -459,7 +459,7 @@ export const SubmitFail = () => {
<View.Footer>
<Button
isFullWidth
variant="secondary"
variant="tertiary"
size="md"
onClick={() => {
navigateTo(ROUTES.account);
Expand Down
2 changes: 1 addition & 1 deletion extension/src/popup/components/sendPayment/SendConfirm/TransactionDetails/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ export const TransactionDetails = ({
<Button
size="md"
isFullWidth
variant="secondary"
variant="tertiary"
onClick={() =>
openTab(
`${getStellarExpertUrl(networkDetails)}/tx/${transactionHash}`,
Expand Down
2 changes: 1 addition & 1 deletion extension/src/popup/components/sendPayment/SendSettings/SettingsFail/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const SettingsFail = () => {
<View.Footer>
<Button
isFullWidth
variant="secondary"
variant="tertiary"
size="md"
onClick={() => {
dispatch(resetSimulation());
Expand Down
2 changes: 1 addition & 1 deletion extension/src/popup/components/signAuthEntry/AuthEntry/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const InvalidAuthEntry = ({
<View.Footer>
<Button
isFullWidth
variant="secondary"
variant="tertiary"
size="md"
onClick={rejectAndClose}
>
Expand Down
23 changes: 1 addition & 22 deletions extension/src/popup/views/Account/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, { useState, useEffect } from "react";
import { useDispatch, useSelector } from "react-redux";
import {
Button,
CopyText,
Icon,
NavButton,
Expand Down Expand Up @@ -34,8 +33,6 @@ import {
transactionSubmissionSelector,
resetSubmission,
resetAccountBalanceStatus,
saveAssetSelectType,
AssetSelectType,
getAccountBalances,
getSoroswapTokens,
} from "popup/ducks/transactionSubmission";
Expand Down Expand Up @@ -183,25 +180,7 @@ export const Account = () => {
setLoading={setLoading}
/>
{/* <BlockaidAnnouncement /> */}
<View.Content
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks like it was a result of a bad merge. This button now appears in the ... dropdown on Account

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yup that was my mistake, thanks!

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">
Expand Down
3 changes: 1 addition & 2 deletions extension/src/popup/views/Account/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,12 @@
button {
width: 2.5rem;
height: 2.5rem;
border-color: var(--sds-clr-gray-11);

svg {
stroke: var(--sds-clr-base-01);
width: 1rem;
height: 1rem;
stroke: var(--sds-clr-gray-11);
stroke: var(--sds-clr-gray-12);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixing the button color of the Send and ... buttons on Account

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screenshot 2024-11-05 at 10 45 41 AM

Hmm gray-11 loooks like this for me 🤔

}
}
}
Expand Down
2 changes: 1 addition & 1 deletion extension/src/popup/views/AdvancedSettings/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ export const AdvancedSettings = () => {
</Button>
<Button
size="md"
variant="secondary"
variant="tertiary"
isFullWidth
onClick={() => history.goBack()}
>
Expand Down
2 changes: 1 addition & 1 deletion extension/src/popup/views/DisplayBackupPhrase/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export const DisplayBackupPhrase = () => {
<Button
size="md"
isFullWidth
variant="primary"
variant="tertiary"
onClick={() => navigateTo(ROUTES.account)}
>
{t("Done")}
Expand Down
8 changes: 4 additions & 4 deletions extension/src/popup/views/SignTransaction/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ export const SignTransaction = () => {
<Button
isFullWidth
size="md"
variant="secondary"
variant="tertiary"
onClick={() => rejectAndClose()}
>
{t("Reject")}
Expand All @@ -421,15 +421,15 @@ export const SignTransaction = () => {
<Button
isFullWidth
size="md"
variant="secondary"
variant="tertiary"
onClick={() => rejectAndClose()}
>
{t("Cancel")}
</Button>
{needsReviewAuth ? (
<Button
disabled={isSubmitDisabled}
variant="tertiary"
variant="secondary"
isFullWidth
size="md"
isLoading={isConfirming}
Expand All @@ -452,7 +452,7 @@ export const SignTransaction = () => {
) : (
<Button
disabled={isSubmitDisabled}
variant="tertiary"
variant="secondary"
isFullWidth
size="md"
isLoading={isConfirming}
Expand Down
2 changes: 1 addition & 1 deletion extension/src/popup/views/UnlockAccount/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export const UnlockAccount = () => {
<Button
size="md"
isFullWidth
variant="tertiary"
variant="secondary"
type="submit"
isLoading={isSubmitting}
disabled={!(dirty && isValid)}
Expand Down