Merge remote-tracking branch 'upstream/master'

Neufund · Jun 1, 2018 · 611636a · 611636a
2 parents 57edf61 + 2d734a6
commit 611636a
Show file tree

Hide file tree

Showing 20 changed files with 21 additions and 0 deletions.
diff --git a/packages/common/.flowconfig b/packages/common/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+<PROJECT_ROOT>/lib
 
 [include]
 

diff --git a/packages/currencies/.flowconfig b/packages/currencies/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+<PROJECT_ROOT>/lib
 
 [include]
 

diff --git a/packages/example-node/.flowconfig b/packages/example-node/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+<PROJECT_ROOT>/lib
 
 [include]
 

diff --git a/packages/hw-app-ada/.flowconfig b/packages/hw-app-ada/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+<PROJECT_ROOT>/lib
 
 [include]
 

diff --git a/packages/hw-app-btc/.flowconfig b/packages/hw-app-btc/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+<PROJECT_ROOT>/lib
 
 [include]
 

diff --git a/packages/hw-app-btc/src/Btc.js b/packages/hw-app-btc/src/Btc.js
@@ -599,6 +599,7 @@ btc.createPaymentTransactionNew(
             segwit
           ).then(() =>
             doIf(!resuming && typeof changePath != "undefined", () => {
+              // $FlowFixMe
               return this.provideOutputFullChangePath(changePath);
             }).then(() => this.hashOutputFull(outputScript))
           )
@@ -633,6 +634,7 @@ btc.createPaymentTransactionNew(
             .then(() =>
               doIf(!segwit, () =>
                 doIf(!resuming && typeof changePath != "undefined", () => {
+                  // $FlowFixMe
                   return this.provideOutputFullChangePath(changePath);
                 }).then(() => this.hashOutputFull(outputScript))
               )

diff --git a/packages/hw-app-eth/.flowconfig b/packages/hw-app-eth/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+<PROJECT_ROOT>/lib
 
 [include]
 

diff --git a/packages/hw-app-str/.flowconfig b/packages/hw-app-str/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+<PROJECT_ROOT>/lib
 
 [include]
 

diff --git a/packages/hw-app-xrp/.flowconfig b/packages/hw-app-xrp/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+<PROJECT_ROOT>/lib
 
 [include]
 

diff --git a/packages/hw-hid-cli/.flowconfig b/packages/hw-hid-cli/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+<PROJECT_ROOT>/lib
 
 [include]
 

diff --git a/packages/hw-http-proxy-devserver/.flowconfig b/packages/hw-http-proxy-devserver/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+<PROJECT_ROOT>/lib
 
 [include]
 

diff --git a/packages/hw-transport-http/.flowconfig b/packages/hw-transport-http/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+<PROJECT_ROOT>/lib
 
 [include]
 

diff --git a/packages/hw-transport-mocker/.flowconfig b/packages/hw-transport-mocker/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+<PROJECT_ROOT>/lib
 
 [include]
 

diff --git a/packages/hw-transport-node-hid/.flowconfig b/packages/hw-transport-node-hid/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+<PROJECT_ROOT>/lib
 
 [include]
 

diff --git a/packages/hw-transport-u2f/.flowconfig b/packages/hw-transport-u2f/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+<PROJECT_ROOT>/lib
 
 [include]
 

diff --git a/packages/hw-transport/.flowconfig b/packages/hw-transport/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+<PROJECT_ROOT>/lib
 
 [include]
 

diff --git a/packages/react-native-hid/.flowconfig b/packages/react-native-hid/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+<PROJECT_ROOT>/lib
 
 [include]
 

diff --git a/packages/react-native-hw-transport-ble/.flowconfig b/packages/react-native-hw-transport-ble/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+<PROJECT_ROOT>/lib
 
 [include]
 

diff --git a/packages/test/.flowconfig b/packages/test/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+<PROJECT_ROOT>/lib
 
 [include]
 

diff --git a/packages/web3-subprovider/.flowconfig b/packages/web3-subprovider/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+<PROJECT_ROOT>/lib
 
 [include]