From 653c79ee4a5a012ad267a4e68b44b0a5d4f0d060 Mon Sep 17 00:00:00 2001
From: lissavxo <lissavitoria12@gmail.com>
Date: Tue, 14 Jan 2025 19:08:03 -0300
Subject: [PATCH 1/2] feat: inputs trigger options

---
 components/Paybutton/PaybuttonTrigger.tsx | 76 +++++++++++++----------
 constants/index.ts                        |  3 +-
 services/triggerService.ts                |  7 ++-
 utils/validators.ts                       |  4 +-
 4 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/components/Paybutton/PaybuttonTrigger.tsx b/components/Paybutton/PaybuttonTrigger.tsx
index ae524a5f4..56c5d7e41 100644
--- a/components/Paybutton/PaybuttonTrigger.tsx
+++ b/components/Paybutton/PaybuttonTrigger.tsx
@@ -116,9 +116,9 @@ export default ({ paybuttonId, emailCredits }: IProps): JSX.Element => {
       } finally {
         setClearModal(undefined)
         setTimeout(() => {
-          setSuccess('');
-          setError('');
-      }, 3000);
+          setSuccess('')
+          setError('')
+        }, 3000)
       }
     }
   }
@@ -153,9 +153,9 @@ export default ({ paybuttonId, emailCredits }: IProps): JSX.Element => {
         setError(err.response.data.message)
       } finally {
         setTimeout(() => {
-          setSuccess('');
-          setError('');
-      }, 3000);
+          setSuccess('')
+          setError('')
+        }, 3000)
       }
     }
   }
@@ -174,7 +174,7 @@ export default ({ paybuttonId, emailCredits }: IProps): JSX.Element => {
               onSubmit={(e) => {
                 void handleSubmitPosterTrigger(
                   getSubmitTriggerHandler('poster')
-                )(e);
+                )(e)
               }}
               method="post"
             >
@@ -212,6 +212,7 @@ export default ({ paybuttonId, emailCredits }: IProps): JSX.Element => {
                   <div>&lt;txId&gt;</div>
                   <div>&lt;opReturn&gt;</div>
                   <div>&lt;signature&gt;</div>
+                  <div>&lt;inputAddresses&gt;</div>
                 </div>
               </div>
               {/* Tooltip */}
@@ -219,18 +220,22 @@ export default ({ paybuttonId, emailCredits }: IProps): JSX.Element => {
                 <div className={style.tip}>
                   {/* Only triggers if payment &gt; X */}
                 </div>
-                  
+
                 <div className={style.trigger_btn_row}>
 
-                {posterError === undefined || posterError === '' ? null : (
+                {posterError === undefined || posterError === ''
+                  ? null
+                  : (
                     <div className={style.error_message_}>{posterError}</div>
-                  )}
+                    )}
                   {posterSuccessText === undefined ||
-                  posterSuccessText === '' ? null : (
+                  posterSuccessText === ''
+                    ? null
+                    : (
                     <div className={style.success_message_}>
                       {posterSuccessText}
                     </div>
-                  )}
+                      )}
                   {currentPosterTriggerId !== undefined && (
                       <button
                         type="button"
@@ -239,7 +244,7 @@ export default ({ paybuttonId, emailCredits }: IProps): JSX.Element => {
                       >
                         Delete
                       </button>
-                    )}
+                  )}
                   <button
                     disabled={disablePosterSubmit}
                     type="submit"
@@ -249,7 +254,7 @@ export default ({ paybuttonId, emailCredits }: IProps): JSX.Element => {
                       ? 'Create Send Request'
                       : 'Update Send Request'}
                   </button>
-              
+
                 </div>
               </div>
             </form>
@@ -264,12 +269,11 @@ export default ({ paybuttonId, emailCredits }: IProps): JSX.Element => {
               onSubmit={(e) => {
                 void handleSubmitEmailTrigger(getSubmitTriggerHandler('email'))(
                   e
-                );
+                )
               }}
               method="post"
             >
-             
-                
+
                 <label htmlFor="emails">Email</label>
                 <input
                   {...registerEmailTrigger('emails')}
@@ -278,30 +282,36 @@ export default ({ paybuttonId, emailCredits }: IProps): JSX.Element => {
                   name="emails"
                 />
                 <div className={style.email_credits_info}>
-                    {emailCredits < MAX_DAILY_EMAILS ? (
+                    {emailCredits < MAX_DAILY_EMAILS
+                      ? (
                       <span>
                         You have sent <b>{MAX_DAILY_EMAILS - emailCredits}</b>{' '}
                         of a daily maximum of <b>{MAX_DAILY_EMAILS}</b> emails.
                       </span>
-                    ) : (
+                        )
+                      : (
                       <span>
                         You may send up to <b>{MAX_DAILY_EMAILS}</b> emails per
                         day.
                       </span>
-                    )}
+                        )}
                 </div>
-             
+
               <div>
                 <div className={style.trigger_btn_row}>
-                  {emailError === undefined || emailError === '' ? null : (
+                  {emailError === undefined || emailError === ''
+                    ? null
+                    : (
                     <div className={style.error_message_}>{emailError}</div>
-                  )}
+                      )}
                   {emailSuccessText === undefined ||
-                  emailSuccessText === '' ? null : (
+                  emailSuccessText === ''
+                    ? null
+                    : (
                     <div className={style.success_message_}>
                       {emailSuccessText}
                     </div>
-                  )}
+                      )}
                   {currentEmailTriggerId !== undefined && (
                       <button
                         type="button"
@@ -310,7 +320,7 @@ export default ({ paybuttonId, emailCredits }: IProps): JSX.Element => {
                       >
                         Delete
                       </button>
-                    )}
+                  )}
                     <button
                       disabled={disableEmailSubmit}
                       type="submit"
@@ -320,14 +330,15 @@ export default ({ paybuttonId, emailCredits }: IProps): JSX.Element => {
                         ? 'Create Send Email'
                         : 'Update Send Email'}
                     </button>
-                
+
                 </div>
               </div>
             </form>
           </div>
         </div>
       </div>
-      {clearModal !== undefined ? (
+      {clearModal !== undefined
+        ? (
         <div className={style.form_ctn_outer}>
           <div className={style.form_ctn_inner}>
             <h4>Clear Payment Trigger?</h4>
@@ -343,7 +354,7 @@ export default ({ paybuttonId, emailCredits }: IProps): JSX.Element => {
                 <div>
                   <button
                     onClick={() => {
-                      void getDeleteTriggerHandler(clearModal)();
+                      void getDeleteTriggerHandler(clearModal)()
                     }}
                     className={style.delete_confirm_btn}
                   >
@@ -351,7 +362,7 @@ export default ({ paybuttonId, emailCredits }: IProps): JSX.Element => {
                   </button>
                   <button
                     onClick={() => {
-                      setClearModal(undefined);
+                      setClearModal(undefined)
                     }}
                     className={style.cancel_btn}
                   >
@@ -362,7 +373,8 @@ export default ({ paybuttonId, emailCredits }: IProps): JSX.Element => {
             </div>
           </div>
         </div>
-      ) : null}
+          )
+        : null}
     </div>
-  );
+  )
 }
diff --git a/constants/index.ts b/constants/index.ts
index c9088b9d8..925966603 100644
--- a/constants/index.ts
+++ b/constants/index.ts
@@ -232,7 +232,8 @@ export const TRIGGER_POST_VARIABLES = [
   '<opReturn>',
   '<signature>',
   '<timestamp>',
-  '<txId>'
+  '<txId>',
+  '<inputAddresses>'
 ]
 
 export const PAYBUTTON_TRANSACTIONS_FILE_HEADERS = {
diff --git a/services/triggerService.ts b/services/triggerService.ts
index b09cec3f0..b7049917c 100644
--- a/services/triggerService.ts
+++ b/services/triggerService.ts
@@ -241,7 +241,8 @@ export async function executeAddressTriggers (broadcastTxData: BroadcastTxData,
       timestamp,
       paymentId,
       message,
-      rawMessage
+      rawMessage,
+      inputAddresses
     } = tx
 
     const addressTriggers = await fetchTriggersForAddress(address)
@@ -264,7 +265,8 @@ export async function executeAddressTriggers (broadcastTxData: BroadcastTxData,
               message,
               rawMessage
             }
-          : EMPTY_OP_RETURN
+          : EMPTY_OP_RETURN,
+        inputAddresses
       }
       await postDataForTrigger(trigger, postDataParameters)
     }))
@@ -393,6 +395,7 @@ export interface PostDataParameters {
   buttonName: string
   address: string
   opReturn: OpReturnData
+  inputAddresses?: Array<string | undefined>
 }
 
 async function postDataForTrigger (trigger: TriggerWithPaybutton, postDataParameters: PostDataParameters): Promise<void> {
diff --git a/utils/validators.ts b/utils/validators.ts
index 6b3b3e69e..bf015da55 100644
--- a/utils/validators.ts
+++ b/utils/validators.ts
@@ -272,6 +272,7 @@ export function parseTriggerPostData ({ userId, postData, postDataParameters }:
       .replace('<timestamp>', postDataParameters.timestamp.toString())
       .replace('<opReturn>', opReturn)
       .replace('<signature>', `${JSON.stringify(signature, undefined, 2)}`)
+      .replace('<inputAddresses>', `${JSON.stringify(postDataParameters.inputAddresses, undefined, 2)}`)
     const parsedResultingData = JSON.parse(resultingData)
     return parsedResultingData
   } catch (err: any) {
@@ -314,7 +315,8 @@ export const parsePaybuttonTriggerPOSTRequest = function (params: PaybuttonTrigg
       buttonName: '',
       address: '',
       timestamp: 0,
-      opReturn: EMPTY_OP_RETURN
+      opReturn: EMPTY_OP_RETURN,
+      inputAddresses: ['']
     }
     const parsed = parseTriggerPostData({
       userId: params.userId,

From 5ede2924e33520f518d5b1130820b2345ffde06f Mon Sep 17 00:00:00 2001
From: lissavxo <lissavitoria12@gmail.com>
Date: Mon, 20 Jan 2025 16:05:51 -0300
Subject: [PATCH 2/2] refactor: clean code

---
 services/triggerService.ts | 2 +-
 utils/validators.ts        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/triggerService.ts b/services/triggerService.ts
index b7049917c..5ce6dc08a 100644
--- a/services/triggerService.ts
+++ b/services/triggerService.ts
@@ -395,7 +395,7 @@ export interface PostDataParameters {
   buttonName: string
   address: string
   opReturn: OpReturnData
-  inputAddresses?: Array<string | undefined>
+  inputAddresses?: string[]
 }
 
 async function postDataForTrigger (trigger: TriggerWithPaybutton, postDataParameters: PostDataParameters): Promise<void> {
diff --git a/utils/validators.ts b/utils/validators.ts
index bf015da55..98cd6d571 100644
--- a/utils/validators.ts
+++ b/utils/validators.ts
@@ -316,7 +316,7 @@ export const parsePaybuttonTriggerPOSTRequest = function (params: PaybuttonTrigg
       address: '',
       timestamp: 0,
       opReturn: EMPTY_OP_RETURN,
-      inputAddresses: ['']
+      inputAddresses: []
     }
     const parsed = parseTriggerPostData({
       userId: params.userId,