Skip to content

Commit

Permalink
fix: updated theme colors for hardware wallets
Browse files Browse the repository at this point in the history
  • Loading branch information
nicholaswma committed May 26, 2024
1 parent 3d20972 commit 75b6701
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
1 change: 1 addition & 0 deletions shim.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ declare module "styled-components" {
cardBorder: string;
fail: string;
cardBackground: string;
primaryBtnHover: string;
primaryTextv2: string;
}
}
Expand Down
4 changes: 3 additions & 1 deletion src/components/hardware/HardwareWalletTheme.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ export default function HardwareWalletTheme({

return {
...theme,
theme: hardwareApiTheme
theme: hardwareApiTheme,
primary: "#9AB8FF",
primaryBtnHover: "#6F93E1"
};
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/popup/Navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export const NavigationBar = () => {

const NavigationBarWrapper = styled.div<{ displayTheme: DisplayTheme }>`
z-index: 5;
border-top: 2px solid #8e7bea;
border-top: 2px solid ${(props) => props.theme.primary};
position: fixed;
bottom: 0;
color: white;
Expand Down
9 changes: 3 additions & 6 deletions src/routes/popup/receive.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import copy from "copy-to-clipboard";
import { useEffect, type MouseEventHandler, useState } from "react";
import { PageType, trackPage } from "~utils/analytics";
import HeadV2 from "~components/popup/HeadV2";
import { useTheme } from "~utils/theme";
import { Degraded, WarningWrapper } from "./send";
import { WarningIcon } from "~components/popup/Token";
import { useActiveWallet } from "~wallets/hooks";
Expand All @@ -34,7 +33,6 @@ export default function Receive() {
trackPage(PageType.RECEIVE);
}, []);

const theme = useTheme();
const { setToast } = useToasts();

const wallet = useActiveWallet();
Expand Down Expand Up @@ -72,7 +70,7 @@ export default function Receive() {
)}
<ContentWrapper>
<Section style={{ padding: "8px 15px 0 15px" }}>
<QRCodeWrapper displayTheme={theme}>
<QRCodeWrapper>
<QRCodeSVG
fgColor="#fff"
bgColor="transparent"
Expand Down Expand Up @@ -134,12 +132,11 @@ const CopyAction = styled(CopyIcon)`
}
`;

const QRCodeWrapper = styled.div<{ displayTheme: DisplayTheme }>`
const QRCodeWrapper = styled.div`
display: flex;
justify-content: center;
align-items: center;
background-color: ${(props) =>
props.theme.displayTheme === "light" ? "#7866D3" : "#8E7BEA"};
background-color: ${(props) => props.theme.primary};
border-radius: 21.44px;
padding: 25.83px 0px;
`;
2 changes: 1 addition & 1 deletion src/routes/popup/send/confirm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ const SectionWrapper = styled.div<{ alternate?: boolean }>`
}
:not(:last-child) {
border-bottom: 1px solid #ab9aff;
border-bottom: 1px solid ${(props) => props.theme.primary};
}
`;

Expand Down

0 comments on commit 75b6701

Please sign in to comment.