fix: cleanup

getAlby · Sep 17, 2024 · ac12662 · ac12662
1 parent cb5c099
commit ac12662
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/components/DualCurrencyInput.tsx b/components/DualCurrencyInput.tsx
@@ -82,6 +82,6 @@ export function DualCurrencyInput({
 const styles = StyleSheet.create({
   amountInput: {
     fontSize: 80,
-    height: 100,
+    height: 90,
   },
 });
diff --git a/components/QRCodeScanner.tsx b/components/QRCodeScanner.tsx
@@ -48,7 +48,7 @@ function QRCodeScanner({ onScanned, startScanning = true }: QRCodeScannerProps)
 
     return (
         <>
-            {isLoading && (
+            {isLoading || !isScanning && (
                 <View className="flex-1 justify-center items-center">
                     <Loading />
                 </View>

diff --git a/hooks/useHandleLinking.ts b/hooks/useHandleLinking.ts
@@ -2,6 +2,7 @@ import * as Linking from "expo-linking";
 import { router, useRootNavigationState } from "expo-router";
 import React from "react";
 
+// TODO: Remove exp://
 const SUPPORTED_SCHEMES = ["lightning:", "bitcoin:", "alby:", "exp:"];
 
 export function useHandleLinking() {
@@ -14,16 +15,14 @@ export function useHandleLinking() {
       return;
     }
 
-    console.log("useHandleLinking", url);
-
     for (const scheme of SUPPORTED_SCHEMES) {
       if (url.startsWith(scheme)) {
         let currentUrl = url.startsWith(scheme + "//")
           ? url.replace(scheme + "//", scheme)
           : url;
-        currentUrl = currentUrl.replace("exp:127.0.0.1:8081/--/", "lightning:");
 
-        console.log("navigating to send screen", currentUrl);
+        // TODO: Remove, only for debugging purposes
+        currentUrl = currentUrl.replace("exp:127.0.0.1:8081/--/", "lightning:");
 
         // Instead of dismissing all screens, we'll use replace to avoid navigation stack issues
         router.replace({

diff --git a/pages/settings/wallets/WalletConnection.tsx b/pages/settings/wallets/WalletConnection.tsx
@@ -4,7 +4,6 @@ import * as Clipboard from "expo-clipboard";
 import { nwc } from "@getalby/sdk";
 import { ClipboardPaste, HelpCircle, X } from "~/components/Icons";
 import { useAppStore } from "lib/state/appStore";
-import { Camera } from "expo-camera/legacy"; // TODO: check if Android camera detach bug is fixed and update camera
 import { router } from "expo-router";
 import { Button } from "~/components/ui/button";
 import { useInfo } from "~/hooks/useInfo";
@@ -22,16 +21,11 @@ export function WalletConnection() {
   const walletIdWithConnection = useAppStore((store) =>
     store.wallets.findIndex((wallet) => wallet.nostrWalletConnectUrl),
   );
-  const [isScanning, setScanning] = React.useState(false);
   const [isConnecting, setConnecting] = React.useState(false);
+  const [isScanning, setScanning] = React.useState(true);
   const { data: walletInfo } = useInfo();
   const { data: balance } = useBalance();
 
-  async function scan() {
-    const { status } = await Camera.requestCameraPermissionsAsync();
-    setScanning(status === "granted");
-  }
-
   const handleScanned = (data: string) => {
     return connect(data);
   };
@@ -152,7 +146,7 @@ export function WalletConnection() {
               variant="destructive"
               onPress={() => {
                 useAppStore.getState().removeNostrWalletConnectUrl();
-                scan();
+                setScanning(true);
               }}
             >
               <Text>Disconnect Wallet</Text>
@@ -173,7 +167,7 @@ export function WalletConnection() {
             )}
             {!isConnecting && (
               <>
-                <QRCodeScanner onScanned={handleScanned} />
+                <QRCodeScanner onScanned={handleScanned} startScanning={isScanning} />
                 <View className="flex flex-row items-stretch justify-center gap-4 p-6">
                   <Button
                     onPress={paste}