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

Fix account list scroll #2256

Merged
merged 1 commit into from
Feb 17, 2021
Merged

Fix account list scroll #2256

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 27 additions & 23 deletions app/components/UI/AccountList/AccountElement/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,32 +130,36 @@ class AccountElement extends PureComponent {
) : null;

return (
<TouchableOpacity
style={[styles.account, disabled ? styles.disabledAccount : null]}
key={`account-${address}`}
onPress={this.onPress}
onLongPress={this.onLongPress}
disabled={disabled}
>
<Identicon address={address} diameter={38} />
<View style={styles.accountInfo}>
<View style={styles.accountMain}>
<Text numberOfLines={1} style={[styles.accountLabel]}>
{name}
</Text>
<View style={styles.accountBalanceWrapper}>
<Text style={styles.accountBalance}>
{renderFromWei(updatedBalanceFromStore)} {getTicker(ticker)}
<View onStartShouldSetResponder={() => true}>
<TouchableOpacity
style={[styles.account, disabled ? styles.disabledAccount : null]}
key={`account-${address}`}
onPress={this.onPress}
onLongPress={this.onLongPress}
disabled={disabled}
>
<Identicon address={address} diameter={38} />
<View style={styles.accountInfo}>
<View style={styles.accountMain}>
<Text numberOfLines={1} style={[styles.accountLabel]}>
{name}
</Text>
{!!balanceError && (
<Text style={[styles.accountBalance, styles.accountBalanceError]}>{balanceError}</Text>
)}
<View style={styles.accountBalanceWrapper}>
<Text style={styles.accountBalance}>
{renderFromWei(updatedBalanceFromStore)} {getTicker(ticker)}
</Text>
{!!balanceError && (
<Text style={[styles.accountBalance, styles.accountBalanceError]}>
{balanceError}
</Text>
)}
</View>
</View>
{!!imported && <View style={styles.importedView}>{imported}</View>}
<View style={styles.selectedWrapper}>{selected}</View>
</View>
{!!imported && <View style={styles.importedView}>{imported}</View>}
<View style={styles.selectedWrapper}>{selected}</View>
</View>
</TouchableOpacity>
</TouchableOpacity>
</View>
);
}
}
Expand Down