Fix picking payout method when not admin of payee

opencollective · Dec 19, 2024 · f208618 · f208618
1 parent dbe8a55
commit f208618
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/components/expenses/EditExpenseDialog.tsx b/components/expenses/EditExpenseDialog.tsx
@@ -55,7 +55,7 @@ const EditPayee = ({ expense, onSubmit }) => {
   const formRef = React.useRef<HTMLFormElement>();
   const startOptions = React.useRef({
     expenseId: expense.legacyId,
-    allowInvite: false,
+    isInlineEdit: true,
   });
   const transformedOnSubmit = React.useCallback(
     async (values, h, formOptions) => {
@@ -150,6 +150,7 @@ const EditPayoutMethod = ({ expense, onSubmit }) => {
   const formRef = React.useRef<HTMLFormElement>();
   const startOptions = React.useRef({
     expenseId: expense.legacyId,
+    isInlineEdit: true,
   });
   const transformedOnSubmit = React.useCallback(
     async (values, h, formOptions) => {
@@ -232,6 +233,7 @@ const EditAttachments = ({ expense, onSubmit }) => {
   const formRef = React.useRef<HTMLFormElement>();
   const startOptions = React.useRef({
     expenseId: expense.legacyId,
+    isInlineEdit: true,
   });
   const transformedOnSubmit = values => {
     const editValues = {
@@ -283,6 +285,7 @@ const EditExpenseItems = ({ expense, onSubmit }) => {
   const formRef = React.useRef<HTMLFormElement>();
   const startOptions = React.useRef({
     expenseId: expense.legacyId,
+    isInlineEdit: true,
   });
   const transformedOnSubmit = values => {
     const editValues = {

diff --git a/components/submit-expense/SubmitExpenseFlow.tsx b/components/submit-expense/SubmitExpenseFlow.tsx
@@ -428,7 +428,6 @@ function ExpenseFormikContainer(props: {
     draftKey: props.draftKey,
     duplicateExpense: props.duplicateExpense,
     expenseId: props.expenseId,
-    allowInvite: true,
   });
 
   const [activeStep, setActiveStep] = React.useState(Step.WHO_IS_PAYING);

diff --git a/components/submit-expense/useExpenseForm.ts b/components/submit-expense/useExpenseForm.ts
@@ -1272,7 +1272,9 @@ async function buildFormOptions(
         options.payoutMethod = values.newPayoutMethod;
       }
 
-      options.isAdminOfPayee = options.payoutProfiles.some(p => p.slug === values.payeeSlug);
+      // Allow setting this flag to true with the `isInlineEdit` flag in start options to enable full editing experience (i.e. editing payotu method)
+      options.isAdminOfPayee =
+        startOptions.isInlineEdit || options.payoutProfiles.some(p => p.slug === values.payeeSlug);
     }
 
     if (options.payoutMethod) {
@@ -1283,7 +1285,7 @@ async function buildFormOptions(
 
     options.allowExpenseItemAttachment = values.expenseTypeOption === ExpenseType.RECEIPT;
 
-    options.allowInvite = startOptions.allowInvite;
+    options.allowInvite = !startOptions.isInlineEdit;
 
     if (values.expenseTypeOption === ExpenseType.INVOICE) {
       if (accountHasVAT(account as any, host as any)) {
@@ -1341,7 +1343,7 @@ type ExpenseFormStartOptions = {
   duplicateExpense?: boolean;
   expenseId?: number;
   draftKey?: string;
-  allowInvite?: boolean;
+  isInlineEdit?: boolean;
 };
 
 export function useExpenseForm(opts: {