Merge branch 'dev' into fix/win-scrollbar

Conflux-Chain · Jan 27, 2022 · ba58321 · ba58321
2 parents 8751dc2 + 29a83cc
commit ba58321
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.yarn/versions/4b7ef94c.yml b/.yarn/versions/4b7ef94c.yml
@@ -0,0 +1,2 @@
+declined:
+  - helios-background
diff --git a/packages/background/src/index.integration.test.js b/packages/background/src/index.integration.test.js
@@ -330,7 +330,7 @@ describe('integration test', function () {
         ).result
 
         expect(db.getAccount().length).toBe(1)
-        await waitForExpect(() => expect(db.getAddress().length).toBe(3))
+        await waitForExpect(() => expect(db.getAddress().length).toBe(3), 20000)
         const addrs = db.getAddress()
         expect(addrs[addrs.length - 1].hex).toBe(CFX_ACCOUNTS[0].address)
         expect(addrs[addrs.length - 1].value).toBe(CFX_ACCOUNTS[0].base32)
@@ -363,7 +363,7 @@ describe('integration test', function () {
         ).result
 
         expect(db.getAccount().length).toBe(1)
-        await waitForExpect(() => expect(db.getAddress().length).toBe(3))
+        await waitForExpect(() => expect(db.getAddress().length).toBe(3), 20000)
         const addrs = db.getAddress()
         expect(addrs[addrs.length - 1].hex).toBe(ETH_ACCOUNTS[0].address)
         expect(db.findAddress({networkId})[0]).toBe(addrs[addrs.length - 1].eid)