fix: default scopes and budget renewal

getAlby · Jul 1, 2024 · e3d05f7 · e3d05f7
1 parent 084f61a
commit e3d05f7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/frontend/src/components/Permissions.tsx b/frontend/src/components/Permissions.tsx
@@ -60,15 +60,21 @@ const Permissions: React.FC<PermissionsProps> = ({
       return;
     }
 
+    let budgetRenewal = permissions.budgetRenewal;
+
     const newScopes = new Set(permissions.scopes);
     if (newScopes.has(scope)) {
       newScopes.delete(scope);
     } else {
       newScopes.add(scope);
+      if (scope === "pay_invoice") {
+        budgetRenewal = "monthly";
+      }
     }
 
     handlePermissionsChange({
       scopes: newScopes,
+      budgetRenewal,
     });
   };
 
@@ -171,13 +177,11 @@ const Permissions: React.FC<PermissionsProps> = ({
                               <SelectContent>
                                 {validBudgetRenewals.map((renewalOption) => (
                                   <SelectItem
-                                    key={renewalOption || "never"}
-                                    value={renewalOption || "never"}
+                                    key={renewalOption}
+                                    value={renewalOption}
                                   >
-                                    {renewalOption
-                                      ? renewalOption.charAt(0).toUpperCase() +
-                                        renewalOption.slice(1)
-                                      : "Never"}
+                                    {renewalOption.charAt(0).toUpperCase() +
+                                      renewalOption.slice(1)}
                                   </SelectItem>
                                 ))}
                               </SelectContent>

diff --git a/frontend/src/types.ts b/frontend/src/types.ts
@@ -187,7 +187,7 @@ export type UpdateAppRequest = {
   maxAmount: number;
   budgetRenewal: string;
   expiresAt: string | undefined;
-  scopes: string[];
+  scopes: Scope[];
 };
 
 export type Channel = {

diff --git a/nip47/permissions/permissions.go b/nip47/permissions/permissions.go
@@ -180,7 +180,7 @@ func scopeToRequestMethods(scope string) []string {
 func RequestMethodsToScopes(requestMethods []string) ([]string, error) {
 	scopes := []string{}
 
-	for _, requestMethod := range scopes {
+	for _, requestMethod := range requestMethods {
 		scope, err := RequestMethodToScope(requestMethod)
 		if err != nil {
 			return nil, err