Merge pull request #165 from blocknative/fix/cleanup-unused

Cleanup unused code.

Closes #163

Author: lnbc1QWFyb24

src/interfaces.ts

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

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,
@@ -48,7 +48,8 @@ export const wallet: WritableStore = writable({
   name: null,
   provider: null,
   connect: null,
-  instance: null
+  instance: null,
+  loading: null
 })
 
 export const state = derived(

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) => {
@@ -220,38 +220,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