Skip to content

Commit

Permalink
Merge pull request #329 from aura-nw/serenity
Browse files Browse the repository at this point in the history
Serenity
  • Loading branch information
hoangndm3139 authored Oct 19, 2023
2 parents 31ba513 + 369430d commit 06e93fe
Show file tree
Hide file tree
Showing 215 changed files with 1,531 additions and 21,946 deletions.
25 changes: 0 additions & 25 deletions .env.example

This file was deleted.

10 changes: 5 additions & 5 deletions .github/workflows/ci-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to Github Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand All @@ -23,7 +23,7 @@ jobs:
SHORT_SHA_COMMIT=$(git rev-parse --short HEAD)
echo CONTAINER_RELEASE_IMAGE=ghcr.io/aura-nw/safe-react:${GITHUB_REF_NAME}_${SHORT_SHA_COMMIT} >> $GITHUB_ENV
- name: Build and push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand Down
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
# . "$(dirname "$0")/_/husky.sh"

# yarn lint-staged --allow-empty
yarn lint-staged --allow-empty

# yarn update-mocks
8 changes: 0 additions & 8 deletions .storybook/main.js

This file was deleted.

6 changes: 0 additions & 6 deletions .storybook/preview-body.html

This file was deleted.

23 changes: 0 additions & 23 deletions .storybook/preview.js

This file was deleted.

15 changes: 12 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
FROM node:16 as build
FROM node:18.17 as build

# Grab needed environment variables from .env.example
ENV REACT_APP_ENV=production
ENV NODE_OPTIONS=--openssl-legacy-provider

WORKDIR /app

COPY package.json yarn.lock ./
COPY ./src/logic/contracts/artifacts/*.json ./src/logic/contracts/artifacts/
RUN yarn install --frozen-lockfile --network-concurrency 1
# Due to some dependencies yarn may randomly throw an error about invalid cache
# This approach is taken from https://github.com/yarnpkg/yarn/issues/7212#issuecomment-506155894 to fix the issue
# Another approach is to install with flag --network-concurrency 1, but this will make the installation pretty slow (default value is 8)
RUN mkdir .yarncache
RUN yarn install --cache-folder ./.yarncache --frozen-lockfile
RUN rm -rf .yarncache
RUN yarn cache clean

COPY . .
RUN yarn build
Expand Down
33 changes: 0 additions & 33 deletions GNOSISCLA.md

This file was deleted.

10 changes: 5 additions & 5 deletions config/jest/Web3Mock.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Web3 from 'web3'
// import Web3 from 'web3'

const window = global.window || {}
window.web3 = {}
window.web3.currentProvider = new Web3.providers.HttpProvider('http://localhost:8545')
// const window = global.window || {}
// window.web3 = {}
// window.web3.currentProvider = new Web3.providers.HttpProvider('http://localhost:8545')

global.window = window
// global.window = window
Loading

0 comments on commit 06e93fe

Please sign in to comment.