Skip to content

Commit 49f723b

Browse files
0xdex180xdex18
committed
Merge branch 'development' into wc-2.0
# Conflicts: # package.json # src/App.js # src/components/Wallet/TopBar/DApps/DApps.js
2 parents cb7ed22 + e33b33b commit 49f723b

File tree

323 files changed

+10779
-66857
lines changed

Some content is hidden

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

323 files changed

+10779
-66857
lines changed

‎.env

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ REACT_APP_ZAPPER_API_KEY=96e0cc51-a62e-42ca-acee-910ea7d2a241
88
REACT_APP_ZAPPER_API_ENDPOINT=https://api.zapper.fi/v1
99

1010
REACT_APP_SUSHI_SWAP_FRAME_URL=https://sushiswap-interface-ten.vercel.app/swap
11-
REACT_APP_SUSHI_SWAP_FRAME_EXCEPTIONS_URL={"moonbeam":"https://sushiswap-interface-jfomtc62l-ambire.vercel.app/en/swap"}
11+
REACT_APP_SUSHI_SWAP_FRAME_EXCEPTIONS_URL={"optimism":"https://sushiswap-interface-2qi6v54m6-ambire.vercel.app/swap", "andromeda": "https://sushiswap-interface-2qi6v54m6-ambire.vercel.app/swap"}
1212

1313
REACT_APP_VELCRO_API_ENDPOINT=http://localhost:1933/v1
14+
REACT_APP_CONSTANTS_ENDPOINT=https://jason.ambire.com
1415

1516
REACT_APP_SIGNATURE_VERIFIER_DEBUGGER=0
1617

‎.env.development

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ REACT_APP_PAYTRIE_PARTNER_URL=https://app.paytrie.com/?app=876454
55
REACT_APP_ZAPPER_API_KEY=96e0cc51-a62e-42ca-acee-910ea7d2a241
66
REACT_APP_ZAPPER_API_ENDPOINT=https://api.zapper.fi/v1
77

8-
REACT_APP_SUSHI_SWAP_FRAME_URL=https://sushiswap-interface-ten.vercel.app/swap
9-
REACT_APP_SUSHI_SWAP_FRAME_EXCEPTIONS_URL={"moonbeam":"https://sushiswap-interface-jfomtc62l-ambire.vercel.app/en/swap"}
8+
REACT_APP_SUSHI_SWAP_FRAME_URL=https://sushiswap-interface-jfomtc62l-ambire.vercel.app/en/swap
9+
REACT_APP_SUSHI_SWAP_FRAME_EXCEPTIONS_URL={"optimism":"https://sushiswap-interface-ten.vercel.app/swap", "andromeda": "https://sushiswap-interface-ten.vercel.app/swap"}
1010
REACT_APP_OPENSEA_FRAME_URL=https://localhost:3001
1111

1212
#REACT_APP_VELCRO_API_ENDPOINT=http://localhost:1933/v1
1313
REACT_APP_VELCRO_API_ENDPOINT=https://velcro.ambire.com/v1
14+
REACT_APP_CONSTANTS_ENDPOINT=https://jason.ambire.com
1415

1516
REACT_APP_TRANSAK_ENV=PRODUCTION
1617
REACT_APP_TRANSAK_API_KEY=85fdedd7-0077-4c6d-8499-52039c64353c

‎.env.production

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ REACT_APP_TRANSAK_API_KEY=85fdedd7-0077-4c6d-8499-52039c64353c
66
TRANSAK_ENV=PRODUCTION
77
TRANSAK_API_KEY=85fdedd7-0077-4c6d-8499-52039c64353c
88
TSC_COMPILE_ON_ERROR=true
9+
REACT_APP_CONSTANTS_ENDPOINT=https://jason.ambire.com

‎.github/workflows/development.yml

+21-36
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build & deploy staging
1+
name: Build & deploy 🔥 Ambire Wallet 🔥 (staging 🧪🔬)
22

33
on:
44
push:
@@ -7,48 +7,33 @@ on:
77
pull_request:
88
branches:
99
- development
10-
10+
permissions:
11+
contents: write
1112
jobs:
1213
build:
13-
name: Build
14+
name: Build & Deploy - (staging 🧪🔬)
1415
runs-on: ubuntu-latest
15-
16+
concurrency:
17+
group: ${{ github.workflow }}-${{ github.ref }}
1618
steps:
17-
- name: Checkout code
18-
uses: actions/checkout@v2
19-
20-
- name: Install Node.js
21-
uses: actions/setup-node@v1
19+
- name: Checkout code 🛎️
20+
uses: actions/checkout@v3
21+
22+
- name: Install Node.js ⚙️
23+
uses: actions/setup-node@v3
2224
with:
2325
node-version: 16.x
24-
25-
- name: Install NPM packages
26+
- name: Install NPM packages ♾️🕳️
2627
run: npm ci
27-
28-
- name: Build project
28+
29+
- name: Build project 🛠️
2930
run: npm run build
30-
31-
- name: Upload production-ready build files
32-
uses: actions/upload-artifact@v2
33-
with:
34-
name: production-files
35-
path: ./build
36-
deploy-staging:
37-
name: Deploy staging
38-
needs: build
39-
runs-on: ubuntu-latest
40-
if: github.ref == 'refs/heads/development'
41-
steps:
42-
- name: Download artifact
43-
uses: actions/download-artifact@v2
44-
with:
45-
name: production-files
46-
path: ./build
4731

48-
- name: Deploy to gh-pages
49-
uses: peaceiris/actions-gh-pages@v3
32+
- name: Deploy 🚀🌕 (staging 🧪🔬)
33+
if: github.ref == 'refs/heads/development'
34+
uses: JamesIves/[email protected]
5035
with:
51-
github_token: ${{ secrets.GITHUB_TOKEN }}
52-
publish_dir: ./build
53-
destination_dir: ./staging
54-
cname: wallet.ambire.com
36+
branch: gh-pages
37+
folder: build
38+
target-folder: staging
39+
cname: wallet.ambire.com

‎.github/workflows/gas-tank-page.yml

-54
This file was deleted.

‎.github/workflows/main.yml

+48-64
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,48 @@
1-
name: Build & deploy
2-
3-
on:
4-
push:
5-
branches:
6-
- main
7-
pull_request:
8-
branches:
9-
- main
10-
11-
jobs:
12-
build:
13-
name: Build
14-
runs-on: ubuntu-latest
15-
16-
steps:
17-
- name: Checkout code
18-
uses: actions/checkout@v2
19-
20-
- name: Install Node.js
21-
uses: actions/setup-node@v1
22-
with:
23-
node-version: 16.x
24-
25-
- name: Install NPM packages
26-
run: npm ci
27-
28-
- name: Build project
29-
run: npm run build
30-
31-
- name: Upload production-ready build files
32-
uses: actions/upload-artifact@v2
33-
with:
34-
name: production-files
35-
path: ./build
36-
37-
deploy:
38-
name: Deploy
39-
needs: build
40-
runs-on: ubuntu-latest
41-
if: github.ref == 'refs/heads/main'
42-
43-
steps:
44-
- name: Download artifact
45-
uses: actions/download-artifact@v2
46-
with:
47-
name: production-files
48-
path: ./build
49-
50-
- name: Deploy to gh-pages
51-
uses: peaceiris/actions-gh-pages@v3
52-
with:
53-
github_token: ${{ secrets.GITHUB_TOKEN }}
54-
publish_dir: ./build
55-
cname: wallet.ambire.com
56-
57-
- name: Deploy to gh-pages (staging)
58-
uses: peaceiris/actions-gh-pages@v3
59-
with:
60-
github_token: ${{ secrets.GITHUB_TOKEN }}
61-
publish_dir: ./build
62-
destination_dir: ./staging
63-
cname: wallet.ambire.com
64-
1+
name: Build & deploy 🔥 Ambire Wallet 🔥
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
branches:
9+
- main
10+
permissions:
11+
contents: write
12+
jobs:
13+
build:
14+
name: Build & Deploy
15+
runs-on: ubuntu-latest
16+
concurrency:
17+
group: ${{ github.workflow }}-${{ github.ref }}
18+
steps:
19+
- name: Checkout code 🛎️
20+
uses: actions/checkout@v3
21+
22+
- name: Install Node.js ⚙️
23+
uses: actions/setup-node@v3
24+
with:
25+
node-version: 16.x
26+
- name: Install NPM packages ♾️🕳️
27+
run: npm ci
28+
29+
- name: Build project 🛠️
30+
run: npm run build
31+
32+
- name: Deploy 🚀🌕
33+
if: github.ref == 'refs/heads/main'
34+
uses: JamesIves/[email protected]
35+
with:
36+
branch: gh-pages
37+
folder: build
38+
cname: wallet.ambire.com
39+
clean-exclude: |
40+
staging
41+
relayerless
42+
redesign
43+
paperbackup
44+
portfolio-v2
45+
uniswap
46+
47+
48+

‎.github/workflows/redesign.yml

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Build & deploy staging for Redesign
2+
3+
on:
4+
push:
5+
branches:
6+
- feature/redesign-common-style
7+
pull_request:
8+
branches:
9+
- feature/redesign-common-style
10+
11+
jobs:
12+
build:
13+
name: Build
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- name: Checkout code
18+
uses: actions/checkout@v2
19+
20+
- name: Install Node.js
21+
uses: actions/setup-node@v1
22+
with:
23+
node-version: 16.x
24+
25+
- name: Install NPM packages
26+
run: npm ci
27+
28+
- name: Build project
29+
run: npm run build
30+
31+
- name: Upload production-ready build files
32+
uses: actions/upload-artifact@v2
33+
with:
34+
name: production-files
35+
path: ./build
36+
deploy-redesign:
37+
name: Deploy Redesign
38+
needs: build
39+
runs-on: ubuntu-latest
40+
if: github.ref == 'refs/heads/feature/redesign-common-style'
41+
steps:
42+
- name: Download artifact
43+
uses: actions/download-artifact@v2
44+
with:
45+
name: production-files
46+
path: ./build
47+
48+
- name: Deploy to gh-pages
49+
uses: peaceiris/actions-gh-pages@v3
50+
with:
51+
github_token: ${{ secrets.GITHUB_TOKEN }}
52+
publish_dir: ./build
53+
destination_dir: ./redesign
54+
cname: wallet.ambire.com

‎.gitignore

+20-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,23 @@ yarn-error.log*
2424
.idea
2525

2626
# other
27-
.prettierrc
27+
.prettierrc
28+
29+
### VisualStudioCode ###
30+
.vscode/
31+
!.vscode/settings.json
32+
!.vscode/tasks.json
33+
!.vscode/launch.json
34+
!.vscode/extensions.json
35+
*.code-workspace
36+
37+
# Local History for Visual Studio Code
38+
.history/
39+
40+
### VisualStudioCode Patch ###
41+
# Ignore all local history of files
42+
.history
43+
.ionide
44+
45+
# Support for Project snippet scope
46+
!.vscode/*.code-snippets

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ Additionally, there's an ongoing [Immunefi bug bounty](https://immunefi.com/boun
167167
* Batcher: 0x460fad03099f67391d84c9cc0ea7aa2457969cea
168168
* WALLET token: 0x88800092ff476844f74dc2fc427974bbee2794ae
169169
* xWALLET staking: 0x47Cd7E91C3CBaAF266369fe8518345fc4FC12935
170-
* SupplyController: 0xc53af25f831f31ad6256a742b3f0905bc214a430
170+
* SupplyController: 0xA23C1bf0D0988DF467E9156a33A32f6BA6a9AF52
171171

172172
Those contracts (except Ethereum-specific WALLET, xWALLET and SupplyController) are deployed cross-chain on the same addresses across Ethereum, Polygon, BSC, Fantom, Avalanche, Arbitrum, Moonbeam, Moonriver, Cronos, Metis, Gnosis Chain (formerly xDAI), NEAR Aurora
173173

0 commit comments

Comments
 (0)