From 54fc1f27fb8f55cbb2a8225226646b9b8dc1b343 Mon Sep 17 00:00:00 2001
From: Rafael Bravo <rafael@metheora.com>
Date: Thu, 28 Jun 2018 19:15:35 -0300
Subject: [PATCH 1/4] re-render qrcode after 300ms

for fixing android bug where it stayed blank when opening on a modal sometimes
---
 lib/Canvas.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/Canvas.js b/lib/Canvas.js
index 81d7f3e..17b9b49 100644
--- a/lib/Canvas.js
+++ b/lib/Canvas.js
@@ -14,9 +14,7 @@ var Canvas = createReactClass({
     propTypes: {
         style: PropTypes.object,
         context: PropTypes.object,
-        render: PropTypes.func.isRequired,
-        onLoad: PropTypes.func,
-        onLoadEnd: PropTypes.func,
+        render: PropTypes.func.isRequired
     },
 
     render() {
@@ -28,14 +26,12 @@ var Canvas = createReactClass({
                     automaticallyAdjustContentInsets={false}
                     scalesPageToFit={Platform.OS === 'android'}
                     contentInset={{top: 0, right: 0, bottom: 0, left: 0}}
-                    source={{html: "<style>*{margin:0;padding:0;}canvas{transform:translateZ(0);}</style><canvas></canvas><script>var canvas = document.querySelector('canvas');(" + renderString + ").call(" + contextString + ", canvas);</script>"}}
+                    source={{html: "<style>*{margin:0;padding:0;background:#f2f2f2}canvas{transform:translateZ(0);}</style><canvas></canvas><script>var canvas = document.querySelector('canvas');(" + renderString + ").call(" + contextString + ", canvas); setTimeout(function(){ (" + renderString + ").call(" + contextString + ", canvas); },300);</script>"}}
                     opaque={false}
                     underlayColor={'transparent'}
                     style={this.props.style}
                     javaScriptEnabled={true}
                     scrollEnabled={false}
-                    onLoad={this.props.onLoad}
-                    onLoadEnd={this.props.onLoadEnd}
                 />
             </View>
         );

From 8de1a7f713efc7e75d8a958a7edb46f81a306314 Mon Sep 17 00:00:00 2001
From: Rafael Bravo <rafael@metheora.com>
Date: Thu, 28 Jun 2018 19:19:15 -0300
Subject: [PATCH 2/4] remove debug background canvas

---
 lib/Canvas.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Canvas.js b/lib/Canvas.js
index 17b9b49..cd41d7d 100644
--- a/lib/Canvas.js
+++ b/lib/Canvas.js
@@ -26,7 +26,7 @@ var Canvas = createReactClass({
                     automaticallyAdjustContentInsets={false}
                     scalesPageToFit={Platform.OS === 'android'}
                     contentInset={{top: 0, right: 0, bottom: 0, left: 0}}
-                    source={{html: "<style>*{margin:0;padding:0;background:#f2f2f2}canvas{transform:translateZ(0);}</style><canvas></canvas><script>var canvas = document.querySelector('canvas');(" + renderString + ").call(" + contextString + ", canvas); setTimeout(function(){ (" + renderString + ").call(" + contextString + ", canvas); },300);</script>"}}
+                    source={{html: "<style>*{margin:0;padding:0;}canvas{transform:translateZ(0);}</style><canvas></canvas><script>var canvas = document.querySelector('canvas');(" + renderString + ").call(" + contextString + ", canvas); setTimeout(function(){ (" + renderString + ").call(" + contextString + ", canvas); },300);</script>"}}
                     opaque={false}
                     underlayColor={'transparent'}
                     style={this.props.style}

From 3929348e36fd18c734bd77c4b67034522c929772 Mon Sep 17 00:00:00 2001
From: Rafael Bravo <rafael@metheora.com>
Date: Thu, 28 Jun 2018 19:23:00 -0300
Subject: [PATCH 3/4] new methods from base repo

---
 lib/Canvas.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/Canvas.js b/lib/Canvas.js
index cd41d7d..33c135d 100644
--- a/lib/Canvas.js
+++ b/lib/Canvas.js
@@ -14,6 +14,9 @@ var Canvas = createReactClass({
     propTypes: {
         style: PropTypes.object,
         context: PropTypes.object,
+        render: PropTypes.func.isRequired,
+        onLoad: PropTypes.func,
+        onLoadEnd: PropTypes.func,
         render: PropTypes.func.isRequired
     },
 
@@ -32,6 +35,8 @@ var Canvas = createReactClass({
                     style={this.props.style}
                     javaScriptEnabled={true}
                     scrollEnabled={false}
+                    onLoad={this.props.onLoad}
+                    onLoadEnd={this.props.onLoadEnd}
                 />
             </View>
         );

From 0f9c9e08e8a0e5cd03300798d74269147f9a2588 Mon Sep 17 00:00:00 2001
From: Rafael Bravo <rafael@metheora.com>
Date: Thu, 28 Jun 2018 19:24:07 -0300
Subject: [PATCH 4/4] bugfix

---
 lib/Canvas.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/Canvas.js b/lib/Canvas.js
index 33c135d..8ea5cc6 100644
--- a/lib/Canvas.js
+++ b/lib/Canvas.js
@@ -17,7 +17,6 @@ var Canvas = createReactClass({
         render: PropTypes.func.isRequired,
         onLoad: PropTypes.func,
         onLoadEnd: PropTypes.func,
-        render: PropTypes.func.isRequired
     },
 
     render() {