Merge pull request #6461 from Expensify/cmartins-fixOnfidoDesktop

Fix blank screen when exiting the Onfido page in IOU flow

Author: Luke9389

src/components/Onfido/index.js renamed to src/components/Onfido/BaseOnfidoWeb.js

@@ -93,14 +93,6 @@ class Onfido extends React.Component {
         });
     }
 
-    componentWillUnmount() {
-        if (!this.onfidoOut) {
-            return;
-        }
-
-        this.onfidoOut.tearDown();
-    }
-
     render() {
         return (
             <div id={CONST.ONFIDO.CONTAINER_ID} />

src/components/Onfido/index.desktop.js

@@ -0,0 +1,11 @@
+import BaseOnfidoWeb from './BaseOnfidoWeb';
+import onfidoPropTypes from './onfidoPropTypes';
+
+// On desktop, we do not want to teardown onfido, because it causes a crash.
+// See https://github.com/Expensify/App/issues/6082
+const Onfido = BaseOnfidoWeb;
+
+Onfido.propTypes = onfidoPropTypes;
+Onfido.displayName = 'Onfido';
+
+export default Onfido;

src/components/Onfido/index.website.js

@@ -0,0 +1,34 @@
+import React, {Component} from 'react';
+import lodashGet from 'lodash/get';
+import BaseOnfidoWeb from './BaseOnfidoWeb';
+import onfidoPropTypes from './onfidoPropTypes';
+
+class Onfido extends Component {
+    constructor(props) {
+        super(props);
+        this.baseOnfido = null;
+    }
+
+    componentWillUnmount() {
+        const onfidoOut = lodashGet(this, 'baseOnfido.onfidoOut');
+        if (!onfidoOut) {
+            return;
+        }
+
+        onfidoOut.tearDown();
+    }
+
+    render() {
+        return (
+            <BaseOnfidoWeb
+                ref={e => this.baseOnfido = e}
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...this.props}
+            />
+        );
+    }
+}
+
+Onfido.propTypes = onfidoPropTypes;
+
+export default Onfido;