diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index 590275bc..9f7668b4 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -137,6 +137,7 @@
"group_name_update_failed": "Error in updating group name",
"import_failed": "Error importing file",
"invalid_currency_code": "Invalid currency code {{code}}",
+ "invalid_split": "Adjust who owes this expense before saving.",
"language_change_failed": "Error changing language",
"less_than": "File should be less than {{size}}MB",
"image_compression_failed": "Image compression failed, trying to upload original file",
@@ -189,6 +190,12 @@
"warning": "Warning: Don't use send invite if it's invalid email. use add to Split Pro instead. Your account will be blocked if this feature is misused"
},
"split_type_section": {
+ "direction": {
+ "no_money_flow": "No one else owes anything",
+ "owes_payer": "{{debtor}} owes {{payer}}",
+ "owes_you": "{{debtor}} owes you",
+ "you_owe": "You owe {{payer}}"
+ },
"split_equally": "split equally",
"split_unequally": "split unequally",
"types": {
diff --git a/src/components/AddExpense/AddExpensePage.tsx b/src/components/AddExpense/AddExpensePage.tsx
index 90a206e4..225fd402 100644
--- a/src/components/AddExpense/AddExpensePage.tsx
+++ b/src/components/AddExpense/AddExpensePage.tsx
@@ -65,7 +65,6 @@ export const AddOrEditExpensePage: React.FC<{
setAmount,
setAmountStr,
resetState,
- setSplitScreenOpen,
setExpenseDate,
setMultipleTransactions,
setIsTransactionLoading,
@@ -110,11 +109,6 @@ export const AddOrEditExpensePage: React.FC<{
return;
}
- if (!isExpenseSettled) {
- setSplitScreenOpen(true);
- return;
- }
-
setMultipleTransactions([]);
setIsTransactionLoading(false);
@@ -196,7 +190,6 @@ export const AddOrEditExpensePage: React.FC<{
}
}
}, [
- setSplitScreenOpen,
description,
currency,
isNegative,
@@ -212,7 +205,6 @@ export const AddOrEditExpensePage: React.FC<{
paidBy,
splitType,
fileKey,
- isExpenseSettled,
setMultipleTransactions,
transactionId,
setIsTransactionLoading,
@@ -298,7 +290,11 @@ export const AddOrEditExpensePage: React.FC<{
variant="ghost"
className="text-primary px-0"
disabled={
- addExpenseMutation.isPending || !amount || '' === description || isFileUploading
+ addExpenseMutation.isPending ||
+ !amount ||
+ '' === description ||
+ isFileUploading ||
+ !isExpenseSettled
}
onClick={addExpense}
>
@@ -351,6 +347,7 @@ export const AddOrEditExpensePage: React.FC<{
splitShares,
paidBy,
currentUser,
+ isNegative,
)}
diff --git a/src/components/AddExpense/SplitTypeSection.tsx b/src/components/AddExpense/SplitTypeSection.tsx
index bb64c331..7e87b298 100644
--- a/src/components/AddExpense/SplitTypeSection.tsx
+++ b/src/components/AddExpense/SplitTypeSection.tsx
@@ -304,6 +304,11 @@ const SplitSection: React.FC = (props) => {
>
{fmtSummartyText(amount, totalShares, toUIString)}
+ {!canSplitScreenClosed ? (
+
+ {t('errors.invalid_split')}
+
+ ) : null}
{isBoolean && (