From 20657689e74731f1fc17f0154ff6f841bf3d83f7 Mon Sep 17 00:00:00 2001
From: Etienne Dusseault <etienne.dusseault@gmail.com>
Date: Sun, 9 Aug 2020 22:04:10 +0800
Subject: [PATCH 1/2] add mobile specific RPC method section

---
 docs/guide/rpc-api.md | 44 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/docs/guide/rpc-api.md b/docs/guide/rpc-api.md
index c8b528b4445..ac8e8c5d86d 100644
--- a/docs/guide/rpc-api.md
+++ b/docs/guide/rpc-api.md
@@ -353,3 +353,47 @@ ethereum
   )
   .catch((error) => console.log(error.message));
 ```
+
+## Mobile Specific RPC Methods
+
+### wallet_scanQRCode
+
+#### Parameters
+
+- `Array`
+
+  0. `'REGEX'` - Optional regex for scanning arbitrary (non ETH address) QR code strings.
+
+
+#### Returns
+
+`string` - A string representing the QR code that was scanned.
+
+#### Description
+
+Allows dApps to request QR code scanning from MetaMask Mobile.
+Metamask previously introduced this feature via [EIP 945](https://github.com/ethereum/EIPs/issues/945), although it was later removed due a modification of the provider architecture. dApp developers may now access the functionality via this RPC method directly.
+
+Returns a Promise that resolves to a string corresponding to the scanned QR code.
+
+The contents of the QR code must equal one of the following:
+1. An ethereum address
+2. a string that matches the optionally provided regex parameter 
+
+The method will throw an error if one of these two criteria are not met.
+
+The request activates the user's camera, so they may scan the QR code.
+
+#### Example
+
+```javascript
+ethereum
+  .request({
+    method: 'wallet_scanQRCode',
+    params: ['\\D'], //Write the regex as a string, don't forget to use the escape character '\' if it uses backslashes
+  })
+  .then((result) => {
+    console.log(result)})
+  .catch((error) => {
+    console.log(error)});
+```
\ No newline at end of file

From 0cf05668c3dfc8d91d76501c7f1457c41fbed6a9 Mon Sep 17 00:00:00 2001
From: Erik Marks <rekmarks@protonmail.com>
Date: Sun, 9 Aug 2020 19:32:05 -0700
Subject: [PATCH 2/2] fixup

---
 docs/guide/rpc-api.md | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/guide/rpc-api.md b/docs/guide/rpc-api.md
index ac8e8c5d86d..19ed660c55d 100644
--- a/docs/guide/rpc-api.md
+++ b/docs/guide/rpc-api.md
@@ -362,27 +362,24 @@ ethereum
 
 - `Array`
 
-  0. `'REGEX'` - Optional regex for scanning arbitrary (non ETH address) QR code strings.
-
+  0. `string` - (optional) A regular expression for matching arbitrary QR code strings
 
 #### Returns
 
-`string` - A string representing the QR code that was scanned.
+`string` - The string corresponding to the scanned QR code.
 
 #### Description
 
-Allows dApps to request QR code scanning from MetaMask Mobile.
-Metamask previously introduced this feature via [EIP 945](https://github.com/ethereum/EIPs/issues/945), although it was later removed due a modification of the provider architecture. dApp developers may now access the functionality via this RPC method directly.
-
-Returns a Promise that resolves to a string corresponding to the scanned QR code.
+Requests that the user scans a QR code using their device camera.
+Returns a Promise that resolves to a string, matching either:
 
-The contents of the QR code must equal one of the following:
-1. An ethereum address
-2. a string that matches the optionally provided regex parameter 
+1. The regex parameter, if provided
+2. An ethereum address, if no regex parameter was provided
 
-The method will throw an error if one of these two criteria are not met.
+If neither condition is met, the Promise will reject with an error.
 
-The request activates the user's camera, so they may scan the QR code.
+MetaMask previously introduced this feature per the proposed [EIP-945](https://github.com/ethereum/EIPs/issues/945).
+The functionality was temporarily removed before being reintroduced as this RPC method.
 
 #### Example
 
@@ -390,10 +387,13 @@ The request activates the user's camera, so they may scan the QR code.
 ethereum
   .request({
     method: 'wallet_scanQRCode',
-    params: ['\\D'], //Write the regex as a string, don't forget to use the escape character '\' if it uses backslashes
+    // The regex string must be valid input to the RegExp constructor, if provided
+    params: ['\\D'],
   })
   .then((result) => {
-    console.log(result)})
+    console.log(result);
+  })
   .catch((error) => {
-    console.log(error)});
-```
\ No newline at end of file
+    console.log(error);
+  });
+```