Merge pull request #18 from blocknative/fix/wallet-network

Fix wallet module initialization network.

closes #17

Author: lnbc1QWFyb24

README.md

@@ -203,7 +203,7 @@ modules.select.defaults({
 ```javascript
 portis({
   apiKey: String, // your Portis api key
-  network: String //  the name of network you want to connect to
+  networkId: Number //  the networkId of network you want to connect to
 })
 ```
 
@@ -212,14 +212,14 @@ portis({
 ```javascript
 fortmatic({
   apiKey: String, // your Portis api key
-  network: String //  the name of the network you want to connect to
+  networkId: Number //  the networkId of the network you want to connect to
 })
 ```
 
 `walletConnect` Initialization:
 
 ```javascript
-fortmatic({
+walletConnect({
   infuraKey: String
 })
 ```
@@ -242,11 +242,11 @@ const onboard = Onboard.init({
         "Please select the wallet that you would like to use with this Dapp",
       wallets: {
         desktop: [
-          portis({ apiKey: 'sdda-w2-ds3', network: 'main' })
+          portis({ apiKey: 'sdda-w2-ds3', networkId: 1 })
           dapper(),
           metmask(),
         ],
-        mobile: [fortmatic({apiKey: 'sd-3d3-d', network: 'main'})]
+        mobile: [fortmatic({apiKey: 'sd-3d3-d', networkId: 1})]
       }
     }
     //....

src/modules/select/index.js

@@ -5,7 +5,6 @@ import coinbase from "./wallets/coinbase"
 import trust from "./wallets/trust"
 import portis from "./wallets/portis"
 import fortmatic from "./wallets/fortmatic"
-import { networkName } from "../../utilities"
 
 function defaults({
   heading,
@@ -17,16 +16,15 @@ function defaults({
 }) {
   const desktopModules = [metamask(), dapper()]
   const mobileModules = [coinbase(), trust()]
-  const network = networkName(networkId)
 
   if (portisInit) {
-    desktopModules.push(portis({ ...portisInit, network }))
-    mobileModules.push(portis({ ...portisInit, network }))
+    desktopModules.push(portis({ ...portisInit, networkId }))
+    mobileModules.push(portis({ ...portisInit, networkId }))
   }
 
   if (fortmaticInit) {
-    desktopModules.push(fortmatic({ ...fortmaticInit, network }))
-    mobileModules.push(fortmatic({ ...fortmaticInit, network }))
+    desktopModules.push(fortmatic({ ...fortmaticInit, networkId }))
+    mobileModules.push(fortmatic({ ...fortmaticInit, networkId }))
   }
 
   if (walletConnectInit) {

src/modules/select/wallets/fortmatic.js

@@ -1,6 +1,6 @@
 import Fortmatic from "fortmatic"
-import { networkToId } from "../../../utilities"
 import fortmaticIcon from "../wallet-icons/icon-fortmatic.svg"
+import { networkName } from "../../../utilities"
 
 function fortmatic(options) {
   if (!options || typeof options !== "object") {
@@ -9,25 +9,28 @@ function fortmatic(options) {
     )
   }
 
-  const { apiKey, network } = options
+  const { apiKey, networkId } = options
 
   if (!apiKey || typeof apiKey !== "string") {
     throw new Error(
       "A apiKey of type string is required to initialize fortmatic module"
     )
   }
 
-  if (!network || typeof network !== "string") {
+  if (!networkId || typeof networkId !== "number") {
     throw new Error(
-      "A network of type string is required to initialize fortmatic module"
+      "A networkId of type number is required to initialize fortmatic module"
     )
   }
 
   return {
     name: "Fortmatic",
     iconSrc: fortmaticIcon,
     wallet: ({ BigNumber }) => {
-      const fortmatic = new Fortmatic(apiKey, network)
+      const fortmatic = new Fortmatic(
+        apiKey,
+        networkId === 1 ? undefined : networkName(networkId)
+      )
       const provider = fortmatic.getProvider()
 
       return {
@@ -39,7 +42,7 @@ function fortmatic(options) {
             get: () => Promise.resolve(provider.account)
           },
           network: {
-            get: () => Promise.resolve(networkToId(network))
+            get: () => Promise.resolve(networkId)
           },
           balance: {
             get: () =>

src/modules/select/wallets/portis.js

@@ -1,31 +1,32 @@
 import Portis from "@portis/web3"
 
+import { networkName } from "../../../utilities"
 import portisIcon from "../wallet-icons/icon-portis.svg"
 
 function portis(options) {
   if (!options || typeof options !== "object") {
     throw new Error("An options object is required to initialize portis module")
   }
 
-  const { apiKey, network } = options
+  const { apiKey, networkId } = options
 
   if (!apiKey || typeof apiKey !== "string") {
     throw new Error(
       "A apiKey of type string is required to initialize portis module"
     )
   }
 
-  if (!network || typeof network !== "string") {
+  if (!networkId || typeof networkId !== "number") {
     throw new Error(
-      "A network of type string is required to initialize portis module"
+      "A network of type number is required to initialize portis module"
     )
   }
 
   return {
     name: "Portis",
     iconSrc: portisIcon,
     wallet: ({ BigNumber }) => {
-      const portis = new Portis(apiKey, network)
+      const portis = new Portis(apiKey, networkName(networkId))
       const { provider } = portis
 
       return {

src/utilities.js

@@ -140,7 +140,7 @@ export function isMobileDevice() {
 export function networkName(id) {
   switch (id) {
     case 1:
-      return "main"
+      return "mainnet"
     case 3:
       return "ropsten"
     case 4:
@@ -158,7 +158,7 @@ export function networkName(id) {
 
 export function networkToId(network) {
   switch (network) {
-    case "main":
+    case "mainnet":
       return 1
     case "ropsten":
       return 3