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.

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

879: 𒐪𒐪𒐪𒐪𒐪 #880

Merged
1 commit merged into from
Jan 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export const Container = styled.div`

export const StyledWidgetHeader = styled(WidgetHeader)`
margin-bottom: 0.75rem;
overflow: hidden;
`;

export const StyledActionButtons = styled(ReviewActionButtons)`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const useFormattedTokenAmount = (
decimals?: number
): string | undefined => {
return useMemo(() => {
if (!amount || !decimals) {
if (!amount || decimals === undefined) {
return undefined;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@ import styled from "styled-components/macro";
import { Metadata } from "../../../Typography/Typography";

export const Container = styled.div`
display: flex;
border: 1px solid ${(props) => props.theme.colors.borderGrey};
padding: 1rem;
display: grid;
grid-auto-flow: column;
gap: 1rem;
cursor: pointer;
grid-template-columns: auto minmax(auto, 1fr) 6.25rem;
grid-gap: 1rem;
align-items: center;

&:not(:last-of-type) {
Expand All @@ -25,6 +23,9 @@ export const TextContainer = styled.div`
display: flex;
flex-direction: column;
justify-content: center;
flex-grow: 1;
max-width: calc(100% - 10rem);
overflow: hidden;
`;

export const Symbol = styled.h3`
Expand All @@ -36,7 +37,7 @@ export const Symbol = styled.h3`
export const TokenName = styled.h3`
font-size: 0.8rem;
font-weight: 500;
color: #9e9e9e;
color: ${(props) => props.theme.colors.darkSubText};
line-height: 1rem;
`;

Expand Down
8 changes: 7 additions & 1 deletion src/components/TokenSelect/TokenSelect.styles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import isActiveLanguageLogographic from "../../helpers/isActiveLanguageLogograph
import {
BorderlessButtonStyle,
InputOrButtonBorderStyle,
TextEllipsis,
} from "../../style/mixins";
import AccountLink from "../AccountLink/AccountLink";
import TokenLogo from "../TokenLogo/TokenLogo";
Expand Down Expand Up @@ -167,6 +168,7 @@ export const StyledSelectItem = styled(SelectItem)`
text-align: left;
line-height: 1;
gap: 0.375rem;
max-width: 7rem;
color: ${(props) =>
props.theme.name === "dark"
? props.theme.colors.white
Expand Down Expand Up @@ -260,7 +262,11 @@ const fadeOutWhenInvisible = css<{ $invisible: boolean }>`
opacity: ${(props) => (props.$invisible ? 0 : 1)};
`;

export const StyledSelectButtonContent = styled.span``;
export const StyledSelectButtonContent = styled.span`
${TextEllipsis};

width: calc(100% - 1.125rem);
`;

export const StyledDownArrow = styled(MdKeyboardArrowDown)<{
$invisible: boolean;
Expand Down
4 changes: 4 additions & 0 deletions src/styled-components/ReviewListItem/ReviewListItem.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import styled from "styled-components/macro";

import { TextEllipsis } from "../../style/mixins";

export const ReviewListItem = styled.li`
display: flex;
justify-content: space-between;
Expand All @@ -17,6 +19,8 @@ export const ReviewListItemLabel = styled.div`
`;

export const ReviewListItemValue = styled.div`
${TextEllipsis};

display: flex;
align-items: center;
color: ${(props) => props.theme.colors.white};
Expand Down
Loading