Skip to content
Snippets Groups Projects
Unverified Commit 19a8f14a authored by biohzrddd's avatar biohzrddd Committed by GitHub
Browse files

Fixes Issue 495 Transfer allowed from same account (#902)

parent df63c7e1
No related branches found
No related tags found
No related merge requests found
...@@ -379,6 +379,7 @@ function StatusCell({ ...@@ -379,6 +379,7 @@ function StatusCell({
function PayeeCell({ function PayeeCell({
id, id,
payeeId, payeeId,
accountId,
focused, focused,
inherited, inherited,
payees, payees,
...@@ -396,6 +397,9 @@ function PayeeCell({ ...@@ -396,6 +397,9 @@ function PayeeCell({
const isNewAutocompleteEnabled = useFeatureFlag('newAutocomplete'); const isNewAutocompleteEnabled = useFeatureFlag('newAutocomplete');
let isCreatingPayee = useRef(false); let isCreatingPayee = useRef(false);
// Filter out the account we're currently in as it is not a valid transfer
accounts = accounts.filter(account => account.id !== accountId);
return ( return (
<CustomCell <CustomCell
width="flex" width="flex"
...@@ -786,6 +790,7 @@ export const Transaction = React.memo(function Transaction(props) { ...@@ -786,6 +790,7 @@ export const Transaction = React.memo(function Transaction(props) {
<PayeeCell <PayeeCell
id={id} id={id}
payeeId={payeeId} payeeId={payeeId}
accountId={accountId}
focused={focusedField === 'payee'} focused={focusedField === 'payee'}
inherited={inheritedFields && inheritedFields.has('payee')} inherited={inheritedFields && inheritedFields.has('payee')}
payees={payees} payees={payees}
......
...@@ -3,8 +3,6 @@ import { useDispatch } from 'react-redux'; ...@@ -3,8 +3,6 @@ import { useDispatch } from 'react-redux';
import { components as SelectComponents } from 'react-select'; import { components as SelectComponents } from 'react-select';
import { createPayee } from 'loot-core/src/client/actions/queries'; import { createPayee } from 'loot-core/src/client/actions/queries';
import { useCachedAccounts } from 'loot-core/src/client/data-hooks/accounts';
import { useCachedPayees } from 'loot-core/src/client/data-hooks/payees';
import { getActivePayees } from 'loot-core/src/client/reducers/queries'; import { getActivePayees } from 'loot-core/src/client/reducers/queries';
import Add from '../../icons/v1/Add'; import Add from '../../icons/v1/Add';
...@@ -51,6 +49,8 @@ function MenuListWithFooter(props) { ...@@ -51,6 +49,8 @@ function MenuListWithFooter(props) {
} }
export default function PayeeAutocomplete({ export default function PayeeAutocomplete({
payees,
accounts,
value, value,
multi = false, multi = false,
showMakeTransfer = true, showMakeTransfer = true,
...@@ -60,9 +60,6 @@ export default function PayeeAutocomplete({ ...@@ -60,9 +60,6 @@ export default function PayeeAutocomplete({
onManagePayees, onManagePayees,
...props ...props
}) { }) {
const payees = useCachedPayees();
const accounts = useCachedAccounts();
const [focusTransferPayees, setFocusTransferPayees] = useState( const [focusTransferPayees, setFocusTransferPayees] = useState(
defaultFocusTransferPayees, defaultFocusTransferPayees,
); );
......
---
category: Bugfix
authors: [biohzrddd]
---
Remove currently viewed account from list of possible transfer accounts
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment