Skip to content

Commit

Permalink
feat(bridge): new deposit confirmation route
Browse files Browse the repository at this point in the history
  • Loading branch information
dohaki committed Oct 31, 2023
1 parent 77c8c8f commit c8fb831
Show file tree
Hide file tree
Showing 47 changed files with 1,632 additions and 817 deletions.
2 changes: 2 additions & 0 deletions src/Routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ const AllTransactions = lazyWithRetry(
const Staking = lazyWithRetry(
() => import(/* webpackChunkName: "RewardStaking" */ "./views/Staking")
);
const DepositStatus = lazyWithRetry(() => import("./views/DepositStatus"));

const warningMessage = `
We noticed that you have connected from a contract address.
Expand Down Expand Up @@ -168,6 +169,7 @@ const Routes: React.FC = () => {
}}
/>
<Route exact path="/bridge" component={Send} />
<Route path="/bridge/:depositTxHash" component={DepositStatus} />
<Route exact path="/" component={Splash} />
</Switch>
</Suspense>
Expand Down
14 changes: 14 additions & 0 deletions src/assets/bg-banners/action-card-teal-banner.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions src/assets/check-star-ring-filled.svg

This file was deleted.

16 changes: 16 additions & 0 deletions src/assets/check-star-ring-opaque-depositing.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions src/assets/check-star-ring-opaque-fill.svg

This file was deleted.

6 changes: 4 additions & 2 deletions src/assets/check-star-ring-opaque-filled.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions src/assets/check-star-ring-opaque-filling.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/check.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions src/assets/loading.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions src/components/Badge/Badge.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import styled from "@emotion/styled";

import { COLORS } from "utils";

export type BadgeColor = keyof typeof COLORS;

type BadgeProps = {
borderColor?: BadgeColor;
textColor?: BadgeColor;
};

export const Badge = styled.div<BadgeProps>`
display: flex;
height: 1.25rem;
padding: 0.5rem 0.3125rem 0.625rem 0.3125rem;
justify-content: center;
align-items: center;
letter-spacing: 0.03rem;
font-variant-numeric: lining-nums tabular-nums;
font-size: 0.75rem;
line-height: normal;
letter-spacing: 0.03rem;
text-transform: uppercase;
border-radius: 0.375rem;
border: 1px solid;
border-color: ${({ borderColor, textColor }) =>
COLORS[borderColor || textColor || "white-100"]};
color: ${({ borderColor, textColor }) =>
COLORS[textColor || borderColor || "white-100"]};
`;
1 change: 1 addition & 0 deletions src/components/Badge/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { Badge } from "./Badge";
1 change: 1 addition & 0 deletions src/components/BreadcrumbV2/BreadcrumbV2.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ const ActiveLink = styled(Link)`

const ActiveLinkText = styled(Text)`
color: #9daab2;
text-transform: capitalize;
`;

const InactiveLink = styled(Text)`
Expand Down
3 changes: 3 additions & 0 deletions src/components/Button/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ type SecondaryButtonProps = BaseButtonProps & {
textColor?: ButtonColor;
borderColor?: ButtonColor;
hoveredBorderColor?: ButtonColor;
backgroundColor?: ButtonColor;
};

const sizeMap: Record<
Expand Down Expand Up @@ -131,6 +132,8 @@ export const SecondaryButton = styled(BaseButton)<SecondaryButtonProps>`
COLORS[textColor || borderColor]};
border: 1px solid;
border-color: ${({ borderColor = "aqua" }) => COLORS[borderColor]};
background-color: ${({ backgroundColor }) =>
backgroundColor ? COLORS[backgroundColor] : "transparent"};
&:hover:not(:disabled) {
border-color: ${({ hoveredBorderColor, borderColor = "aqua" }) =>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Text/Text.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import styled from "@emotion/styled";

import { QUERIESV2, COLORS } from "utils";

type TextSize =
export type TextSize =
| "4xl"
| "3.5xl"
| "3xl"
Expand Down
2 changes: 1 addition & 1 deletion src/components/Text/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export { Text } from "./Text";
export type { TextColor } from "./Text";
export type { TextColor, TextSize } from "./Text";
2 changes: 2 additions & 0 deletions src/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ export { default as Selector } from "./Selector";
export { default as InputWithMaxButton } from "./InputWithMaxButton";
export { Text } from "./Text";
export { WrongNetworkHeader } from "./WrongNetworkHeader";
export { default as CardWrapper } from "./CardWrapper";

export * from "./Button";
export * from "./Badge";
export * from "./ExternalLink";
export * from "./ErrorBoundary";
Loading

0 comments on commit c8fb831

Please sign in to comment.