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

Jump to bottom

[24321] Large amounts are no longer cut off on smaller widths. #26280

Merged
merged 19 commits into from
Sep 11, 2023
Merged

[24321] Large amounts are no longer cut off on smaller widths. #26280

Changes from 3 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4a167a5
[24321] Large amounts are no longer cut off on smaller widths.
DanutGavrus Aug 30, 2023
26768ae
Small adjustments.
DanutGavrus Aug 30, 2023
a985412
Also reduced the lineHeight.
DanutGavrus Aug 30, 2023
f4f17b3
Restore settings gradle file changes which should have remaned only o…
DanutGavrus Aug 30, 2023
11c73f0
Fix lint: useWindowDimensions is called conditionally.
DanutGavrus Aug 30, 2023
f3b209d
Fixed spelling mistake.
DanutGavrus Aug 30, 2023
eba1a8c
Moved method to StyleUtils for future use.
DanutGavrus Aug 30, 2023
ff2551d
Run prettier.
DanutGavrus Aug 30, 2023
0a95938
Make sure the amount can not overlap the avatar icons.
DanutGavrus Aug 30, 2023
a013406
Replaced if conditions with a range switch.
DanutGavrus Aug 30, 2023
c87eb08
Moved condition higer in order to make it more clear.
DanutGavrus Aug 30, 2023
c56712a
Fix lint error.
DanutGavrus Aug 30, 2023
67e8d2e
Merge branch 'main' into fix/24321-large-amounts-cut-off
DanutGavrus Aug 31, 2023
28045d6
Merge branch 'main' into fix/24321-large-amounts-cut-off
DanutGavrus Sep 1, 2023
821785d
Fixed conflicts.
DanutGavrus Sep 4, 2023
850a1ca
Updated sizes calculations.
DanutGavrus Sep 4, 2023
0b0d30c
Fixed merge conflicts.
DanutGavrus Sep 5, 2023
fe584b8
updated to ts
DanutGavrus Sep 5, 2023
bc0527f
Fixed conflicts.
DanutGavrus Sep 8, 2023
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
22 changes: 16 additions & 6 deletions src/styles/StyleUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1342,16 +1342,26 @@ function getDropDownButtonHeight(buttonSize) {
function getAmountFontSizeAndLineHeight(baseFontSize, baseLineHeight, isSmallScreenWidth, windowWidth, requestAmount) {
let toSubtract = 0;

// requestAmount also includes digits after ".", so "1,000,000.00" qualifies.
if (requestAmount >= 100000000) toSubtract = 2;

if (isSmallScreenWidth) {
const widthDifference = variables.mobileResponsiveWidthBreakpoint - windowWidth;
if (widthDifference > 350) toSubtract = 2;
if (widthDifference > 400) toSubtract = 6;
if (widthDifference > 450) toSubtract = 9;
switch (true) {
Julesssss marked this conversation as resolved.
Show resolved Hide resolved
case widthDifference > 450:
toSubtract += 9;
break;
case widthDifference > 400:
toSubtract += 6;
break;
case widthDifference > 350:
toSubtract += 2;
break;
default:
break;
}
}

// requestAmount also includes digits after ".", so "1,000,000.00" qualifies.
if (requestAmount >= 100000000) toSubtract += 2;

return {
fontSize: baseFontSize - toSubtract,
lineHeight: baseLineHeight - toSubtract,
Expand Down
Loading