From 816bb357885497f3a2aa8bb493f2ddb03afa7bbd Mon Sep 17 00:00:00 2001
From: jamaljsr <1356600+jamaljsr@users.noreply.github.com>
Date: Fri, 2 Jul 2021 00:04:55 -0400
Subject: [PATCH] deps: update typescript to v4.1.6

---
 app/package.json                     |  2 +-
 app/src/store/stores/accountStore.ts |  2 +-
 app/src/store/stores/orderStore.ts   |  2 +-
 app/tsconfig.json                    | 16 ++++++++++++----
 app/yarn.lock                        |  8 ++++----
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/package.json b/app/package.json
index 0aafadf0..7ef58071 100644
--- a/app/package.json
+++ b/app/package.json
@@ -85,7 +85,7 @@
     "node-sass": "4.14.1",
     "prettier": "2.1.2",
     "ts-protoc-gen": "0.12.0",
-    "typescript": "4.0.5"
+    "typescript": "4.1.6"
   },
   "eslintConfig": {
     "extends": "react-app",
diff --git a/app/src/store/stores/accountStore.ts b/app/src/store/stores/accountStore.ts
index 6fd4d314..ebb4b986 100644
--- a/app/src/store/stores/accountStore.ts
+++ b/app/src/store/stores/accountStore.ts
@@ -185,7 +185,7 @@ export default class AccountStore {
         });
         // remove any accounts in state that are not in the API response
         const serverIds = accountsList.map(a => hex(a.traderKey));
-        const localIds = keys(this.accounts);
+        const localIds = keys(this.accounts).map(key => String(key));
         localIds
           .filter(id => !serverIds.includes(id))
           .forEach(id => this.accounts.delete(id));
diff --git a/app/src/store/stores/orderStore.ts b/app/src/store/stores/orderStore.ts
index 92dd73da..d3eaa074 100644
--- a/app/src/store/stores/orderStore.ts
+++ b/app/src/store/stores/orderStore.ts
@@ -151,7 +151,7 @@ export default class OrderStore {
         });
         // remove any leases in state that are not in the API response
         const serverIds = leasesList.map(a => Lease.channelPointToString(a.channelPoint));
-        const localIds = keys(this.leases);
+        const localIds = keys(this.leases).map(key => String(key));
         localIds
           .filter(id => !serverIds.includes(id))
           .forEach(id => this.leases.delete(id));
diff --git a/app/tsconfig.json b/app/tsconfig.json
index 054aa879..fac70d4a 100644
--- a/app/tsconfig.json
+++ b/app/tsconfig.json
@@ -1,7 +1,11 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "lib": ["dom", "dom.iterable", "esnext"],
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
     "allowJs": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
@@ -16,9 +20,13 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react",
+    "jsx": "react-jsx",
     "baseUrl": "src"
   },
-  "include": ["src"],
-  "exclude": ["src/types/generated/**"]
+  "include": [
+    "src"
+  ],
+  "exclude": [
+    "src/types/generated/**"
+  ]
 }
diff --git a/app/yarn.lock b/app/yarn.lock
index cbdbd920..11185f40 100644
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -16310,10 +16310,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389"
-  integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==
+typescript@4.1.6:
+  version "4.1.6"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.6.tgz#1becd85d77567c3c741172339e93ce2e69932138"
+  integrity sha512-pxnwLxeb/Z5SP80JDRzVjh58KsM6jZHRAOtTpS7sXLS4ogXNKC9ANxHHZqLLeVHZN35jCtI4JdmLLbLiC1kBow==
 
 unbox-primitive@^1.0.1:
   version "1.0.1"