fix(WalletForm): update code snippet

fix(WalletSnippet): add missing comma
getlago · May 31, 2024 · a810978 · a810978
1 parent b7a72b8
commit a810978
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 26 deletions.
diff --git a/ditto/base.json b/ditto/base.json
@@ -758,6 +758,8 @@
   "text_6657c34670561c0127132da4": "Dynamic top-up",
   "text_6657c34670561c0127132da5": "Target ongoing balance",
   "text_6657cdd8cea6bf010e1ce128": "Fixed top-up",
+  "text_66584178ee91f801012606a6": "Target ongoing balance should be higher than threshold",
+  "text_66584178ee91f801012606ac": "Threshold should be lower than target ongoing balance",
   "text_64aeb7b998c4322918c84204": "Payment methods",
   "text_64aeb7b998c4322918c84208": "Card",
   "text_64aeb7b998c4322918c8420c": "SEPA Direct Debit",

diff --git a/src/components/wallets/WalletCodeSnippet.tsx b/src/components/wallets/WalletCodeSnippet.tsx
@@ -1,7 +1,10 @@
 import { CodeSnippet } from '~/components/CodeSnippet'
 import { envGlobalVar } from '~/core/apolloClient'
 import { serializeAmount } from '~/core/serializers/serializeAmount'
-import { RecurringTransactionTriggerEnum } from '~/generated/graphql'
+import {
+  RecurringTransactionMethodEnum,
+  RecurringTransactionTriggerEnum,
+} from '~/generated/graphql'
 import { TWalletDataForm } from '~/pages/WalletForm'
 
 const { apiUrl } = envGlobalVar()
@@ -30,7 +33,7 @@ curl --location --request ${isEdition ? 'PUT' : 'POST'} "${apiUrl}/api/v1/wallet
     }
         "rate_amount": "${rateAmount}",
         "currency": "${currency}",
-        "external_customer_id": "__EXTERNAL_CUSTOMER_ID__"${
+        "external_customer_id": "__EXTERNAL_CUSTOMER_ID__",${
           wallet.expirationAt
             ? `,
         "expiration_at": "${wallet.expirationAt}",`
@@ -55,6 +58,34 @@ curl --location --request ${isEdition ? 'PUT' : 'POST'} "${apiUrl}/api/v1/wallet
             "lago_id": "${recurringTransactionRules[0].lagoId}",`
               : ''
           }
+            "method": "${wallet.recurringTransactionRules?.[0].method || '__MUST_BE_DEFINED__'}"${
+              wallet.recurringTransactionRules?.[0].method === RecurringTransactionMethodEnum.Fixed
+                ? `
+            "paid_credits": "${
+              wallet.recurringTransactionRules?.[0].paidCredits
+                ? serializeAmount(
+                    wallet.recurringTransactionRules?.[0].paidCredits,
+                    wallet.currency,
+                  )
+                : '0'
+            }",
+            "granted_credits": "${
+              wallet.recurringTransactionRules?.[0].grantedCredits
+                ? serializeAmount(
+                    wallet.recurringTransactionRules?.[0].grantedCredits,
+                    wallet.currency,
+                  )
+                : '0'
+            }",`
+                : ''
+            }${
+              wallet.recurringTransactionRules?.[0].method === RecurringTransactionMethodEnum.Target
+                ? `
+            "target_ongoing_balance": "${
+              wallet.recurringTransactionRules?.[0].targetOngoingBalance || '0'
+            }"`
+                : ''
+            }
             "trigger": "${wallet.recurringTransactionRules?.[0].trigger || '__MUST_BE_DEFINED__'}"${
               wallet.recurringTransactionRules?.[0].trigger ===
               RecurringTransactionTriggerEnum.Interval
@@ -67,28 +98,9 @@ curl --location --request ${isEdition ? 'PUT' : 'POST'} "${apiUrl}/api/v1/wallet
               wallet.recurringTransactionRules?.[0].trigger ===
               RecurringTransactionTriggerEnum.Threshold
                 ? `,
-            "threshold_credits": "${
-              wallet.recurringTransactionRules?.[0].thresholdCredits || '__MUST_BE_DEFINED__'
-            }"`
-                : ''
-            }${
-              wallet.recurringTransactionRules?.[0].paidCredits
-                ? `,
-            "paid_credits": "${serializeAmount(
-              wallet.recurringTransactionRules?.[0].paidCredits,
-              wallet.currency,
-            )}"`
-                : ''
-            }${
-              wallet.recurringTransactionRules?.[0].grantedCredits
-                ? `,
-            "granted_credits": "${serializeAmount(
-              wallet.recurringTransactionRules?.[0].grantedCredits,
-              wallet.currency,
-            )}"`
+            "threshold_credits": "${wallet.recurringTransactionRules?.[0].thresholdCredits || '0'}"`
                 : ''
             }
-          }
         ]`
             : ''
         }

diff --git a/src/pages/WalletForm/components/TopUpCard.tsx b/src/pages/WalletForm/components/TopUpCard.tsx
@@ -279,7 +279,7 @@ export const TopUpCard: FC<TopUpCardProps> = ({
                 error={
                   get(formikProps.errors, 'recurringTransactionRules.0.targetOngoingBalance') ===
                   walletFormErrorCodes.targetOngoingBalanceShouldBeGreaterThanThreshold
-                    ? translate('TODO: Target ongoing balance should be higher than threshold')
+                    ? translate('text_66584178ee91f801012606a6')
                     : undefined
                 }
                 helperText={translate('text_62d18855b22699e5cf55f88b', {
@@ -335,7 +335,7 @@ export const TopUpCard: FC<TopUpCardProps> = ({
                 }}
               />
               {recurringTransactionRules?.trigger === RecurringTransactionTriggerEnum.Interval && (
-                <>
+                <Box className="span-2">
                   <ComboBoxField
                     name="recurringTransactionRules.0.interval"
                     disableClearable
@@ -362,18 +362,19 @@ export const TopUpCard: FC<TopUpCardProps> = ({
                       },
                     ]}
                   />
-                </>
+                </Box>
               )}
               {recurringTransactionRules?.trigger === RecurringTransactionTriggerEnum.Threshold && (
                 <AmountInputField
+                  className="span-2"
                   name="recurringTransactionRules.0.thresholdCredits"
                   currency={formikProps.values.currency}
                   label={translate('text_6560809c38fb9de88d8a5315')}
                   formikProps={formikProps}
                   error={
                     get(formikProps.errors, 'recurringTransactionRules.0.thresholdCredits') ===
                     walletFormErrorCodes.thresholdShouldBeLessThanTargetOngoingBalance
-                      ? translate('TODO: Threshold should be lower than target ongoing balance')
+                      ? translate('text_66584178ee91f801012606ac')
                       : undefined
                   }
                   {...inputAdornment(translate('text_62d18855b22699e5cf55f889'))}
@@ -408,4 +409,8 @@ const InlineTopUpElements = styled.div`
   > div {
     flex: 1;
   }
+
+  > div.span-2 {
+    flex: 2;
+  }
 `