Merge branch 'develop' into feature/wallet-url

Author: lnbc1QWFyb24

src/interfaces.ts

@@ -223,9 +223,3 @@ export interface AppState {
 export interface CancelablePromise extends Promise<any> {
   cancel: () => void
 }
-
-export interface QueryablePromise extends CancelablePromise {
-  isFulfilled: () => boolean
-  isResolved: () => boolean
-  isRejected: () => boolean
-}

src/modules/select/index.ts

@@ -8,7 +8,8 @@ const defaultWalletNames = [
   'trust',
   'authereum',
   'opera',
-  'operaTouch'
+  'operaTouch',
+  'status'
 ]
 
 function select(
@@ -67,6 +68,8 @@ function getModule(name: string): Promise<any> | undefined {
       return import('./wallets/opera')
     case 'operaTouch':
       return import('./wallets/opera-touch')
+    case 'status':
+      return import('./wallets/status')
     default:
       return
   }

src/modules/select/wallets/status.ts

@@ -0,0 +1,45 @@
+import { extensionInstallMessage } from '../content'
+import { WalletModule, Helpers } from '../../../interfaces'
+
+const statusIcon = `
+<svg width="109" height="109" viewBox="0 0 109 109" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M54.7 0C24.7 0 0.400024 24.3 0.400024 54.3C0.400024 84.3 24.7 108.6 54.7 108.6C84.7 108.6 109 84.3 109 54.3C108.9 24.3 84.6 0 54.7 0ZM47.3 77.6C40.4 78 33.4 74 33.1 67.5C32.7 61.1 37.9 56.8 46.5 56.4C49.7 56.2 52.3 56.5 54.8 56.7C57.4 57 60 57.2 63.1 57C64.6 56.9 66.2 56.7 67.8 56.4C67 67.4 58.6 77 47.3 77.6ZM65.3 52.3C61.9 52.5 59.2 52.2 56.5 51.9C53.8 51.6 51 51.3 47.7 51.5C46.1 51.6 44.4 51.8 42.8 52.2C43.8 40.2 52.6 29.7 64.5 29.1C71.8 28.7 79.1 33.1 79.5 40.2C79.9 47.2 74.4 51.8 65.3 52.3Z" fill="#4360DF"/>
+</svg>
+`
+
+function status(
+  options: {
+    preferred?: boolean
+    label?: string
+    iconSrc?: string
+    svg?: string
+  } = {}
+): WalletModule {
+  const { preferred, label, iconSrc, svg } = options
+
+  return {
+    name: label || 'Status',
+    iconSrc: iconSrc,
+    iconSrcSet: iconSrc,
+    svg: svg || statusIcon,
+    wallet: async (helpers: Helpers) => {
+      const { getProviderName, createModernProviderInterface } = helpers
+
+      const provider = (window as any).ethereum
+
+      return {
+        provider,
+        interface:
+          provider && getProviderName(provider) === 'Status'
+            ? createModernProviderInterface(provider)
+            : null
+      }
+    },
+    link: 'https://status.im/',
+    installMessage: extensionInstallMessage,
+    mobile: true,
+    preferred
+  }
+}
+
+export default status

src/stores.ts

@@ -1,7 +1,7 @@
 import { getBlocknative } from './services'
 import { writable, derived, get } from 'svelte/store'
 import debounce from 'lodash.debounce'
-import { wait, makeQueryablePromise, makeCancelable } from './utilities'
+import { wait, makeCancelable } from './utilities'
 import { validateWalletInterface, validateType } from './validation'
 import {
   WritableStore,
@@ -10,7 +10,7 @@ import {
   WalletStateSliceStore,
   StateSyncer,
   BalanceStore,
-  QueryablePromise
+  CancelablePromise
 } from './interfaces'
 
 export const app: WritableStore = writable({
@@ -28,7 +28,7 @@ export const app: WritableStore = writable({
 })
 
 export const balanceSyncStatus: {
-  syncing: null | QueryablePromise
+  syncing: null | CancelablePromise
   error: string
 } = {
   syncing: null,
@@ -49,7 +49,8 @@ export const wallet: WritableStore = writable({
   provider: null,
   connect: null,
   instance: null,
-  url: null
+  url: null,
+  loading: null
 })
 
 export const state = derived(
@@ -148,7 +149,7 @@ function createWalletStateSliceStore(options: {
           get()
             .then(set)
             .catch((err: any) => {
-              throw new Error(
+              console.warn(
                 `Error getting ${parameter} from state syncer: ${err}`
               )
             })

src/utilities.ts

@@ -1,7 +1,7 @@
 import bowser from 'bowser'
 import BigNumber from 'bignumber.js'
 
-import { WalletInterface, QueryablePromise } from './interfaces'
+import { WalletInterface } from './interfaces'
 
 export function getNetwork(provider: any): Promise<number | any> {
   return new Promise((resolve, reject) => {
@@ -156,6 +156,10 @@ export function getProviderName(provider: any): string | undefined {
     return 'Opera'
   }
 
+  if (provider.isStatus) {
+    return 'Status'
+  }
+
   if (provider.host && provider.host.indexOf('localhost') !== -1) {
     return 'localhost'
   }
@@ -167,7 +171,7 @@ export function getDeviceInfo() {
   const { type } = browser.getPlatform()
 
   return {
-    isMobile: type !== 'desktop',
+    isMobile: type ? type !== 'desktop' : window.innerWidth < 600,
     os: name
   }
 }
@@ -220,38 +224,12 @@ export function makeCancelable(promise: any) {
   })
 
   wrappedPromise.cancel = () => {
-    rejectFn('poop')
+    rejectFn('canceled')
   }
 
   return wrappedPromise
 }
 
-export function makeQueryablePromise(promise: any): QueryablePromise {
-  let isResolved = false
-  let isRejected = false
-
-  promise.then(function(v: any) {
-    isResolved = true
-    return v
-  })
-
-  promise.catch(() => {
-    console.log('caught 2')
-    isRejected = true
-  })
-
-  promise.isFulfilled = function() {
-    return isResolved || isRejected
-  }
-  promise.isResolved = function() {
-    return isResolved
-  }
-  promise.isRejected = function() {
-    return isRejected
-  }
-  return promise
-}
-
 export function isPromise(val: any): val is Promise<any> {
   if ((val as Promise<any>) instanceof Promise) {
     return true