Merge pull request #318 from reflexer-labs/develop

Develop
reflexer-labs · Jun 29, 2022 · 7387afc · 7387afc
2 parents d3e0a7e + e9771f3
commit 7387afc
Show file tree

Hide file tree

Showing 65 changed files with 836 additions and 4,030 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -101,15 +101,14 @@ jobs:
                       - CIDv0: `${{ steps.upload.outputs.hash }}`
                       - CIDv1: `${{ steps.convert_cidv0.outputs.cidv1 }}`
 
-                      The latest release is always accessible via our alias to the Cloudflare IPFS gateway at [app.reflexer.finance](https://app.reflexer.finance).
+                      The latest release is always accessible via our alias to the Cloudflare at [app.reflexer.finance](https://app.reflexer.finance).
 
                       You can also access the Reflexer app directly from an IPFS gateway.
                       **BEWARE**: The Reflexer app uses [`localStorage`](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage) to remember your settings, such as transactions hashes.
-                      **You should always use an IPFS gateway that enforces origin separation**, or our alias to the latest release at [ipfs.reflexer.finance](https://ipfs.reflexer.finance).
+                      **You should always use an IPFS gateway that enforces origin separation**, or our alias to the latest release
 
                       IPFS gateways:
                       - https://${{ steps.convert_cidv0.outputs.cidv1 }}.ipfs.dweb.link/
-                      - https://${{ steps.convert_cidv0.outputs.cidv1 }}.ipfs.cf-ipfs.com/
                       - [ipfs://${{ steps.upload.outputs.hash }}/](ipfs://${{ steps.upload.outputs.hash }}/)
 
                       ${{ needs.bump_version.outputs.changelog }}
diff --git a/README.md b/README.md
@@ -13,14 +13,15 @@ Deposit your crypto assets, generate RAI and lever up your position.
 - Website: [reflexer.finance](https://reflexer.finance/)
 - App: [app.reflexer.finance](https://app.reflexer.finance)
 - Analytics: [stats.reflexer.finance](https://stats.reflexer.finance/)
+- Tokenomics: [tokenomics.reflexer.finance](https://tokenomics.reflexer.finance/)
 - Docs: [docs.reflexer.finance](https://docs.reflexer.finance/)
 - Twitter: [@reflexerfinance](https://twitter.com/reflexerfinance)
 - Discord: [Reflexer](https://discord.com/invite/83t3xKT)
 - Whitepaper: [Link](https://github.com/reflexer-labs/whitepapers/blob/master/English/rai-english.pdf)
 
 ## Accessing the Uniswap Interface
 
-To access the Uniswap Interface, use an IPFS gateway link from the
+To access the Reflexer Interface, use an IPFS gateway link from the
 [latest release](https://github.com/reflexer-labs/geb-app/releases/latest),
 or visit [https://app.reflexer.finance](https://app.reflexer.finance).
 
@@ -47,6 +48,7 @@ To have the app default to a different network when a wallet is not connected:
 2. Change `REACT_APP_NETWORK_ID` to `"42"`
 3. Change `REACT_APP_NETWORK_URL` to e.g. `"https://kovan.infura.io/v3/{YOUR_INFURA_KEY}"`
 4. Change `REACT_APP_COIN_TICKER_STAGING` to `"RAI"`
+4. Change `REACT_APP_SHOW_AUCTIONS` to `"1"`
 
 ## Testing
 

diff --git a/cypress/integration/landing-no-proxy.test.ts b/cypress/integration/landing-no-proxy.test.ts
@@ -12,7 +12,7 @@ describe('App Page - No Proxy', () => {
         cy.visit('/', {
             qs: { type: 'no_proxy' },
         })
-        cy.wait(2000)
+        cy.wait(5000)
         cy.get('body').then((body) => {
             if (body.find('[data-test-id="waiting-modal"]').length > 0) {
                 cy.get('[data-test-id="waiting-modal"]').then((e) => {
@@ -47,7 +47,7 @@ describe('App Page - No Proxy', () => {
         cy.get('#step1 > div').contains('Create Account')
         cy.contains('✓ Accept').click()
         cy.get('[data-test-id="steps-btn"]').contains('Create Account').click()
-        cy.wait(2000)
+        cy.wait(5000)
         cy.contains('Transaction Failed').should('be.visible')
         cy.contains('Dismiss').should('be.visible')
     })

diff --git a/cypress/integration/landing-no-safes.test.ts b/cypress/integration/landing-no-safes.test.ts
@@ -11,7 +11,7 @@ describe('App Page - No Safes', () => {
         cy.visit('/', {
             qs: { type: 'no_safes' },
         })
-        cy.wait(2000)
+        cy.wait(5000)
         cy.get('body').then((body) => {
             if (body.find('[data-test-id="waiting-modal"]').length > 0) {
                 cy.get('[data-test-id="waiting-modal"]').then((e) => {
@@ -41,14 +41,14 @@ describe('App Page - No Safes', () => {
         cy.contains('✓ Accept').click()
         cy.get('#step2 > div').contains('Create a Safe')
         cy.get('[data-test-id="steps-btn"]').contains('Create a Safe').click()
-        cy.wait(2000)
+        cy.wait(5000)
         cy.url().should('include', 'create')
     })
 
     it('creates a new safe', () => {
         cy.contains('✓ Accept').click()
         cy.get('[data-test-id="steps-btn"]').contains('Create a Safe').click()
-        cy.wait(2000)
+        cy.wait(5000)
         cy.url().should('include', 'create')
         cy.get('[data-test-id="deposit_borrow"]').type('4')
         cy.get('[data-test-id="repay_withdraw"]').type('1000')

diff --git a/cypress/integration/landing-safes.test.ts b/cypress/integration/landing-safes.test.ts
@@ -8,7 +8,7 @@ import {
 describe('App Page - Has Safes', () => {
     beforeEach(() => {
         cy.visit('/')
-        cy.wait(2000)
+        cy.wait(5000)
         cy.get('body').then((body) => {
             if (body.find('[data-test-id="waiting-modal"]').length > 0) {
                 cy.get('[data-test-id="waiting-modal"]').then((e) => {

diff --git a/cypress/integration/safe-details.test.ts b/cypress/integration/safe-details.test.ts
@@ -10,7 +10,7 @@ describe('App Page - Safe Details', () => {
 
     beforeEach(() => {
         cy.visit('/')
-        cy.wait(2000)
+        cy.wait(5000)
         cy.get('body').then((body) => {
             if (body.find('[data-test-id="waiting-modal"]').length > 0) {
                 cy.get('[data-test-id="waiting-modal"]').then((e) => {
@@ -24,7 +24,7 @@ describe('App Page - Safe Details', () => {
         })
         cy.contains('✓ Accept').click()
         cy.get('.safeBlock').first().click()
-        cy.wait(2000)
+        cy.wait(5000)
         cy.get('body').then((body) => {
             if (body.find('[data-test-id="waiting-modal"]').length > 0) {
                 cy.get('[data-test-id="waiting-modal"]').then((e) => {
@@ -61,7 +61,7 @@ describe('App Page - Safe Details', () => {
                 cy.get('[data-test-id="deposit_borrow_right"]').type(
                     getValue(tx)
                 )
-                cy.wait(2000)
+                cy.wait(5000)
                 cy.contains('140.00%')
             })
     })
@@ -131,7 +131,7 @@ describe('App Page - Safe Details', () => {
                     () => Cypress.$(e).text() === 'Transaction Submitted',
                     {
                         timeout: 100000,
-                        interval: 2000,
+                        interval: 5000,
                     }
                 )
             )
@@ -154,7 +154,7 @@ describe('App Page - Safe Details', () => {
                     () => Cypress.$(e).text() === 'Transaction Submitted',
                     {
                         timeout: 100000,
-                        interval: 2000,
+                        interval: 5000,
                     }
                 )
             )

diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
@@ -139,6 +139,12 @@ const returnWallet = (type: string) => {
     }
 }
 
+Cypress.on('uncaught:exception', (err, runnable) => {
+    // returning false here prevents Cypress from
+    // failing the test
+    return false
+})
+
 Cypress.Commands.overwrite('visit', (original, url, options) => {
     const { privateKey, walletAddress, allowTx } = returnWallet(
         options && options.qs ? options.qs.type : ''

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "geb-app",
     "version": "0.1.0",
-    "homepage": "./",
+    "homepage": ".",
     "private": true,
     "dependencies": {
         "@ethersproject/address": "^5.0.10",
@@ -54,14 +54,15 @@
         "react-transition-group": "^4.4.1",
         "styled-components": "^5.2.0",
         "typescript": "3.8.3",
-        "walletlink": "^2.1.0"
+        "walletlink": "^2.1.0",
+        "web3-react-types": "npm:@web3-react/types@^6.0.7"
     },
     "scripts": {
         "start": "react-scripts start",
         "build": "react-scripts build",
         "prettier": "prettier --write \"{,**/*.{ts,tsx,json,js,md}}\"",
         "test": "react-scripts test",
-        "test:e2e": "start-server-and-test start http://localhost:3000 'cypress run'",
+        "test:e2e": "start-server-and-test 'serve build -l 3000' http://localhost:3000 'cypress run'",
         "eject": "react-scripts eject"
     },
     "eslintConfig": {
@@ -93,7 +94,7 @@
         "@types/react-transition-group": "^4.4.0",
         "@types/styled-components": "^5.1.3",
         "crypto": "^1.0.1",
-        "cypress": "^6.4.0",
+        "cypress": "^7.7.0",
         "cypress-wait-until": "^1.7.1",
         "husky": "^5.0.9",
         "lint-staged": "^10.5.4",