Merge pull request #614 from ensdomains/dev

Deploy to production

.travis.yml

@@ -1,11 +1,9 @@
 sudo: required
 
-dist: trusty
-
 language: node_js
 
 node_js:
-  - '8.11.4'
+  - lts/dubnium
 
 cache:
   yarn: true

cypress/integration/resolverMigration.spec.js

@@ -7,16 +7,13 @@ describe('Migrate resolver and records', () => {
   it('can visit a name with an old resolver and migrate it', () => {
     cy.visit(`${ROOT}/name/abittooawesome2.eth`)
     cy.getByText('Migrate', { timeout: 5000 }).click({ force: true })
-    cy.queryByText('migrate', { timeout: 50 }).should('not.exist')
+    cy.queryByText('migrate', { timeout: 1000 }).should('not.exist')
   })
 
   it('can visit a name with an old content resolver and migrate it as swarm contenthash', () => {
     cy.visit(`${ROOT}/name/oldresolver.eth`)
     cy.getByText('Migrate', { timeout: 5000 }).click({ force: true })
-    cy.queryByText('migrate', { timeout: 50 }).should('not.exist')
-    cy.queryByText('bzz://', {
-      exact: false
-    }).should('exist')
+    cy.queryByText('migrate', { timeout: 1000 }).should('not.exist')
   })
 
   it('cannot migrate resolver if the parent domain is not migrateed', () => {

package.json

@@ -7,13 +7,13 @@
     "@0xproject/utils": "^0.7.3",
     "@emotion/core": "^10.0.9",
     "@emotion/styled": "^10.0.9",
-    "@ensdomains/address-encoder": "^0.1.2",
+    "@ensdomains/address-encoder": "^0.1.3",
     "@ensdomains/ens": "^0.4.4",
     "@ensdomains/ens-022": "npm:@ensdomains/[email protected]",
     "@ensdomains/ethregistrar": "^2.0.0",
     "@ensdomains/react-ens-address": "0.0.17",
     "@ensdomains/resolver": "^0.2.4",
-    "@ensdomains/ui": "3.0.4",
+    "@ensdomains/ui": "3.0.5",
     "apollo-cache-inmemory": "^1.2.9",
     "apollo-client": "^2.4.5",
     "apollo-link": "^1.2.2",

src/index.js

@@ -33,6 +33,7 @@ window.addEventListener('load', async () => {
     client = await setupClient(networkId)
   } catch (e) {
     console.log(e)
+    client = await setupClient()
     await client.mutate({
       mutation: SET_ERROR,
       variables: { message: e.message }