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

Rebranding UI fixes #358

Merged
merged 43 commits into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
d4f1e9e
fix: main page ui
AbbasAliLokhandwala May 10, 2024
32b840b
fix: card background ui
AbbasAliLokhandwala May 10, 2024
cc62099
fix: dropdown ui
AbbasAliLokhandwala May 10, 2024
9e1ec26
fix: rename account ui
AbbasAliLokhandwala May 10, 2024
d4033c6
fix: tab ui and bottom nav icons
AbbasAliLokhandwala May 10, 2024
a646e71
fix: bottom nav removed from more options
AbbasAliLokhandwala May 10, 2024
7e655a7
chore: add no-address page in address book
AbbasAliLokhandwala May 10, 2024
b033f49
fix: mnemonics ui
AbbasAliLokhandwala May 10, 2024
4d55ba7
fix: activity filter ui
AbbasAliLokhandwala May 13, 2024
957262c
fix: register mnemonics ui
AbbasAliLokhandwala May 13, 2024
019b892
fix: ibc and notiffication ui
AbbasAliLokhandwala May 13, 2024
f15b467
fix: form components ui
AbbasAliLokhandwala May 13, 2024
c425b80
fix: review changes
AbbasAliLokhandwala May 16, 2024
ae0df1c
chore: font family update to Lexand
AbbasAliLokhandwala May 16, 2024
5420899
fix: delete page ui
AbbasAliLokhandwala May 16, 2024
52473a1
fix: form components ui
AbbasAliLokhandwala May 16, 2024
ffc8d25
fix: transaction status ui
AbbasAliLokhandwala May 16, 2024
8b35c72
fix: line graph ui
AbbasAliLokhandwala May 16, 2024
31546da
fix: register page ui
AbbasAliLokhandwala May 16, 2024
3a4aaa7
fix: send page ui
AbbasAliLokhandwala May 16, 2024
03ba850
fix: minor ui fixes
AbbasAliLokhandwala May 16, 2024
9aba137
fix: choose recipient and address book ui
AbbasAliLokhandwala May 16, 2024
fd73a18
fix: asset view ui
AbbasAliLokhandwala May 16, 2024
97b940d
fix: more page components ui
AbbasAliLokhandwala May 16, 2024
8839f70
fix: minor ui bugs
AbbasAliLokhandwala May 16, 2024
47ccdc9
fix: bridge pages shifted to old ui
AbbasAliLokhandwala May 16, 2024
3baf46b
fix: ibc transfer ui
AbbasAliLokhandwala May 17, 2024
3f6a087
fix: bottom nav removed from connections and get-chain-infos
AbbasAliLokhandwala May 17, 2024
508e6e2
fix: register mnemonic button
AbbasAliLokhandwala May 17, 2024
adca314
fix: add ibc page
AbbasAliLokhandwala May 19, 2024
65eceec
fix: bridge page and ui bugs
AbbasAliLokhandwala May 19, 2024
c7ebc91
fix: delete wallet ui
AbbasAliLokhandwala May 21, 2024
3d2e22e
fix: autolock and currency ui
AbbasAliLokhandwala May 21, 2024
357ee15
fix: send page ui
AbbasAliLokhandwala May 21, 2024
2739cbd
chore: search bar in choose recipient
AbbasAliLokhandwala May 21, 2024
0a4f63d
fix: minor ui fixes
AbbasAliLokhandwala May 21, 2024
3f32b3c
chore: faded bottom nav
AbbasAliLokhandwala May 21, 2024
8773811
fix: header ui
AbbasAliLokhandwala May 21, 2024
f207547
fix: address tooltip
AbbasAliLokhandwala May 21, 2024
5c192a2
fix: view mnemonic seed ui
AbbasAliLokhandwala May 21, 2024
a8cc254
fix: header and view-mnemonic ui
AbbasAliLokhandwala May 22, 2024
e899ae7
fix: search bar logic
AbbasAliLokhandwala May 22, 2024
08e3f3c
fix: old header background
AbbasAliLokhandwala May 22, 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
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.btn {
color: var(--Indigo-Indigo-900---Fetch-navy, #000d3d);
font-family: Lexend;
font-size: 15px;
font-size: 16px;
border-radius: 100px;
margin-top: 18px;
border: none;
Expand Down
15 changes: 13 additions & 2 deletions packages/fetch-extension/src/components-v2/card/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ export interface CardProps {
isActive?: boolean;
style?: any;
subheadingStyle?: any;
headingStyle?: any;
onClick?: any;
rightContentOnClick?: any;
rightContentStyle?: any;
inActiveBackground?: any;
}

export const Card: React.FC<CardProps> = ({
Expand All @@ -25,11 +27,17 @@ export const Card: React.FC<CardProps> = ({
isActive,
style,
subheadingStyle,
headingStyle,
onClick,
rightContentOnClick,
inActiveBackground,
}) => {
const containerStyle: React.CSSProperties = {
backgroundColor: isActive ? "var(--Indigo---Fetch, #5F38FB)" : "",
backgroundColor: isActive
? "var(--Indigo---Fetch, #5F38FB)"
: inActiveBackground
? inActiveBackground
: "rgba(255,255,255,0.1)",
cursor: onClick || rightContentOnClick ? "pointer" : "default",
...style,
};
Expand Down Expand Up @@ -63,7 +71,10 @@ export const Card: React.FC<CardProps> = ({
}}
>
<div className={styles["middleSection"]}>
<div className={`${styles["heading"]} ${styles["wordBreak"]}`}>
<div
style={{ ...headingStyle }}
className={`${styles["heading"]} ${styles["wordBreak"]}`}
>
{heading}
</div>
{subheading && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@
display: flex;
align-items: center;
color: white;
padding: 12px 18px;
padding: 18px 12px;
font-size: 14px;
border-radius: 12px;
cursor: pointer;
margin-bottom: 2px;
margin-bottom: 6px;
// height: 60px;
}
.cardContainer:hover {
background: rgba(255, 255, 255, 0.1);
}
.heading {
word-break: break-all;
font-weight: bold;
font-weight: 400;
font-size: 14px;
}
.subHeading {
font-size: 12px;
Expand All @@ -25,20 +27,21 @@
gap: 6px;
}
.leftImage {
width: 26px;
width: 24px;
height: 24px;
margin-right: 12px;
border-radius: 1000px;
display: flex;
justify-content: center;
align-items: center;
background: rgba(255, 255, 255, 0.1);
padding: 2px;
}

.rightImage {
width: 14px;
height: 16px;
}
.rightText {
font-weight: bold;
font-weight: 400;
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const Dropdown: React.FC<DropdownProps> = ({
closeClicked();
setIsOpen(false);
}}
src={require("@assets/svg/wireframe/close.svg")}
src={require("@assets/svg/wireframe/xmark.svg")}
/>
)}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.overlay {
overflow: hidden;
width: 100%;
height: 200%;
height: 150%;
background: rgba(39, 14, 141, 0.8);
position: absolute;
top: -360px;
Expand Down Expand Up @@ -32,7 +32,8 @@
display: flex;
justify-content: space-between;
padding: 0px 12px;
font-weight: bold;
font-weight: 500;
font-size: 16px;
align-items: center;
margin-bottom: 24px;
}
Expand All @@ -41,4 +42,7 @@
cursor: pointer;
width: 32px;
height: 32px;
padding: 8px;
border-radius: 100%;
border: 1px solid rgba(255, 255, 255, 0.2);
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
background: transparent !important;
border: none;
color: white !important;
font-weight: bold;
font-weight: 400;
}
}
.input::placeholder {
color: white;
color: rgba(255, 255, 255, 0.6);
opacity: 1 !important;
}
.addressBookButton {
Expand Down Expand Up @@ -80,5 +80,5 @@
font-weight: 400;
line-height: 24px;
opacity: 0.6;
margin-bottom: 2px;
margin-bottom: 8px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,13 @@ export const AddressInput: FunctionComponent<AddressInputProps> = observer(
style={{
background: "rgba(255, 255, 255, 0.1)",
color: "rgba(255, 255, 255, 0.6)",
padding: "12px 18px",
marginBottom: "16px",
}}
heading={""}
subheading={
<input
style={{ color: "white", fontWeight: "bold", width: "190px" }}
style={{ color: "white", fontWeight: 400, width: "258px" }}
placeholder="Wallet Address"
id={inputId}
className={styleAddressInput["input"]}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
gap: 8px;
}
.input-error {
color: #f36b6b;
color: var(--Red-Red-400, #f36b6b);
}
.input::placeholder {
color: white !important;
Expand Down Expand Up @@ -93,7 +93,7 @@ input::-webkit-inner-spin-button {

background: white;
text-align: left;
font-weight: normal;
font-weight: 400;
}

:global(.dropdown-toggle) {
Expand Down Expand Up @@ -138,11 +138,15 @@ input::-webkit-inner-spin-button {
border: 1px solid rgba(255, 255, 255, 0.4);
display: flex;
align-items: center;
font-size: 14px;
font-size: 12px;
margin: 0px;
gap: 3px;
gap: 8px;
color: white;
padding: 6px 24px;
font-weight: 400;
height: 48px;
}

.widgetButton:focus {
margin: 0px;
}
Expand All @@ -153,7 +157,7 @@ input::-webkit-inner-spin-button {
}
.balance {
float: right;
font-weight: normal;
font-weight: 400;
color: #555555;

&.clickable {
Expand All @@ -171,13 +175,13 @@ input::-webkit-inner-spin-button {
}
.errorText {
margin-top: 8px;
color: #fb8c72;
color: var(--Red-Red-400, #f36b6b);
font-size: 14px;
}

.right-widgets {
gap: 4px;
font-size: 14px;
gap: 8px;
font-size: 12px;
display: flex;
align-items: center;
justify-content: space-between;
Expand Down
23 changes: 16 additions & 7 deletions packages/fetch-extension/src/components-v2/form/coin-input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React, { FunctionComponent, useEffect, useMemo, useState } from "react";
import classnames from "classnames";
import styleCoinInput from "./coin-input.module.scss";

import { Button, FormGroup, Label } from "reactstrap";
import { FormGroup, Label } from "reactstrap";
import { observer } from "mobx-react-lite";
import {
EmptyAmountError,
Expand Down Expand Up @@ -174,17 +174,17 @@ export const CoinInput: FunctionComponent<CoinInputProps> = observer(
) : null}
</div>
<div className={styleCoinInput["right-widgets"]}>
<Button
<button
style={{ margin: "0px" }}
className={styleCoinInput["widgetButton"]}
onClick={isClicked}
disabled
>
<img src={require("@assets/svg/wireframe/chevron.svg")} alt="" />
Change to USD
</Button>
</button>
{!disableAllBalance ? (
<Button
<button
style={{ margin: "0px" }}
className={styleCoinInput["widgetButton"]}
onClick={(e) => {
Expand All @@ -193,7 +193,7 @@ export const CoinInput: FunctionComponent<CoinInputProps> = observer(
}}
>
Use max available
</Button>
</button>
) : null}
</div>
</FormGroup>
Expand Down Expand Up @@ -263,12 +263,21 @@ export const TokenSelectorDropdown: React.FC<TokenDropdownProps> = ({
Asset
</Label>
<Card
style={{ backgroundColor: "rgba(255,255,255,0.1)" }}
style={{
backgroundColor: "rgba(255,255,255,0.1)",
padding: "12px 18px",
marginBottom: "0px",
}}
onClick={() => setIsOpenTokenSelector(!isOpenTokenSelector)}
heading={<div>{amountConfig.sendCurrency.coinDenom}</div>}
rightContent={require("@assets/svg/wireframe/chevron-down.svg")}
subheading={
<div>
<div
style={{
color: "rgba(255,255,255,0.6)",
fontSize: "12px",
}}
>
{" "}
{`Available: ${balance.shrink(true).maxDecimals(6).toString()} `}
{inputInUsd && `(${inputInUsd} USD)`}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ $border-radius: 6px;
}

.title {
font-weight: bold;
font-weight: 500;
}

.fiat {
Expand All @@ -52,7 +52,7 @@ $border-radius: 6px;

background: white;
text-align: left;
font-weight: normal;
font-weight: 400;
}

:global(.dropdown-toggle) {
Expand Down Expand Up @@ -89,10 +89,12 @@ $border-radius: 6px;
background: rgba(255, 255, 255, 0.2);
display: flex;
height: 32px;
padding: 6px 18px;
padding: 6px 12px;
justify-content: center;
align-items: center;
gap: 8px;
font-size: 14px;
font-weight: 400;
}
.advanced-button:hover {
background: rgba(255, 255, 255, 0.2);
Expand Down
Loading
Loading