Merge pull request #523 from blocknative/release/1.22.0

Release 1.22.0

Author: lnbc1QWFyb24

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bnc-onboard",
-  "version": "1.21.0",
+  "version": "1.22.0",
   "description": "Onboard users to web3 by allowing them to select a wallet, get that wallet ready to transact and have access to synced wallet state.",
   "keywords": [
     "ethereum",

src/interfaces.ts

@@ -171,7 +171,6 @@ export interface CommonWalletOptions {
   label?: string
   iconSrc?: string
   svg?: string
-  isMobile: boolean
 }
 
 export interface SdkWalletOptions extends CommonWalletOptions {
@@ -366,7 +365,7 @@ export type AllWalletInitOptions = CommonWalletOptions &
   AuthereumOptions &
   LedgerOptions &
   WalletLinkOptions &
-  InjectedWithBalanceOptions & { networkId: number }
+  InjectedWithBalanceOptions & { networkId: number } & { isMobile: boolean }
 
 export interface WalletCheckCustomOptions {
   heading?: string

src/modules/check/network.ts

@@ -5,6 +5,8 @@ import {
   WalletCheckCustomOptions
 } from '../../interfaces'
 import { networkIcon } from './icons'
+import { app } from './../../stores'
+import { get } from 'svelte/store'
 
 function network(
   options: WalletCheckCustomOptions = {}
@@ -30,7 +32,7 @@ function network(
           setTimeout(() => {
             if (network === null) {
               // if prom isn't resolving after 500ms, then stop waiting
-              resolve()
+              resolve(undefined)
             }
           }, 500)
         })

src/modules/select/index.ts

@@ -1,4 +1,8 @@
-import { WalletModule, WalletInitOptions } from '../../interfaces'
+import {
+  WalletModule,
+  WalletInitOptions,
+  AllWalletInitOptions
+} from '../../interfaces'
 import { isWalletInit } from '../../validation'
 
 // wallets that qualify for default wallets need to have no
@@ -18,7 +22,8 @@ const mobileDefaultWalletNames = [
   'tokenpocket',
   'dcent',
   'atoken',
-  'liquality'
+  'liquality',
+  'ownbit'
 ]
 
 function select(
@@ -64,7 +69,7 @@ function select(
 function getModule(
   name: string
 ): Promise<{
-  default: (options: any) => WalletModule
+  default: (options: AllWalletInitOptions) => WalletModule
 }> {
   switch (name) {
     // Deprecated wallets
@@ -129,6 +134,8 @@ function getModule(
       return import('./wallets/liquality')
     case 'frame':
       return import('./wallets/frame')
+    case 'ownbit':
+      return import('./wallets/ownbit')
     default:
       throw new Error(`${name} is not a valid walletName.`)
   }

src/modules/select/wallet-icons/icon-ownbit.ts

@@ -0,0 +1,17 @@
+const ownbitIcon = `
+  <svg width="40px" height="40px" viewBox="0 0 132 132" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Shape Copy</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <linearGradient x1="15.8%" y1="84.9%" x2="106.3%" y2="-17.2%" id="linearGradient-1">
+            <stop stop-color="#0877FF" offset="0%"></stop>
+            <stop stop-color="#3CCEF9" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Page-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M65.8599735,0.000607031223 C64.4416737,0.000607031223 63.0363726,0.0454744869 61.6440701,0.135209398 C59.3754119,0.301605871 57.6214113,2.19771449 57.6274798,4.47722124 L57.6274798,32.8001645 C57.6294466,34.0359685 58.1568063,35.2123819 59.0774227,36.0346405 C59.9980391,36.8568991 61.224677,37.2470878 62.4499879,37.1074402 C63.5818523,36.9749894 64.7204182,36.9083004 65.8599735,36.9077077 C77.6016631,36.9077077 88.1871903,43.995619 92.6805403,54.8663598 C97.1738904,65.7371006 94.690175,78.2498645 86.3875466,86.5699693 C78.0849183,94.8900741 65.5984376,97.3790175 54.7505309,92.8762093 C43.9026243,88.373401 36.8296011,77.765592 36.8296011,65.999187 L36.8296011,19.2231276 C36.8304083,16.5637094 35.3161377,14.1371901 32.9297089,12.9738059 C30.54328,11.8104217 27.7035052,12.1143438 25.6160782,13.7565347 C9.44722987,26.2414401 -0.0174670853,45.544213 2.42011117e-05,65.999187 C2.42011117e-05,102.411298 30.0832892,132.297366 66.4189165,131.997767 C102.792362,131.843094 132.153742,102.169136 131.999394,65.7191272 C131.845046,29.269118 102.233419,-0.154065705 65.8599735,0.000607031223 Z" id="Shape-Copy" fill="url(#linearGradient-1)" fill-rule="nonzero"></path>
+    </g>
+  </svg>
+`
+
+export default ownbitIcon

src/modules/select/wallets/metamask.ts

@@ -4,7 +4,9 @@ import { WalletModule, Helpers, CommonWalletOptions } from '../../../interfaces'
 import metamaskIcon from '../wallet-icons/icon-metamask.png'
 import metamaskIcon2x from '../wallet-icons/icon-metamask@2x.png'
 
-function metamask(options: CommonWalletOptions): WalletModule {
+function metamask(
+  options: CommonWalletOptions & { isMobile: boolean }
+): WalletModule {
   const { preferred, label, iconSrc, svg, isMobile } = options
 
   return {

src/modules/select/wallets/ownbit.ts

@@ -0,0 +1,36 @@
+import { mobileWalletInstallMessage } from '../content'
+import { WalletModule, Helpers, CommonWalletOptions } from '../../../interfaces'
+
+import ownbitIcon from '../wallet-icons/icon-ownbit'
+
+function ownbit(options: CommonWalletOptions): WalletModule {
+  const { preferred, label, iconSrc, svg } = options
+
+  return {
+    name: label || 'Ownbit',
+    iconSrc,
+    svg: svg || ownbitIcon,
+    wallet: async (helpers: Helpers) => {
+      const { getProviderName, createModernProviderInterface } = helpers
+
+      const provider =
+        (window as any).ethereum ||
+        ((window as any).web3 && (window as any).web3.currentProvider)
+
+      return {
+        provider,
+        interface:
+          (getProviderName(provider) === 'Ownbit' &&
+            createModernProviderInterface(provider)) ||
+          null
+      }
+    },
+    type: 'injected',
+    link: 'https://ownbit.io',
+    installMessage: mobileWalletInstallMessage,
+    mobile: true,
+    preferred
+  }
+}
+
+export default ownbit

src/stores.ts

@@ -260,7 +260,7 @@ function createWalletStateSliceStore(options: {
       if (onChange) {
         stateSyncStatus[parameter] = new Promise(resolve => {
           onChange(newVal => {
-            resolve()
+            resolve(undefined)
             if (newVal || currentState !== initialState) {
               set(newVal)
             }

src/utilities.ts

@@ -1,9 +1,9 @@
 import bowser from 'bowser'
 import BigNumber from 'bignumber.js'
+import { get } from 'svelte/store'
 
-import { WalletInterface } from './interfaces'
 import { app } from './stores'
-import { get } from 'svelte/store'
+import { WalletInterface } from './interfaces'
 
 export function getNetwork(provider: any): Promise<number | any> {
   return new Promise((resolve, reject) => {
@@ -199,6 +199,10 @@ export function getProviderName(provider: any): string | undefined {
     return 'TokenPocket'
   }
 
+  if (provider.isOwnbit) {
+    return 'Ownbit'
+  }
+
   if (provider.wallet === 'MEETONE') {
     return 'MEETONE'
   }
@@ -300,7 +304,8 @@ export function networkName(id: number): string {
     case 100:
       return 'xdai'
     default:
-      return get(app).networkName || 'local'
+      const { networkId, networkName } = get(app)
+      return (networkId === id && networkName) || 'unknown'
   }
 }