Merge pull request #191 from VerusCoin/dev

v1.0.21

android/app/build.gradle

@@ -5,7 +5,7 @@ import com.android.build.OutputFile
 
 def versionMajor = 1
 def versionMinor = 0
-def versionRevision = 20
+def versionRevision = 21
 def versionBuild = 0
 
 def keystorePropertiesFile = rootProject.file("keystore.properties");

env/main.android.json

@@ -1,5 +1,5 @@
 {
-  "APP_VERSION": "1.0.20",
+  "APP_VERSION": "1.0.21",
   "ELECTRUM_PROTOCOL_CHANGE": 1.4,
 
   "KEY_DERIVATION_VERSION": 1,

env/main.ios.json

@@ -1,5 +1,5 @@
 {
-  "APP_VERSION": "1.0.20",
+  "APP_VERSION": "1.0.21",
   "ELECTRUM_PROTOCOL_CHANGE": 1.4,
 
   "KEY_DERIVATION_VERSION": 1,

ios/assets/env/main.json

@@ -1,5 +1,5 @@
 {
-  "APP_VERSION": "1.0.20",
+  "APP_VERSION": "1.0.21",
   "ELECTRUM_PROTOCOL_CHANGE": 1.4,
 
   "KEY_DERIVATION_VERSION": 1,

ios/verusMobile.xcodeproj/project.pbxproj

@@ -745,7 +745,7 @@
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-webview\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/rn-fetch-blob\"",
 				);
-				MARKETING_VERSION = 1.0.20;
+				MARKETING_VERSION = 1.0.21;
 				PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.verusmobile;
 				PRODUCT_NAME = verusmobile;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -817,7 +817,7 @@
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-webview\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/rn-fetch-blob\"",
 				);
-				MARKETING_VERSION = 1.0.20;
+				MARKETING_VERSION = 1.0.21;
 				PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.verusmobile;
 				PRODUCT_NAME = verusmobile;
 				PROVISIONING_PROFILE_SPECIFIER = "";

package.json

@@ -1,6 +1,6 @@
 {
   "name": "verusmobile",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "private": true,
   "scripts": {
     "postinstall": "./node_modules/.bin/rn-nodeify --hack --install --yarn && npx jetify",

src/components/BarcodeReader/BarcodeReader.js

@@ -1,5 +1,5 @@
 import React, {useState, useEffect, useRef} from 'react';
-import {View, ScrollView} from 'react-native';
+import {View, ScrollView, AppState} from 'react-native';
 import {Text, Button} from 'react-native-paper';
 import { Camera, useCameraDevice, useCodeScanner } from 'react-native-vision-camera';
 import Colors from '../../globals/colors';
@@ -14,8 +14,10 @@ import {triggerHapticSuccess} from '../../utils/haptics/haptics';
 const BarcodeReader = props => {
   const cameraProps = props.cameraProps == null ? {} : props.cameraProps;
   const maskProps = props.maskProps == null ? {} : props.maskProps;
+  const appState = useRef(AppState.currentState);
 
   const componentIsMounted = useRef(true);
+  const [appStateVisible, setAppStateVisible] = useState(appState.current);
   const [needToGoToSettings, setNeedToGoToSettings] = useState(false);
   const [hasCameraPermission, setHasCameraPermission] = useState(false);
   const [loading, setLoading] = useState(false);
@@ -49,6 +51,17 @@ const BarcodeReader = props => {
     }
   })
 
+  useEffect(() => {
+    const subscription = AppState.addEventListener('change', nextAppState => {
+      appState.current = nextAppState;
+      setAppStateVisible(appState.current);
+    });
+
+    return () => {
+      subscription.remove();
+    };
+  }, []);
+
   const onMount = async () => {
     const permissionStatus = await verifyPermissions(
       PERMISSIONS.IOS.CAMERA,
@@ -95,7 +108,7 @@ const BarcodeReader = props => {
           }}
           device={device}
           codeScanner={codeScanner}
-          isActive={true}
+          isActive={appStateVisible === 'active'}
           {...cameraProps} 
         />
         <View style={{ 

src/components/ScanSeed.js

@@ -26,9 +26,9 @@ class ScanSeed extends Component {
   }
 
   onSuccess(codes) {
-    let result = codes[0]
+    let result = codes[0] ? codes[0].value : null;
 
-    if (typeof result === "string" && result.length <= 5000 && this.props.onScan) {
+    if (result != null && typeof result === "string" && result.length <= 5000 && this.props.onScan) {
       this.props.onScan(result)
     } else {
       this.errorHandler(FORMAT_UNKNOWN)

src/components/SendModal/RecoverIdentity/RecoverIdentityForm/RecoverIdentityForm.js

@@ -86,10 +86,10 @@ const RecoverIdentityForm = (props) => {
   }, []);
 
   const handleScan = (codes) => {
-    const result = codes[0]
+    const result = codes[0] ? codes[0].value : null;
     setScannerOpen(false)
 
-    if (typeof result === "string" && result.length <= 5000) {
+    if (result != null && typeof result === "string" && result.length <= 5000) {
       props.updateSendFormData(scannerField, result)
     } else {
       Alert.alert("Error", "Unknown data in qr code")

src/components/SetupSeedModal/ImportSeed/ImportSeed.js

@@ -35,8 +35,8 @@ class ImportSeed extends Component {
     if (lastState !== this.state) this.props.saveState(this.state);
   }
 
-  handleScan = (codes) => {
-    this.setState({ seed: codes[0], scanning: false });
+  handleScan = (seed) => {
+    this.setState({ seed, scanning: false });
   };
 
   verifySeed = async () => {

src/containers/CreateWallet/Forms/ImportWallet/Forms/ImportText.js

@@ -25,9 +25,9 @@ export default function ImportText({
   const [showSeed, setShowSeed] = useState(false);
   const [scanQr, setScanQr] = useState(qr === true);
 
-  const handleScan = (codes) => {
+  const handleScan = (seed) => {
     setScanQr(false)
-    setImportedSeed(codes[0])
+    setImportedSeed(seed)
   }
 
   const handleImport = () => {
@@ -39,7 +39,7 @@ export default function ImportText({
   return scanQr ? (
     <ScanSeed
       cancel={() => setScanQr(false)}
-      onScan={(codes) => handleScan(codes)}
+      onScan={(seed) => handleScan(seed)}
     />
   ) : (
     <TouchableWithoutFeedback onPress={() => Keyboard.dismiss()}>

src/containers/Settings/WalletSettings/CoinSettings/CoinSettings.js

@@ -170,13 +170,12 @@ class CoinSettings extends Component {
         <View style={Styles.highFooterContainer}>
           <View style={Styles.standardWidthSpaceBetweenBlock}>
             <Button
-              buttonColor={Colors.warningButtonColor}
-              textColor={Colors.secondaryColor}
+              textColor={Colors.warningButtonColor}
               onPress={this.back}
               disabled={this.state.loading}
             >{"Back"}</Button>
             <Button
-              textColor={Colors.linkButtonColor}
+              mode="contained"
               onPress={this._handleSubmit}
               disabled={this.state.loading}
             >{"Confirm"}</Button>

src/containers/VerusPay/VerusPay.js

@@ -121,9 +121,9 @@ class VerusPay extends Component {
   }
 
   onSuccess(codes) {
-    let result = codes[0];
-
     try {
+      let result = codes[0].value;
+
       try {
         this.tryProcessDeeplink(result)
         return