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.

Sign up for GitHub

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

Small GUI Fixes #4747

Merged
merged 3 commits into from
Jan 23, 2024
Merged

Small GUI Fixes #4747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1782e90
Change "Next"->"Done" on ManageTokensScene
Jon-edge Jan 23, 2024
bb4a80d
Update Synchronizing->Syncing...
Jon-edge Jan 23, 2024
c8b47db
Fix Copy Icon Visibility
Jon-edge Jan 23, 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
2 changes: 1 addition & 1 deletion src/__tests__/components/__snapshots__/TransactionListRow.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ exports[`TransactionListRow should render with loading props 1`] = `
]
}
>
Synchronizing
Syncing...
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this snapshot change goes with the previous commit.

</Text>
<Text
adjustsFontSizeToFit={true}
Expand Down
260 changes: 260 additions & 0 deletions src/__tests__/scenes/__snapshots__/TransactionDetailsScene.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -955,6 +955,71 @@ exports[`TransactionDetailsScene should render 1`] = `
this is the txid
</Text>
</View>
<View
accessibilityState={
{
"busy": undefined,
"checked": undefined,
"disabled": undefined,
"expanded": undefined,
"selected": undefined,
}
}
accessibilityValue={
{
"max": undefined,
"min": undefined,
"now": undefined,
"text": undefined,
}
}
accessible={false}
collapsable={false}
focusable={true}
onClick={[Function]}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
onResponderTerminate={[Function]}
onResponderTerminationRequest={[Function]}
onStartShouldSetResponder={[Function]}
style={
{
"alignItems": "flex-end",
"height": "100%",
"justifyContent": "center",
"opacity": 1,
"position": "absolute",
"right": 0,
"width": "100%",
}
}
>
<Text
allowFontScaling={false}
style={
[
{
"color": undefined,
"fontSize": 22,
},
{
"color": "#00f1a2",
"marginLeft": 11,
"textAlign": "center",
},
{
"fontFamily": "FontAwesome",
"fontStyle": "normal",
"fontWeight": "normal",
},
{},
]
}
>
</Text>
</View>
</View>
</View>
</View>
Expand Down Expand Up @@ -1551,6 +1616,71 @@ exports[`TransactionDetailsScene should render 1`] = `
this is a signed tx
</Text>
</View>
<View
accessibilityState={
{
"busy": undefined,
"checked": undefined,
"disabled": undefined,
"expanded": undefined,
"selected": undefined,
}
}
accessibilityValue={
{
"max": undefined,
"min": undefined,
"now": undefined,
"text": undefined,
}
}
accessible={false}
collapsable={false}
focusable={true}
onClick={[Function]}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
onResponderTerminate={[Function]}
onResponderTerminationRequest={[Function]}
onStartShouldSetResponder={[Function]}
style={
{
"alignItems": "flex-end",
"height": "100%",
"justifyContent": "center",
"opacity": 1,
"position": "absolute",
"right": 0,
"width": "100%",
}
}
>
<Text
allowFontScaling={false}
style={
[
{
"color": undefined,
"fontSize": 22,
},
{
"color": "#00f1a2",
"marginLeft": 11,
"textAlign": "center",
},
{
"fontFamily": "FontAwesome",
"fontStyle": "normal",
"fontWeight": "normal",
},
{},
]
}
>
</Text>
</View>
</View>
</View>
</View>
Expand Down Expand Up @@ -2675,6 +2805,71 @@ exports[`TransactionDetailsScene should render with negative nativeAmount and fi
this is the txid
</Text>
</View>
<View
accessibilityState={
{
"busy": undefined,
"checked": undefined,
"disabled": undefined,
"expanded": undefined,
"selected": undefined,
}
}
accessibilityValue={
{
"max": undefined,
"min": undefined,
"now": undefined,
"text": undefined,
}
}
accessible={false}
collapsable={false}
focusable={true}
onClick={[Function]}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
onResponderTerminate={[Function]}
onResponderTerminationRequest={[Function]}
onStartShouldSetResponder={[Function]}
style={
{
"alignItems": "flex-end",
"height": "100%",
"justifyContent": "center",
"opacity": 1,
"position": "absolute",
"right": 0,
"width": "100%",
}
}
>
<Text
allowFontScaling={false}
style={
[
{
"color": undefined,
"fontSize": 22,
},
{
"color": "#00f1a2",
"marginLeft": 11,
"textAlign": "center",
},
{
"fontFamily": "FontAwesome",
"fontStyle": "normal",
"fontWeight": "normal",
},
{},
]
}
>
</Text>
</View>
</View>
</View>
</View>
Expand Down Expand Up @@ -3271,6 +3466,71 @@ exports[`TransactionDetailsScene should render with negative nativeAmount and fi
this is a signed tx
</Text>
</View>
<View
accessibilityState={
{
"busy": undefined,
"checked": undefined,
"disabled": undefined,
"expanded": undefined,
"selected": undefined,
}
}
accessibilityValue={
{
"max": undefined,
"min": undefined,
"now": undefined,
"text": undefined,
}
}
accessible={false}
collapsable={false}
focusable={true}
onClick={[Function]}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
onResponderTerminate={[Function]}
onResponderTerminationRequest={[Function]}
onStartShouldSetResponder={[Function]}
style={
{
"alignItems": "flex-end",
"height": "100%",
"justifyContent": "center",
"opacity": 1,
"position": "absolute",
"right": 0,
"width": "100%",
}
}
>
<Text
allowFontScaling={false}
style={
[
{
"color": undefined,
"fontSize": 22,
},
{
"color": "#00f1a2",
"marginLeft": 11,
"textAlign": "center",
},
{
"fontFamily": "FontAwesome",
"fontStyle": "normal",
"fontWeight": "normal",
},
{},
]
}
>
</Text>
</View>
</View>
</View>
</View>
Expand Down
7 changes: 3 additions & 4 deletions src/components/scenes/ManageTokensScene.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,12 @@ function ManageTokensSceneComponent(props: Props) {
{!isCustomTokensSupported ? null : (
<>
<DividerLine marginRem={[0, 1]} />
{/* TODO: Remove extra padding in ThemedModal so we don't need to compensate margins with this View */}
{/* TODO: Create a layout enum in ButtonsViewUi4 for this persistent button area */}
<View style={styles.buttonsContainer}>
<ButtonsViewUi4
primary={{ label: lstrings.string_next_capitalized, onPress: navigation.goBack }}
primary={{ label: lstrings.string_done_cap, onPress: navigation.goBack }}
secondary={{ label: lstrings.addtoken_add, onPress: handleAdd }}
layout="column"
sceneMargin
/>
</View>
</>
Expand All @@ -155,7 +154,7 @@ function ManageTokensSceneComponent(props: Props) {
const keyExtractor = (tokenId: string) => tokenId

const getStyles = cacheStyles((theme: Theme) => ({
buttonsContainer: { marginHorizontal: theme.rem(0.5) },
buttonsContainer: { marginTop: theme.rem(1), marginBottom: theme.rem(1) },
rightIcon: {
color: theme.iconTappable,
marginRight: theme.rem(1)
Expand Down
6 changes: 4 additions & 2 deletions src/components/ui4/RowUi4.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export const RowUi4 = (props: Props) => {
</View>
{
// If right action icon button is visible, only the icon dims on row tap
isTappable && rightButtonVisible ? (
rightButtonVisible ? (
<TouchableOpacity style={styles.tappableIconContainer} accessible={false} onPress={handlePress} onLongPress={handleLongPress} disabled={loading}>
{rightButtonType === 'touchable' ? <FontAwesome5 name="chevron-right" style={styles.tappableIcon} size={theme.rem(1)} /> : null}
{rightButtonType === 'editable' ? <FontAwesomeIcon name="edit" style={styles.tappableIcon} size={theme.rem(1)} /> : null}
Expand All @@ -111,7 +111,9 @@ export const RowUi4 = (props: Props) => {
</>
)

// The entire row dims on tap if not handled by the right action icon button
// The entire row dims on tap if not handled by the right action icon button.
// TODO: If a right button is specified, onPress/onLogPress is ignored! Refine
// API and possibly restructure JSX.
return isTappable && !rightButtonVisible ? (
<TouchableOpacity style={[styles.container, margin]} accessible={false} onPress={handlePress} onLongPress={handleLongPress} disabled={loading}>
{content}
Expand Down
2 changes: 1 addition & 1 deletion src/locales/en_US.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ const strings = {
fragment_transaction_transfer: 'Transfer',
fragment_wallet_unconfirmed: 'Pending',
fragment_transaction_list_tx_dropped: 'Dropped',
fragment_transaction_list_tx_synchronizing: 'Synchronizing',
fragment_transaction_list_tx_synchronizing: 'Syncing...',
fragment_transaction_list_confirmation_progress: '%s of %s Confirmations',
fragment_transaction_list_unconfirmed_rbf: 'Awaiting confirmation, may be cancelled',
fragment_transaction_list_transaction: 'Transactions',
Expand Down
2 changes: 1 addition & 1 deletion src/locales/strings/enUS.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
"fragment_transaction_transfer": "Transfer",
"fragment_wallet_unconfirmed": "Pending",
"fragment_transaction_list_tx_dropped": "Dropped",
"fragment_transaction_list_tx_synchronizing": "Synchronizing",
"fragment_transaction_list_tx_synchronizing": "Synchronizing...",
"fragment_transaction_list_confirmation_progress": "%s of %s Confirmations",
"fragment_transaction_list_unconfirmed_rbf": "Awaiting confirmation, may be cancelled",
"fragment_transaction_list_transaction": "Transactions",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/strings/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
"fragment_transaction_transfer": "Transferir",
"fragment_wallet_unconfirmed": "Pendiente",
"fragment_transaction_list_tx_dropped": "Descartado",
"fragment_transaction_list_tx_synchronizing": "Sincronizando",
"fragment_transaction_list_tx_synchronizing": "Sincronizando...",
"fragment_transaction_list_confirmation_progress": "%s de %s confirmaciones",
"fragment_transaction_list_unconfirmed_rbf": "Esperando confirmación, puede ser cancelado",
"fragment_transaction_list_transaction": "Transacciones",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/strings/esMX.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
"fragment_transaction_transfer": "Transferir",
"fragment_wallet_unconfirmed": "Pendiente",
"fragment_transaction_list_tx_dropped": "Descartado",
"fragment_transaction_list_tx_synchronizing": "Sincronizando",
"fragment_transaction_list_tx_synchronizing": "Sincronizando...",
"fragment_transaction_list_confirmation_progress": "%s de %s confirmaciones",
"fragment_transaction_list_unconfirmed_rbf": "Esperando confirmación, puede ser cancelado",
"fragment_transaction_list_transaction": "Transacciones",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/strings/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
"fragment_transaction_transfer": "Transférer",
"fragment_wallet_unconfirmed": "En cours",
"fragment_transaction_list_tx_dropped": "Non retenu",
"fragment_transaction_list_tx_synchronizing": "Synchronisation",
"fragment_transaction_list_tx_synchronizing": "Synchronisation...",
"fragment_transaction_list_confirmation_progress": "%s sur %s Confirmations",
"fragment_transaction_list_unconfirmed_rbf": "Awaiting confirmation, may be cancelled",
"fragment_transaction_list_transaction": "Transactions",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/strings/ja.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
"fragment_transaction_transfer": "送る",
"fragment_wallet_unconfirmed": "保留中",
"fragment_transaction_list_tx_dropped": "ドロップ",
"fragment_transaction_list_tx_synchronizing": "同期中",
"fragment_transaction_list_tx_synchronizing": "同期中\u2026",
"fragment_transaction_list_confirmation_progress": "%s/%s確認",
"fragment_transaction_list_unconfirmed_rbf": "確認待ちです。キャンセルされることがあります。",
"fragment_transaction_list_transaction": "トランザクション",
Expand Down
Loading
Loading