Merge branch 'master' into feat/onboarding-prompt

getAlby · Sep 18, 2023 · 8aa5748 · 8aa5748
2 parents ad07912 + 8da1278
commit 8aa5748
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/src/app/components/BudgetControl/index.tsx b/src/app/components/BudgetControl/index.tsx
@@ -10,6 +10,7 @@ type Props = {
   budget: string;
   onBudgetChange: ChangeEventHandler<HTMLInputElement>;
   fiatAmount: string;
+  disabled?: boolean;
 };
 
 function BudgetControl({
@@ -18,6 +19,7 @@ function BudgetControl({
   budget,
   onBudgetChange,
   fiatAmount,
+  disabled = false,
 }: Props) {
   const { t } = useTranslation("components", {
     keyPrefix: "budget_control",
@@ -27,12 +29,13 @@ function BudgetControl({
 
   return (
     <div className="mb-4">
-      <div className="flex items-center">
+      <div className={`flex items-center`}>
         <Checkbox
           id="remember_me"
           name="remember_me"
           checked={remember}
           onChange={onRememberChange}
+          disabled={disabled}
         />
         <label
           htmlFor="remember_me"

diff --git a/src/app/components/form/Checkbox.tsx b/src/app/components/form/Checkbox.tsx
@@ -3,6 +3,7 @@ function Checkbox({
   name,
   checked,
   onChange,
+  disabled,
 }: React.InputHTMLAttributes<HTMLInputElement>) {
   return (
     <input
@@ -11,6 +12,7 @@ function Checkbox({
       type="checkbox"
       checked={checked}
       onChange={onChange}
+      disabled={disabled}
       className="h-4 w-4 text-primary focus:ring-primary border-gray-300 rounded cursor-pointer"
     />
   );

diff --git a/src/app/screens/ConfirmKeysend/index.tsx b/src/app/screens/ConfirmKeysend/index.tsx
@@ -160,6 +160,7 @@ function ConfirmKeysend() {
                 }}
                 budget={budget}
                 onBudgetChange={(event) => setBudget(event.target.value)}
+                disabled={loading}
               />
               <ConfirmOrCancel
                 disabled={loading}

diff --git a/src/app/screens/ConfirmPayment/index.tsx b/src/app/screens/ConfirmPayment/index.tsx
@@ -173,6 +173,7 @@ function ConfirmPayment() {
                   }}
                   budget={budget}
                   onBudgetChange={(event) => setBudget(event.target.value)}
+                  disabled={loading}
                 />
               )}
               <ConfirmOrCancel