Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Serenity #325

Closed
wants to merge 49 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
6fcc703
remove unused package
harisato Sep 14, 2023
64974a8
fix build
harisato Sep 14, 2023
e16a4e0
Merge branch 'feat/remove-unused-package' into dev
harisato Sep 14, 2023
5d9545a
Merge branch 'feat/remove-unused-package' into dev
harisato Sep 14, 2023
d97fced
Merge branch 'feat/remove-unused-package' into dev
harisato Sep 14, 2023
2afa5a2
Merge branch 'feat/remove-unused-package' into dev
harisato Sep 14, 2023
f09f51a
fix typing
harisato Sep 14, 2023
dcfa88f
update ci
harisato Sep 14, 2023
b59b774
update ci
harisato Sep 14, 2023
7f608cd
fix lint
harisato Sep 14, 2023
cb6f8da
fix build
harisato Sep 14, 2023
b43dc11
update ci
harisato Sep 14, 2023
e246782
fix build
harisato Sep 14, 2023
814a99f
disable lint when build
harisato Sep 15, 2023
8c90434
disable lint when build
harisato Sep 15, 2023
c94b39e
update ci
harisato Sep 15, 2023
d42f1d7
fix build
harisato Sep 15, 2023
d024976
fix build
harisato Sep 15, 2023
5f8a275
remove unused component
Sep 15, 2023
a0e3010
remove function createTransaction
Sep 15, 2023
9deccb3
remove unused package
Sep 15, 2023
91544f2
update yarn lock
Sep 15, 2023
842c24b
Merge pull request #320 from aura-nw/fix/remove-unused-package
hoangndm3139 Sep 15, 2023
f46a7c5
update
harisato Sep 15, 2023
2416db2
update
harisato Sep 15, 2023
69baf74
update
harisato Sep 15, 2023
4977b30
update
harisato Sep 15, 2023
8773a0a
update
harisato Sep 15, 2023
887c65a
update
harisato Sep 15, 2023
701a280
update
harisato Sep 15, 2023
402b04d
update
harisato Sep 15, 2023
e1fcf38
update
harisato Sep 15, 2023
a143abd
update
harisato Sep 15, 2023
ff5414a
remove unused files
Sep 15, 2023
aad5683
Merge branch 'dev' into fix/remove-unused-package
Sep 15, 2023
80ac3e8
Merge pull request #322 from aura-nw/fix/remove-unused-package
hoangndm3139 Sep 15, 2023
5d91076
update Dockerfile
harisato Sep 15, 2023
30c8d0c
update Dockerfile
harisato Sep 15, 2023
b3cec3a
rollback Dockerfile
harisato Sep 15, 2023
ef212bd
update github ci
harisato Sep 15, 2023
db0f5a7
update Dockerfile
harisato Sep 15, 2023
3698591
rollback Dockerfile
harisato Sep 15, 2023
c210aa1
Merge branch 'harisato-dev' into dev
harisato Sep 15, 2023
5ab8e54
Update package.json
harisato Sep 15, 2023
16fe7a8
Update Dockerfile
harisato Sep 18, 2023
4d96c9e
remove unused files
Sep 21, 2023
974a318
Merge branch 'dev' into fix/remove-unused-package
Sep 21, 2023
875fe82
Merge pull request #323 from aura-nw/fix/remove-unused-package
hoangndm3139 Sep 21, 2023
5b6759a
Merge pull request #324 from aura-nw/dev
hoangndm3139 Sep 21, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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