fix: fontWeight and fullWidth for Wallet manager screen #1473
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Collaborator
There was a problem hiding this comment. StyleSheet usage in this file (pretty big) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,6 +49,8 @@ import { LegacyTertiaryBox } from "../boxes/LegacyTertiaryBox"; | |
| import { CustomPressable } from "../buttons/CustomPressable"; | ||
| import { SpacerColumn, SpacerRow } from "../spacer"; | ||
|
|
||
| import { useTheme } from "@/hooks/useTheme"; | ||
|
|
||
| // TODO: Refacto TextInputCustom. Too much props | ||
|
|
||
| export interface TextInputCustomProps<T extends FieldValues> | ||
|
|
@@ -164,6 +166,7 @@ export const TextInputCustom = <T extends FieldValues>({ | |
| }); | ||
| const inputRef = useRef<TextInput>(null); | ||
| const [hovered, setHovered] = useState(false); | ||
| const theme = useTheme(); | ||
| // Passing ref to parent since I didn't find a pattern to handle generic argument <T extends FieldValues> AND forwardRef | ||
| useEffect(() => { | ||
| if (inputRef.current && setRef) { | ||
|
|
@@ -313,7 +316,11 @@ export const TextInputCustom = <T extends FieldValues>({ | |
| onKeyPress={(event) => handleKeyPress({ event, onPressEnter })} | ||
| placeholderTextColor={neutral77} | ||
| value={field.value} | ||
| style={[ | ||
| { color: theme.textColor }, | ||
| styles.textInput, | ||
| textInputStyle, | ||
| ]} | ||
| {...restProps} | ||
| /> | ||
| </View> | ||
|
|
||
|
Collaborator
There was a problem hiding this comment. StyleSheet usage in this file |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -18,7 +18,11 @@ import { | |||||
| keplrCurrencyFromNativeCurrencyInfo, | ||||||
| } from "../../networks"; | ||||||
| import { neutral77, primaryColor } from "../../utils/style/colors"; | ||||||
| import { | ||||||
| fontRegular13, | ||||||
| fontRegular14, | ||||||
| fontRegular16, | ||||||
| } from "../../utils/style/fonts"; | ||||||
| import { layout } from "../../utils/style/layout"; | ||||||
| import { capitalize, tinyAddress } from "../../utils/text"; | ||||||
| import { BrandText } from "../BrandText"; | ||||||
|
|
@@ -83,7 +87,7 @@ export const DepositWithdrawModal: React.FC<DepositModalProps> = ({ | |||||
| <View style={styles.rowCenter}> | ||||||
| <NetworkIcon networkId={networkId} size={32} /> | ||||||
| <SpacerRow size={3} /> | ||||||
| <BrandText style={[fontRegular16]}> | ||||||
|
||||||
| <BrandText style={[fontRegular16]}> | |
| <BrandText style={fontRegular16}> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,11 @@ import { useIsMobile } from "@/hooks/useIsMobile"; | |
| import { parseUserId } from "@/networks"; | ||
| import { prettyPrice } from "@/utils/coins"; | ||
| import { neutral22, neutral33 } from "@/utils/style/colors"; | ||
| import { | ||
| fontRegular14, | ||
| fontRegular18, | ||
| fontRegular20, | ||
| } from "@/utils/style/fonts"; | ||
|
|
||
| const collapsedCount = 5; | ||
|
|
||
|
|
@@ -81,7 +86,7 @@ export const Assets: React.FC<{ | |
| alignItems: "center", | ||
| }} | ||
| > | ||
| <BrandText style={[fontRegular20, { marginRight: 20 }]}> | ||
| Assets on {network.displayName} | ||
| </BrandText> | ||
| </View> | ||
|
|
@@ -92,13 +97,7 @@ export const Assets: React.FC<{ | |
| alignItems: "center", | ||
| }} | ||
| > | ||
| <BrandText style={[fontRegular14, { marginRight: 16 }]}> | ||
| {expanded ? "Collapse" : "Expand"} All Items | ||
| </BrandText> | ||
| <TouchableOpacity | ||
|
|
@@ -138,43 +137,31 @@ export const Assets: React.FC<{ | |
| paddingVertical: 16, | ||
| }} | ||
| > | ||
| <View style={{ flexDirection: "row", alignItems: "center" }}> | ||
| <CurrencyIcon | ||
| size={isMobile ? 32 : 64} | ||
| networkId={network.id} | ||
| denom={currency.denom} | ||
| /> | ||
| <View style={{ marginLeft: 16 }}> | ||
| <BrandText | ||
| numberOfLines={1} | ||
| style={[fontRegular18, { maxWidth: 600 }]} | ||
| > | ||
| {prettyPrice( | ||
| network.id, | ||
| balance?.amount || "0", | ||
| currency.denom, | ||
| )} | ||
| </BrandText> | ||
| <BrandText style={[fontRegular14, { marginTop: 8 }]}> | ||
| {balance?.usdAmount | ||
| ? `≈ $${balance.usdAmount.toFixed(2)}` | ||
| : " "} | ||
| </BrandText> | ||
| </View> | ||
| </View> | ||
| <View style={{ flexDirection: "row", alignItems: "center" }}> | ||
| {!readOnly && currency.kind === "ibc" && ( | ||
| <> | ||
| {currency.deprecated || ( | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please remove StyleSheet usages when you see that in your changed files