fix rendering defaultLogo in shared QR on iOS, minor code cleanup

ZeusLN · Feb 3, 2025 · cf7102b · cf7102b
1 parent 1421d1b
commit cf7102b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/components/CollapsedQR.tsx b/components/CollapsedQR.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import {
     Dimensions,
+    Image,
     Platform,
     StyleSheet,
     Text,
@@ -50,7 +51,12 @@ const ForwardedQRCode = React.forwardRef<QRCodeElement, ExtendedQRCodeProps>(
             getRef={(c) => {
                 if (c && c.toDataURL && !(ref as any).current) {
                     (ref as any).current = c;
-                    props.parent?.setState({ qrReady: true });
+                    Image.getSize(
+                        Image.resolveAssetSource(defaultLogo).uri,
+                        () => {
+                            props.parent?.setState({ qrReady: true });
+                        }
+                    );
                 }
             }}
         />

diff --git a/components/ShareButton.tsx b/components/ShareButton.tsx
@@ -34,12 +34,9 @@ export default class ShareButton extends React.Component<ShareButtonProps> {
     shareContent = async () => {
         const { value, qrRef, onShareComplete } = this.props;
         try {
-            if (!qrRef?.current) {
-                return;
-            }
+            if (!qrRef?.current) return;
 
-            const svgElement = qrRef.current;
-            const base64Data = await captureRef(svgElement, {
+            const base64Data = await captureRef(qrRef.current, {
                 format: 'png',
                 quality: 1
             });