arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2025-07-14 10:38:16 +00:00
Code Issues Releases Wiki Activity

Merge pull request #315 from trezor/fix/huge-fee-overflow

Browse Source 
Fix fee label overflow
This commit is contained in:
Vladimir Volek 2019-01-09 14:22:07 +01:00 committed by GitHub
commit 5416baa358
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/views/Wallet/views/Account/Send/ethereum/index.js
View File

@ -87,6 +87,20 @@ const FeeOptionWrapper = styled.div`
justify-content: space-between; justify-content: space-between;
`; `;
const OptionValue = styled(P)`
flex: 1 0 auto;
min-width: 70px;
margin-right: 5px;
`;
const OptionLabel = styled(P)`
flex: 0 1 auto;
overflow: hidden;
text-overflow: ellipsis;
text-align: right;
word-break: break-all;
`;
const FeeLabelWrapper = styled.div` const FeeLabelWrapper = styled.div`
display: flex; display: flex;
align-items: center; align-items: center;
@ -348,8 +362,8 @@ const AccountSend = (props: Props) => {
options={feeLevels} options={feeLevels}
formatOptionLabel={option => ( formatOptionLabel={option => (
<FeeOptionWrapper> <FeeOptionWrapper>
<P>{option.value}</P> <OptionValue>{option.value}</OptionValue>
<P>{option.label}</P> <OptionLabel>{option.label}</OptionLabel>
</FeeOptionWrapper> </FeeOptionWrapper>
)} )}
/> />

18
src/views/Wallet/views/Account/Send/ripple/index.js
View File

@ -74,6 +74,20 @@ const FeeOptionWrapper = styled.div`
justify-content: space-between; justify-content: space-between;
`; `;
const OptionValue = styled(P)`
flex: 1 0 auto;
min-width: 70px;
margin-right: 5px;
`;
const OptionLabel = styled(P)`
flex: 0 1 auto;
overflow: hidden;
text-overflow: ellipsis;
text-align: right;
word-break: break-all;
`;
const FeeLabelWrapper = styled.div` const FeeLabelWrapper = styled.div`
display: flex; display: flex;
align-items: center; align-items: center;
@ -302,8 +316,8 @@ const AccountSend = (props: Props) => {
options={feeLevels} options={feeLevels}
formatOptionLabel={option => ( formatOptionLabel={option => (
<FeeOptionWrapper> <FeeOptionWrapper>
<P>{option.value}</P> <OptionValue>{option.value}</OptionValue>
<P>{option.label}</P> <OptionLabel>{option.label}</OptionLabel>
</FeeOptionWrapper> </FeeOptionWrapper>
)} )}
/> />