Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
28be891
refactor(perps): migrate tpsl bottomsheet to fullscreen view
abretonc7s Oct 17, 2025
1758a1b
Merge branch 'main' into fix/perps/modalbottomsheetrefactor
abretonc7s Oct 17, 2025
c8d1d0a
fix: unit tests
abretonc7s Oct 17, 2025
9a915c0
Merge remote-tracking branch 'origin/main' into fix/perps/modalbottom…
abretonc7s Oct 17, 2025
4a7737e
fix: pr comments
abretonc7s Oct 17, 2025
9966afe
Merge branch 'main' into fix/perps/modalbottomsheetrefactor
abretonc7s Oct 18, 2025
e8ed0f2
feat(perps): new TPSL view design
abretonc7s Oct 18, 2025
54f73c4
fix: unit tests
abretonc7s Oct 18, 2025
c8a44a2
fix: unit tests
abretonc7s Oct 19, 2025
fdde0ef
coverage
abretonc7s Oct 19, 2025
fe9894c
fix: unit tests
abretonc7s Oct 19, 2025
3f7273e
fix: pr comments
abretonc7s Oct 20, 2025
b929f0c
fix: sonarcloud
abretonc7s Oct 20, 2025
75a2e10
feat: coverage
abretonc7s Oct 20, 2025
b7f2c32
cleanup
abretonc7s Oct 20, 2025
6621ff8
bugbot
abretonc7s Oct 20, 2025
7c6658a
Merge branch 'main' into fix/perps/modalbottomsheetrefactor
abretonc7s Oct 20, 2025
f19998d
Merge branch 'fix/perps/modalbottomsheetrefactor' into feat/perps/new…
abretonc7s Oct 20, 2025
134cdd7
Merge remote-tracking branch 'origin/main' into feat/perps/newtpsl
abretonc7s Oct 21, 2025
b9ba42f
Merge remote-tracking branch 'origin/main' into feat/perps/newtpsl
abretonc7s Oct 21, 2025
a9f8de0
fix: styling and order computation
abretonc7s Oct 21, 2025
cb0adbc
fix: sonarcloud
abretonc7s Oct 21, 2025
d62a8ed
cleanup
abretonc7s Oct 21, 2025
9cfee99
cleanup
abretonc7s Oct 21, 2025
5b5e5a7
fix: bug bot
abretonc7s Oct 21, 2025
b9983fa
cleanup short expected profit
abretonc7s Oct 21, 2025
c9678b8
cleanup
abretonc7s Oct 21, 2025
13894c4
merge main into branch
abretonc7s Oct 21, 2025
4ac0c9d
Merge branch 'main' into feat/perps/newtpsl
gambinish Oct 21, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,8 @@ const PerpsOrderViewContentBase: React.FC = () => {
limitPrice: orderForm.limitPrice,
initialTakeProfitPrice: orderForm.takeProfitPrice,
initialStopLossPrice: orderForm.stopLossPrice,
amount: orderForm.amount,
szDecimals: marketData?.szDecimals,
onConfirm: async (takeProfitPrice?: string, stopLossPrice?: string) => {
// Use the same clearing approach as the "Off" button
// If values are undefined or empty, ensure they're cleared properly
Expand All @@ -599,11 +601,13 @@ const PerpsOrderViewContentBase: React.FC = () => {
orderForm.leverage,
orderForm.takeProfitPrice,
orderForm.stopLossPrice,
orderForm.amount,
assetData.price,
showToast,
navigation,
setTakeProfitPrice,
setStopLossPrice,
marketData?.szDecimals,
]);

const handleAmountPress = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,22 @@ export const createStyles = (colors: Theme['colors']) =>
header: {
flexDirection: 'row',
alignItems: 'center',
gap: 16,
justifyContent: 'center',
paddingHorizontal: 16,
paddingVertical: 16,
borderBottomWidth: 1,
borderBottomColor: colors.border.muted,
position: 'relative',
},
headerBackButton: {
position: 'absolute',
left: 16,
zIndex: 1,
},
headerTitleContainer: {
flex: 1,
alignItems: 'center',
justifyContent: 'center',
},
footer: {
paddingHorizontal: 16,
paddingBottom: 16,
},
priceInfoContainer: {
Expand Down Expand Up @@ -53,10 +61,8 @@ export const createStyles = (colors: Theme['colors']) =>
marginBottom: 8,
},
inputContainer: {
backgroundColor: colors.background.default,
backgroundColor: colors.background.muted,
borderRadius: 8,
borderWidth: 1,
borderColor: colors.border.muted,
paddingHorizontal: 16,
paddingVertical: 12,
flexDirection: 'row',
Expand All @@ -70,9 +76,11 @@ export const createStyles = (colors: Theme['colors']) =>
marginLeft: 4,
},
inputContainerActive: {
borderWidth: 1,
borderColor: colors.primary.default,
},
inputContainerError: {
borderWidth: 1,
borderColor: colors.error.default,
},
input: {
Expand All @@ -81,38 +89,25 @@ export const createStyles = (colors: Theme['colors']) =>
color: colors.text.default,
paddingVertical: 0,
textAlign: 'left',
marginRight: 8,
marginLeft: 8,
},

percentageRow: {
flexDirection: 'row',
justifyContent: 'space-between',
marginBottom: 12,
gap: 8,
},
percentageButton: {
flex: 1,
paddingVertical: 10,
paddingHorizontal: 8,
backgroundColor: colors.background.pressed,
backgroundColor: colors.background.muted,
borderRadius: 8,
alignItems: 'center',
borderWidth: 1,
borderColor: colors.border.muted,
minWidth: 50,
},
percentageButtonOff: {
backgroundColor: colors.background.pressed,
borderWidth: 1,
borderColor: colors.border.muted,
},
percentageButtonActiveTP: {
borderWidth: 1,
borderColor: colors.primary.default,
},
percentageButtonActiveSL: {
borderWidth: 1,
borderColor: colors.primary.default,
backgroundColor: colors.background.muted,
},
helperText: {
marginTop: 4,
Expand Down Expand Up @@ -172,7 +167,6 @@ export const createStyles = (colors: Theme['colors']) =>
},
percentageButtonsContainer: {
flexDirection: 'row',
justifyContent: 'space-between',
marginBottom: 12,
gap: 8,
},
Expand Down Expand Up @@ -203,4 +197,22 @@ export const createStyles = (colors: Theme['colors']) =>
width: '100%',
marginBottom: 8,
},
expectedPnLText: {
marginTop: 8,
textAlign: 'right',
},
sectionTitleRow: {
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center',
marginBottom: 8,
},
footerButtonsRow: {
flexDirection: 'row',
gap: 12,
width: '100%',
},
footerButton: {
flex: 1,
},
});
Loading
Loading