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

fix: UAT and regression v4.27.0 #3211

Merged
merged 5 commits into from
Apr 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion apps/wallet-mobile/src/Dashboard/EpochProgress.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ const useStyles = () => {
timeBlock: {
...typography['body-1-l-regular'],
...padding['x-xs'],
backgroundColor: color.gray[900],
color: color.gray[900],
marginHorizontal: 4,
borderRadius: 2,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {defineMessages, useIntl} from 'react-intl'
import {ScrollView, StyleSheet, View} from 'react-native'
import {SafeAreaView} from 'react-native-safe-area-context'

import {Button, KeyboardAvoidingView, TextInput} from '../../../components'
import {Button, KeyboardAvoidingView, Spacer, TextInput} from '../../../components'
import globalMessages from '../../../i18n/global-messages'
import {isEmptyString} from '../../../utils/utils'
import {useWalletManager} from '../../../wallet-manager/WalletManagerContext'
Expand Down Expand Up @@ -39,6 +39,8 @@ export const ChangeWalletName = () => {
return (
<SafeAreaView style={styles.safeAreaView} edges={['left', 'right', 'bottom']}>
<KeyboardAvoidingView style={{flex: 1}}>
<Spacer height={40} />

<ScrollView
keyboardDismissMode="on-drag"
keyboardShouldPersistTaps="always"
Expand All @@ -57,6 +59,8 @@ export const ChangeWalletName = () => {
/>
</ScrollView>

<Spacer fill />

<View style={styles.action}>
<Button
onPress={() => {
Expand All @@ -75,20 +79,16 @@ export const ChangeWalletName = () => {

const useStyles = () => {
const {theme} = useTheme()
const {color} = theme
const {padding} = theme
const styles = StyleSheet.create({
safeAreaView: {
backgroundColor: color.gray.min,
flex: 1,
},
scrollContentContainer: {
flex: 1,
paddingHorizontal: 16,
paddingTop: 40,
...padding['x-l'],
},
action: {
paddingHorizontal: 16,
backgroundColor: color.gray.min,
...padding['l'],
},
})
return styles
Expand Down
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ export const RemoveWalletScreen = () => {

return (
<SafeAreaView edges={['left', 'right', 'bottom']} style={styles.container}>
<KeyboardAvoidingView style={{flex: 1}}>
<ScrollView bounces={false} contentContainerStyle={styles.contentContainer}>
<KeyboardAvoidingView style={styles.keyboardAvoider}>
<ScrollView contentContainerStyle={styles.contentContainer} bounces={false}>
<Description>
{!wallet.isHW && <Text style={styles.description}>{strings.descriptionParagraph1}</Text>}

Expand Down Expand Up @@ -66,6 +66,8 @@ export const RemoveWalletScreen = () => {
</WalletInfo>
</ScrollView>

<Spacer fill />

<Actions>
{!wallet.isHW && (
<Checkbox
Expand All @@ -77,15 +79,12 @@ export const RemoveWalletScreen = () => {

<Spacer height={30} />

<View style={styles.buttonContainer}>
<Button
onPress={() => removeWallet()}
title={strings.remove}
style={styles.removeButton}
disabled={disabled}
block
/>
</View>
<Button
onPress={() => removeWallet()}
title={strings.remove}
style={styles.removeButton}
disabled={disabled}
/>
</Actions>
</KeyboardAvoidingView>
</SafeAreaView>
Expand Down Expand Up @@ -155,13 +154,15 @@ const useStrings = () => {

const useStyles = () => {
const {theme} = useTheme()
const {color, typography} = theme
const {color, typography, padding} = theme
const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: color.gray.min,
},

contentContainer: {
...padding['x-l'],
},
descriptionContainer: {
backgroundColor: color.gray.min,
},
Expand All @@ -175,21 +176,15 @@ const useStyles = () => {
walletName: {
...typography['body-1-l-regular'],
},

contentContainer: {
padding: 16,
},

actions: {
padding: 16,
...padding['l'],
},
keyboardAvoider: {
flex: 1,
},
removeButton: {
backgroundColor: color.magenta[500],
},
buttonContainer: {
paddingHorizontal: 16,
paddingBottom: 36,
},
})
return styles
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
"start": {
"line": 100,
"column": 16,
"index": 3378
"index": 3320
},
"end": {
"line": 103,
"column": 3,
"index": 3482
"index": 3424
}
},
{
Expand All @@ -21,12 +21,12 @@
"start": {
"line": 104,
"column": 24,
"index": 3508
"index": 3450
},
"end": {
"line": 107,
"column": 3,
"index": 3620
"index": 3562
}
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -4,104 +4,104 @@
"defaultMessage": "!!!If you wish to permanently delete the wallet make sure you have written down the mnemonic.",
"file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
"start": {
"line": 111,
"line": 106,
"column": 25,
"index": 3540
"index": 3392
},
"end": {
"line": 114,
"line": 109,
"column": 3,
"index": 3734
"index": 3586
}
},
{
"id": "components.settings.removewalletscreen.descriptionParagraph2",
"defaultMessage": "!!!To confirm this operation type the wallet name below.",
"file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
"start": {
"line": 115,
"line": 110,
"column": 25,
"index": 3761
"index": 3613
},
"end": {
"line": 118,
"line": 113,
"column": 3,
"index": 3918
"index": 3770
}
},
{
"id": "components.settings.removewalletscreen.walletName",
"defaultMessage": "!!!Wallet name",
"file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
"start": {
"line": 119,
"line": 114,
"column": 14,
"index": 3934
"index": 3786
},
"end": {
"line": 122,
"line": 117,
"column": 3,
"index": 4038
"index": 3890
}
},
{
"id": "components.settings.removewalletscreen.walletNameInput",
"defaultMessage": "!!!Wallet name",
"file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
"start": {
"line": 123,
"line": 118,
"column": 19,
"index": 4059
"index": 3911
},
"end": {
"line": 126,
"line": 121,
"column": 3,
"index": 4168
"index": 4020
}
},
{
"id": "components.settings.removewalletscreen.walletNameMismatchError",
"defaultMessage": "!!!Wallet name does not match",
"file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
"start": {
"line": 127,
"line": 122,
"column": 27,
"index": 4197
"index": 4049
},
"end": {
"line": 130,
"line": 125,
"column": 3,
"index": 4329
"index": 4181
}
},
{
"id": "components.settings.removewalletscreen.remove",
"defaultMessage": "!!!Remove wallet",
"file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
"start": {
"line": 131,
"line": 126,
"column": 10,
"index": 4341
"index": 4193
},
"end": {
"line": 134,
"line": 129,
"column": 3,
"index": 4443
"index": 4295
}
},
{
"id": "components.settings.removewalletscreen.hasWrittenDownMnemonic",
"defaultMessage": "!!!I have written down mnemonic of this wallet and understand that I cannot recover the wallet without it.",
"file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
"start": {
"line": 135,
"line": 130,
"column": 26,
"index": 4471
"index": 4323
},
"end": {
"line": 139,
"line": 134,
"column": 3,
"index": 4685
"index": 4537
}
}
]
Loading