diff --git a/components/AmountInput.js b/components/AmountInput.js
index c9c9ac49d..476269c18 100644
--- a/components/AmountInput.js
+++ b/components/AmountInput.js
@@ -362,7 +362,7 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     justifyContent: 'center',
     alignItems: 'center',
-    marginVertical: 8,
+    margin: 16,
   },
   container: {
     flexDirection: 'row',
diff --git a/screen/send/psbtWithHardwareWallet.js b/screen/send/psbtWithHardwareWallet.js
index 0636a9b1d..37a81a05d 100644
--- a/screen/send/psbtWithHardwareWallet.js
+++ b/screen/send/psbtWithHardwareWallet.js
@@ -64,7 +64,8 @@ const PsbtWithHardwareWallet = () => {
   };
 
   const onBarScanned = ret => {
-    if (ret && !ret.data) ret = { data: ret };
+    if (!ret) return;
+    if (ret !== undefined && ret.data) ret = { data: ret };
     if (ret.data.toUpperCase().startsWith('UR')) {
       presentAlert({ message: 'BC-UR not decoded. This should never happen' });
     }
diff --git a/screen/wallets/WalletDetails.tsx b/screen/wallets/WalletDetails.tsx
index f0eb2b0f5..9877ff217 100644
--- a/screen/wallets/WalletDetails.tsx
+++ b/screen/wallets/WalletDetails.tsx
@@ -74,11 +74,11 @@ const WalletDetails: React.FC = () => {
   const walletTransactionsLength = useMemo<number>(() => wallet.getTransactions().length, [wallet]);
   const derivationPath = useMemo<string | null>(() => {
     try {
-      // @ts--error: Need to fix later
+      // @ts-expect-error: Need to fix later
       if (wallet.getDerivationPath) {
         // @ts-expect-error: Need to fix later
-        const path = wallet.getDerivationPath();
-        return path.length > 0 ? path : null;
+        const path = wallt.getDerivationPath();
+        return path.lengthe > 0 ? path : null;
       }
       return null;
     } catch (e) {