Skip to content

Commit df90896

Browse files
author
Daniel Sanchez
authored
Merge pull request 5afe#2079 from gnosis/release/v3.3.0
Release v3.3.0
2 parents 3524616 + 4b8e143 commit df90896

File tree

171 files changed

+1701
-2437
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+1701
-2437
lines changed

‎.github/workflows/deploy-ewc.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
name: Deploy to EWC network
22

3-
# Run on pushes to master
3+
# Run on pushes to master or PRs to master
44
on:
55
push:
66
branches:
77
- master
8+
pull_request:
9+
branches:
10+
- master
811
# Launches build when release is published
912
release:
1013
types: [published]
@@ -33,8 +36,12 @@ jobs:
3336
runs-on: ubuntu-latest
3437

3538
steps:
39+
- name: Cancel Previous Runs
40+
uses: styfle/[email protected]
41+
with:
42+
access_token: ${{ github.token }}
3643
- name: Remove broken apt repos [Ubuntu]
37-
if: matrix.os == 'ubuntu-latest'
44+
if: ${{ matrix.os }} == 'ubuntu-latest'
3845
run: |
3946
for apt_file in `grep -lr microsoft /etc/apt/sources.list.d/`; do sudo rm $apt_file; done
4047
- uses: actions/checkout@v2
@@ -62,9 +69,9 @@ jobs:
6269
yarn cache clean
6370
6471
# Set production flag
65-
- name: Set production flag for tag build
72+
- name: Set production flag for release PR or tagged build
6673
run: echo "REACT_APP_ENV=production" >> $GITHUB_ENV
67-
if: startsWith(github.ref, 'refs/tags/v')
74+
if: startsWith(github.ref, 'refs/tags/v') || github.base_ref == 'master'
6875

6976
- name: Build ${{ env.REACT_APP_NETWORK }} app
7077
run: yarn build
@@ -98,7 +105,6 @@ jobs:
98105
* [Safe Multisig app ${{ env.REACT_APP_NETWORK }}](${{ env.REVIEW_FEATURE_URL }}/${{ env.REACT_APP_NETWORK }}/app/)
99106
repo-token: ${{ secrets.GITHUB_TOKEN }}
100107
repo-token-user-login: 'github-actions[bot]'
101-
allow-repeats: true
102108
if: success() && github.event.number
103109
env:
104110
REVIEW_FEATURE_URL: https://pr${{ github.event.number }}--${{ env.REPO_NAME_ALPHANUMERIC }}.review.gnosisdev.com

‎.github/workflows/deploy-mainnet.yml‎

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
name: Deploy to Mainnet network
22

3-
# Run on pushes to master
3+
# Run on pushes to master or PRs
44
on:
5+
# Pull request hook without any config. Launches for every pull request
6+
pull_request:
57
push:
68
branches:
79
- master
@@ -33,8 +35,12 @@ jobs:
3335
runs-on: ubuntu-latest
3436

3537
steps:
38+
- name: Cancel Previous Runs
39+
uses: styfle/[email protected]
40+
with:
41+
access_token: ${{ github.token }}
3642
- name: Remove broken apt repos [Ubuntu]
37-
if: matrix.os == 'ubuntu-latest'
43+
if: ${{ matrix.os }} == 'ubuntu-latest'
3844
run: |
3945
for apt_file in `grep -lr microsoft /etc/apt/sources.list.d/`; do sudo rm $apt_file; done
4046
- uses: actions/checkout@v2
@@ -62,9 +68,9 @@ jobs:
6268
yarn cache clean
6369
6470
# Set production flag
65-
- name: Set production flag for tag build
71+
- name: Set production flag for release PR or tagged build
6672
run: echo "REACT_APP_ENV=production" >> $GITHUB_ENV
67-
if: startsWith(github.ref, 'refs/tags/v')
73+
if: startsWith(github.ref, 'refs/tags/v') || github.base_ref == 'master'
6874

6975
- name: Build ${{ env.REACT_APP_NETWORK }} app
7076
run: yarn build
@@ -84,7 +90,26 @@ jobs:
8490
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
8591

8692
# Script to deploy Pull Requests
87-
# Mainnet build is never created in Pull Requests
93+
- run: bash ./scripts/github/deploy_pull_request.sh
94+
if: success() && github.event.number
95+
env:
96+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
97+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
98+
PR_NUMBER: ${{ github.event.number }}
99+
REVIEW_BUCKET_NAME: ${{ secrets.AWS_REVIEW_BUCKET_NAME }}
100+
REACT_APP_NETWORK: ${{ env.REACT_APP_NETWORK }}
101+
TRAVIS_TAG: ${{ github.event.release.tag_name }}
102+
103+
- name: 'PRaul: Comment PR with app URLs'
104+
uses: mshick/add-pr-comment@v1
105+
with:
106+
message: |
107+
* [Safe Multisig app ${{ env.REACT_APP_NETWORK }}](${{ env.REVIEW_FEATURE_URL }}/${{ env.REACT_APP_NETWORK }}/app/)
108+
repo-token: ${{ secrets.GITHUB_TOKEN }}
109+
repo-token-user-login: 'github-actions[bot]'
110+
if: success() && github.event.number
111+
env:
112+
REVIEW_FEATURE_URL: https://pr${{ github.event.number }}--${{ env.REPO_NAME_ALPHANUMERIC }}.review.gnosisdev.com
88113

89114
# Script to deploy to development environment
90115
# Mainnet build is never created in development branch

‎.github/workflows/deploy-rinkeby.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ jobs:
3737
name: Deployment
3838
runs-on: ubuntu-latest
3939
steps:
40+
- name: Cancel Previous Runs
41+
uses: styfle/[email protected]
42+
with:
43+
access_token: ${{ github.token }}
4044
- name: Remove broken apt repos [Ubuntu]
4145
if: ${{ matrix.os }} == 'ubuntu-latest'
4246
run: |
@@ -66,9 +70,9 @@ jobs:
6670
yarn cache clean
6771
6872
# Set production flag
69-
- name: Set production flag for tag build
73+
- name: Set production flag for release PR or tagged build
7074
run: echo "REACT_APP_ENV=production" >> $GITHUB_ENV
71-
if: startsWith(github.ref, 'refs/tags/v')
75+
if: startsWith(github.ref, 'refs/tags/v') || github.base_ref == 'master'
7276

7377
- name: Build ${{ env.REACT_APP_NETWORK }} app ${{ env.REACT_APP_ENV }}
7478
run: yarn build
@@ -103,7 +107,6 @@ jobs:
103107
* [Safe Multisig app ${{ env.REACT_APP_NETWORK }}](${{ env.REVIEW_FEATURE_URL }}/${{ env.REACT_APP_NETWORK }}/app/)
104108
repo-token: ${{ secrets.GITHUB_TOKEN }}
105109
repo-token-user-login: 'github-actions[bot]'
106-
allow-repeats: true
107110
if: success() && github.event.number
108111
env:
109112
REVIEW_FEATURE_URL: https://pr${{ github.event.number }}--${{ env.REPO_NAME_ALPHANUMERIC }}.review.gnosisdev.com

‎.github/workflows/deploy-volta.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,12 @@ jobs:
3636
runs-on: ubuntu-latest
3737

3838
steps:
39+
- name: Cancel Previous Runs
40+
uses: styfle/[email protected]
41+
with:
42+
access_token: ${{ github.token }}
3943
- name: Remove broken apt repos [Ubuntu]
40-
if: matrix.os == 'ubuntu-latest'
44+
if: ${{ matrix.os }} == 'ubuntu-latest'
4145
run: |
4246
for apt_file in `grep -lr microsoft /etc/apt/sources.list.d/`; do sudo rm $apt_file; done
4347
- uses: actions/checkout@v2
@@ -65,9 +69,9 @@ jobs:
6569
yarn cache clean
6670
6771
# Set production flag
68-
- name: Set production flag for tag build
72+
- name: Set production flag for release PR or tagged build
6973
run: echo "REACT_APP_ENV=production" >> $GITHUB_ENV
70-
if: startsWith(github.ref, 'refs/tags/v')
74+
if: startsWith(github.ref, 'refs/tags/v') || github.base_ref == 'master'
7175

7276
- name: Build ${{ env.REACT_APP_NETWORK }} app
7377
run: yarn build
@@ -101,7 +105,6 @@ jobs:
101105
* [Safe Multisig app ${{ env.REACT_APP_NETWORK }}](${{ env.REVIEW_FEATURE_URL }}/${{ env.REACT_APP_NETWORK }}/app/)
102106
repo-token: ${{ secrets.GITHUB_TOKEN }}
103107
repo-token-user-login: 'github-actions[bot]'
104-
allow-repeats: true
105108
if: success() && github.event.number
106109
env:
107110
REVIEW_FEATURE_URL: https://pr${{ github.event.number }}--${{ env.REPO_NAME_ALPHANUMERIC }}.review.gnosisdev.com

‎.github/workflows/deploy-xdai.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,12 @@ jobs:
3636
runs-on: ubuntu-latest
3737

3838
steps:
39+
- name: Cancel Previous Runs
40+
uses: styfle/[email protected]
41+
with:
42+
access_token: ${{ github.token }}
3943
- name: Remove broken apt repos [Ubuntu]
40-
if: matrix.os == 'ubuntu-latest'
44+
if: ${{ matrix.os }} == 'ubuntu-latest'
4145
run: |
4246
for apt_file in `grep -lr microsoft /etc/apt/sources.list.d/`; do sudo rm $apt_file; done
4347
- uses: actions/checkout@v2
@@ -65,9 +69,9 @@ jobs:
6569
yarn cache clean
6670
6771
# Set production flag
68-
- name: Set production flag for tag build
72+
- name: Set production flag for release PR or tagged build
6973
run: echo "REACT_APP_ENV=production" >> $GITHUB_ENV
70-
if: startsWith(github.ref, 'refs/tags/v')
74+
if: startsWith(github.ref, 'refs/tags/v') || github.base_ref == 'master'
7175

7276
- name: Build ${{ env.REACT_APP_NETWORK }} app
7377
run: yarn build
@@ -101,7 +105,6 @@ jobs:
101105
* [Safe Multisig app ${{ env.REACT_APP_NETWORK }}](${{ env.REVIEW_FEATURE_URL }}/${{ env.REACT_APP_NETWORK }}/app/)
102106
repo-token: ${{ secrets.GITHUB_TOKEN }}
103107
repo-token-user-login: 'github-actions[bot]'
104-
allow-repeats: true
105108
if: success() && github.event.number
106109
env:
107110
REVIEW_FEATURE_URL: https://pr${{ github.event.number }}--${{ env.REPO_NAME_ALPHANUMERIC }}.review.gnosisdev.com

‎.github/workflows/test.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ jobs:
1010
test:
1111
runs-on: ubuntu-latest
1212
steps:
13+
- name: Cancel Previous Runs
14+
uses: styfle/[email protected]
15+
with:
16+
access_token: ${{ github.token }}
1317
- uses: actions/checkout@v2
1418
- name: Setup Node.js
1519
uses: actions/setup-node@v2

‎docs/networks.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ const xDai: NetworkConfig = {
286286
label: 'xDai',
287287
isTestNet: false,
288288
nativeCoin: {
289-
address: '0x000',
289+
address: '0x0000000000000000000000000000000000000000',
290290
name: 'xDai',
291291
symbol: 'xDai',
292292
decimals: 18,
@@ -343,7 +343,7 @@ const mainnet: NetworkConfig = {
343343
label: 'Mainnet',
344344
isTestNet: false,
345345
nativeCoin: {
346-
address: '0x000',
346+
address: '0x0000000000000000000000000000000000000000',
347347
name: 'Ether',
348348
symbol: 'ETH',
349349
decimals: 18,

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "safe-react",
3-
"version": "3.2.0",
3+
"version": "3.3.0",
44
"description": "Allowing crypto users manage funds in a safer way",
55
"website": "https://github.com/gnosis/safe-react#readme",
66
"bugs": {
@@ -161,7 +161,7 @@
161161
"@gnosis.pm/safe-apps-sdk": "1.0.3",
162162
"@gnosis.pm/safe-apps-sdk-v1": "npm:@gnosis.pm/[email protected]",
163163
"@gnosis.pm/safe-contracts": "1.1.1-dev.2",
164-
"@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#f610327",
164+
"@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#80f5db6",
165165
"@gnosis.pm/util-contracts": "2.0.6",
166166
"@ledgerhq/hw-transport-node-hid-singleton": "5.45.0",
167167
"@material-ui/core": "^4.11.0",

‎public/index.html‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,31 @@
77
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
88
<title>Gnosis Safe Multisig</title>
99
</head>
10+
<style>
11+
.safe-preloader-animation {
12+
position: absolute;
13+
top: 50%;
14+
left: 50%;
15+
width: 120px;
16+
height: 120px;
17+
margin:-60px 0 0 -60px;
18+
animation: sk-bounce 2.0s infinite ease-in-out;
19+
animation-delay: -1.0s;
20+
}
21+
22+
@keyframes sk-bounce {
23+
0%, 100% {
24+
transform: scale(0.8);
25+
-webkit-transform: scale(0.8);
26+
}
27+
50% {
28+
transform: scale(1.0);
29+
-webkit-transform: scale(1.0);
30+
}
31+
}
32+
33+
</style>
1034
<body>
11-
<div id="root" style="overflow: hidden;"></div>
35+
<div id="root" style="overflow: hidden;"><img class="safe-preloader-animation" src="./resources/safe.png" /></div>
1236
</body>
1337
</html>

‎src/components/App/index.tsx‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,17 @@ import { getNetworkId } from 'src/config'
2020
import { ETHEREUM_NETWORK } from 'src/config/networks/network.d'
2121
import { networkSelector } from 'src/logic/wallets/store/selectors'
2222
import { SAFELIST_ADDRESS, WELCOME_ADDRESS } from 'src/routes/routes'
23-
import { safeNameSelector, safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
23+
import {
24+
safeTotalFiatBalanceSelector,
25+
safeNameSelector,
26+
safeParamAddressFromStateSelector,
27+
} from 'src/logic/safe/store/selectors'
28+
import { currentCurrencySelector } from 'src/logic/currencyValues/store/selectors'
2429
import Modal from 'src/components/Modal'
2530
import SendModal from 'src/routes/safe/components/Balances/SendModal'
2631
import { useLoadSafe } from 'src/logic/safe/hooks/useLoadSafe'
2732
import { useSafeScheduledUpdates } from 'src/logic/safe/hooks/useSafeScheduledUpdates'
2833
import useSafeActions from 'src/logic/safe/hooks/useSafeActions'
29-
import { currentCurrencySelector, safeFiatBalancesTotalSelector } from 'src/logic/currencyValues/store/selectors'
3034
import { formatAmountInUsFormat } from 'src/logic/tokens/utils/formatAmount'
3135
import { grantedSelector } from 'src/routes/safe/container/selector'
3236

@@ -75,7 +79,7 @@ const App: React.FC = ({ children }) => {
7579
const safeAddress = useSelector(safeParamAddressFromStateSelector)
7680
const safeName = useSelector(safeNameSelector) ?? ''
7781
const { safeActionsState, onShow, onHide, showSendFunds, hideSendFunds } = useSafeActions()
78-
const currentSafeBalance = useSelector(safeFiatBalancesTotalSelector)
82+
const currentSafeBalance = useSelector(safeTotalFiatBalanceSelector)
7983
const currentCurrency = useSelector(currentCurrencySelector)
8084
const granted = useSelector(grantedSelector)
8185
const sidebarItems = useSidebarItems()
@@ -84,7 +88,7 @@ const App: React.FC = ({ children }) => {
8488
useSafeScheduledUpdates(safeLoaded, safeAddress)
8589

8690
const sendFunds = safeActionsState.sendFunds
87-
const formattedTotalBalance = currentSafeBalance ? formatAmountInUsFormat(currentSafeBalance) : ''
91+
const formattedTotalBalance = currentSafeBalance ? formatAmountInUsFormat(currentSafeBalance.toString()) : ''
8892
const balance =
8993
!!formattedTotalBalance && !!currentCurrency ? `${formattedTotalBalance} ${currentCurrency}` : undefined
9094

0 commit comments

Comments
 (0)