fix: collateral password issue [LW-11953] (#1584)

* fix: collateral password issue * fix: resolve build issue on main
input-output-hk · Dec 10, 2024 · 594bbd0 · 594bbd0
1 parent fef43f5
commit 594bbd0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/.../views/browser-view/features/settings/components/Collateral/send/CollateralFooterSend.tsx b/.../views/browser-view/features/settings/components/Collateral/send/CollateralFooterSend.tsx
@@ -44,15 +44,14 @@ export const CollateralFooterSend = ({
   const submitTx = async () => withSignTxConfirmation(submitCollateralTx, secretsUtil.password.value);
 
   const handleClick = async () => {
-    onClaim();
-
     if (!hasEnoughAda) {
       return onClose();
     }
     try {
       if (popupView && !isInMemory)
         return await backgroundServices?.handleOpenBrowser({ section: BrowserViewSections.COLLATERAL_SETTINGS });
       await submitTx();
+      onClaim();
       toast.notify({ text: t('browserView.settings.wallet.collateral.toast.add') });
       if (isInMemory) onClose();
     } catch {

diff --git a/...re/src/shared-wallets/add-shared-wallet/generate-key-flow/EnterPassword/EnterPassword.tsx b/...re/src/shared-wallets/add-shared-wallet/generate-key-flow/EnterPassword/EnterPassword.tsx
@@ -44,6 +44,11 @@ export const EnterPassword: VFC<EnterPasswordProps> = ({
   const icon = mapOfWalletTypeIconProperties[kind];
 
   const next = () => {
+    if (!password.value) {
+      console.error('Password is undefined');
+      return;
+    }
+
     onGenerateKeys(password.value);
     clearSecrets();
   };

diff --git a/packages/core/src/ui/components/WalletSetup/WalletSetupPasswordStep.tsx b/packages/core/src/ui/components/WalletSetup/WalletSetupPasswordStep.tsx
@@ -60,10 +60,9 @@ export const WalletSetupPasswordStep = ({
   const passwordConfirmationErrorMessage =
     passHasBeenValidated && password !== passwordConfirmation ? translations.noMatchPassword : '';
   const isNextEnabled = Boolean(
-    passHasBeenValidated &&
-      !passwordConfirmationErrorMessage &&
-      score >= minimumPassLevelRequired &&
-      password.value.length > 0
+    passHasBeenValidated && !passwordConfirmationErrorMessage && score >= minimumPassLevelRequired && password?.value
+      ? password.value.length > 0
+      : false
   );
 
   const complexityBarList: BarStates = useMemo(() => getComplexityBarStateList(score), [score]);
@@ -79,7 +78,7 @@ export const WalletSetupPasswordStep = ({
       description={translations.description}
       onBack={onBack}
       onNext={() => {
-        onNext({ password: password.value });
+        password.value ? onNext({ password: password.value }) : console.error('Password is undefined');
       }}
       isNextEnabled={isNextEnabled}
       currentTimelineStep={WalletTimelineSteps.WALLET_SETUP}