From 463f3c8f83487f27c9d52ca19754bbb8499d18b7 Mon Sep 17 00:00:00 2001
From: minibits-cash <mail@minibits.cash>
Date: Mon, 8 Jul 2024 14:26:19 +0200
Subject: [PATCH] Proper warning about not yet supported QR code format, Wallet
 buttons style fix

---
 package.json                   |  2 +-
 src/screens/ScanScreen.tsx     | 16 +++++++++++++---
 src/screens/WalletScreen.tsx   |  6 +++---
 src/services/incomingParser.ts | 26 +++++++++++++++++++-------
 4 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index f2ea3364..be6b0092 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "minibits_wallet",
-  "version": "0.1.8-beta.34",
+  "version": "0.1.8-beta.35",
   "private": true,
   "scripts": {
     "android:clean": "cd android && ./gradlew clean",
diff --git a/src/screens/ScanScreen.tsx b/src/screens/ScanScreen.tsx
index efe70e29..24e219c4 100644
--- a/src/screens/ScanScreen.tsx
+++ b/src/screens/ScanScreen.tsx
@@ -86,9 +86,9 @@ export const ScanScreen: FC<WalletStackScreenProps<'Scan'>> = function ScanScree
         const {preferredUnit: unit} = userSettingsStore
 
         switch (prevRouteName) {
-            case 'ReceiveOptions':  
-            log.trace('ReceiveOptions')
-                try {                    
+            case 'TokenReceive':  
+                log.trace('TokenReceive')
+                try {     
                     const tokenResult = IncomingParser.findAndExtract(incoming, IncomingDataType.CASHU)
                     return IncomingParser.navigateWithIncomingData(tokenResult, navigation, unit)
                     
@@ -113,6 +113,16 @@ export const ScanScreen: FC<WalletStackScreenProps<'Scan'>> = function ScanScree
                         }
                     }
 
+                    // temp validation
+                    if(incoming.startsWith('ur:bytes')) {
+                        log.trace('[findAndExtract] Got animated QR', incoming)
+
+                        e.params = incoming
+                        e.message = 'Minibits does not yet support animated QR codes.'
+                        handleError(e)
+                        break
+                    }
+
                     e.params = incoming
                     e.message = translate("scanReceiveExtractFail")
                     handleError(e)
diff --git a/src/screens/WalletScreen.tsx b/src/screens/WalletScreen.tsx
index fde8797c..cd0b6193 100644
--- a/src/screens/WalletScreen.tsx
+++ b/src/screens/WalletScreen.tsx
@@ -529,7 +529,7 @@ export const WalletScreen: FC<WalletScreenProps> = observer(
                         )}
                         onPress={toggleSendModal}                        
                         style={[{backgroundColor: mainButtonColor, borderWidth: 1, borderColor: screenBg}, $buttonTopup]}
-                        preset='tertiary'
+                        preset='secondary'
                         tx='payCommon.send'
                     />             
                     <Button
@@ -543,7 +543,7 @@ export const WalletScreen: FC<WalletScreenProps> = observer(
                         )}
                         onPress={gotoScan}
                         style={[{backgroundColor: mainButtonColor, borderWidth: 1, borderColor: screenBg}, $buttonScan]}
-                        preset='tertiary'
+                        preset='secondary'
                     />
                     <Button
                         RightAccessory={() => (
@@ -556,7 +556,7 @@ export const WalletScreen: FC<WalletScreenProps> = observer(
                         onPress={toggleReceiveModal}
                         tx='payCommon.receive'
                         style={[{backgroundColor: mainButtonColor, borderWidth: 1, borderColor: screenBg}, $buttonPay]}
-                        preset='tertiary'
+                        preset='secondary'
                     /> 
                 </View>  
             </View>
diff --git a/src/services/incomingParser.ts b/src/services/incomingParser.ts
index cb05b8c9..a647fc6b 100644
--- a/src/services/incomingParser.ts
+++ b/src/services/incomingParser.ts
@@ -65,7 +65,6 @@ const findAndExtract = function (
                 throw new AppError(Err.NOTFOUND_ERROR, 'Unknown expectedType', {expectedType})
         }
     }
-
     
     const maybeToken = CashuUtils.findEncodedCashuToken(incomingData)
 
@@ -78,7 +77,6 @@ const findAndExtract = function (
         }
     }
 
-
     const maybeInvoice = LightningUtils.findEncodedLightningInvoice(incomingData)
 
     if(maybeInvoice) {
@@ -105,7 +103,6 @@ const findAndExtract = function (
         }
     }
 
-
     const maybeLnurlAddress = LnurlUtils.findEncodedLnurlAddress(incomingData)
 
     if(maybeLnurlAddress) {
@@ -121,12 +118,27 @@ const findAndExtract = function (
 
     const maybeMintUrl = new URL(incomingData) // throws
 
-    log.trace('[findAndExtract] Got maybeMintUrl', incomingData)
+    if(incomingData.startsWith('http')) {
+        log.trace('[findAndExtract] Got maybeMintUrl', incomingData)
 
-    return {
-        type: IncomingDataType.MINT_URL,
-        encoded: incomingData
+        return {
+            type: IncomingDataType.MINT_URL,
+            encoded: incomingData
+        }
     }
+
+    if(incomingData.startsWith('ur:bytes')) {
+        log.trace('[findAndExtract] Got animated QR', incomingData)
+
+        throw new AppError(Err.VALIDATION_ERROR, 'Minibits does not yet support animated QR codes.', {
+            caller: 'findAndExtract'                     
+        })
+    }
+
+    throw new AppError(Err.VALIDATION_ERROR, 'Unknown incoming data type.', {
+        caller: 'findAndExtract'                     
+    })
+
 }