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

feat: calculate fee when simulating tx #127

Open
wants to merge 35 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e69232a
feat: new design
honeymaro May 27, 2022
e95c64d
update: Design
honeymaro May 27, 2022
9bae4ad
create: Maintenance
honeymaro May 27, 2022
b07383d
fix: z-index of Maintenance
honeymaro May 28, 2022
c7d8662
update Discord link
jhlee-young May 28, 2022
87e76f1
feat: Support Terra 2.0
honeymaro May 28, 2022
9a2e4c7
bug: change response type for contract balance
jbamlee May 29, 2022
9fed3e6
update: Google Analytics for 2.0
honeymaro May 29, 2022
56df3f1
fix: useAPI and refactor codes
honeymaro May 29, 2022
430a087
update: .env
honeymaro May 29, 2022
079f64c
fix: usePairs
honeymaro May 29, 2022
4b197f7
add: no pairs notice in SwapTokens
honeymaro May 29, 2022
47e9e08
feat: show dialog on unsupported network
honeymaro May 29, 2022
4458c3b
fix: belief_price decimal
JoowonYun May 30, 2022
b8cd1e1
hotfix: change the endpoint of API to get tx
honeymaro May 31, 2022
c78915b
upgrade: react-base-components to ^2.1.2
honeymaro May 31, 2022
c12ee84
feat: use fcd
honeymaro May 31, 2022
9915b26
fix: use lcd
JoowonYun Jun 2, 2022
eb09c50
fix: stop drawing screen while getting gas from undefined fee
jhlee-young Jun 2, 2022
2eba0c9
remove: unnecessary deps and console.log
honeymaro Jun 2, 2022
8cda285
refactor: remove tax
JoowonYun Jun 2, 2022
32b409c
hotfix: clear selected assets
honeymaro Jun 3, 2022
f619a01
Merge pull request #114 from terraswap/v2
JoowonYun Jun 3, 2022
624d3e7
refactor: remove fcd
JoowonYun Jun 3, 2022
de71bc6
fix: temp fee
JoowonYun Jun 3, 2022
6619a5c
Merge pull request #115 from terraswap/refactor/fcd
JoowonYun Jun 3, 2022
d0651db
fix: custom slippage setting on mobile
honeymaro Jun 6, 2022
402fa87
fix: setting slippage tolerance
JoowonYun Jun 7, 2022
1b456cf
fix: tx result
JoowonYun Jun 7, 2022
06bcf37
feat: CD app, classic, app-dev
JoowonYun Jun 7, 2022
522d6b4
Merge pull request #122 from terraswap/fix/tx_result
JoowonYun Jun 7, 2022
33710af
Merge pull request #120 from terraswap/hotfix/custom-slippage
JoowonYun Jun 7, 2022
4918eb3
Merge pull request #123 from terraswap/feature/cd
JoowonYun Jun 7, 2022
d6f6405
feat: calculate fee when simulating tx
honeymaro Jun 9, 2022
8875840
fix: max button
honeymaro Jun 15, 2022
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
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SASS_PATH=node_modules:src/styles
REACT_APP_MAINNET_SERVICE_URL=https://api.terraswap.io
REACT_APP_TESTNET_SERVICE_URL=https://api-bombay.terraswap.io
REACT_APP_TESTNET_SERVICE_URL=https://api-pisco.terraswap.io
REACT_APP_MAINNET_DASHBOARD_URL=https://api.terraswap.io/dashboard
REACT_APP_TESTNET_DASHBOARD_URL=https://api-bombay.terraswap.io/dashboard
REACT_APP_TESTNET_DASHBOARD_URL=https://api-pisco.terraswap.io/dashboard
4 changes: 2 additions & 2 deletions .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ REACT_APP_MAINNET_SERVICE_PROXY_URL=https://api.terraswap.io
REACT_APP_MAINNET_DASHBOARD_URL=/api/mainnet/dashboard
REACT_APP_MAINNET_DASHBOARD_PROXY_URL=https://api.terraswap.io/dashboard
REACT_APP_TESTNET_SERVICE_URL=/api/testnet
REACT_APP_TESTNET_SERVICE_PROXY_URL=https://api-bombay.terraswap.io
REACT_APP_TESTNET_SERVICE_PROXY_URL=https://api-pisco.terraswap.io
REACT_APP_TESTNET_DASHBOARD_URL=/api/testnet/dashboard
REACT_APP_TESTNET_DASHBOARD_PROXY_URL=https://api-bombay.terraswap.io/dashboard
REACT_APP_TESTNET_DASHBOARD_PROXY_URL=https://api-pisco.terraswap.io/dashboard
57 changes: 57 additions & 0 deletions .github/workflows/classic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# This is a basic workflow to help you get started with Actions

name: app-classic

# Controls when the workflow will run
on:
push:
branches: [ "classic" ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
deploy:
name: Build, Deploy to S3 bucket
runs-on: [ubuntu-latest]

strategy:
matrix:
node-version: [17.x]

steps:
- uses: actions/checkout@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install yarn
run: npm install --location=global yarn

- name: Package install
run: yarn

- name: Build
run: CI=false yarn build

- name: Transfer to S3 for serving static
uses: jakejarvis/s3-sync-action@master
with:
args: --acl public-read --follow-symlinks --delete
env:
AWS_S3_BUCKET: app-classic.terraswap.io
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_IAM_MANAGER_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_IAM_MANAGER_SECRET_ACCESS_KEY }}
AWS_REGION: ap-northeast-2
SOURCE_DIR: 'build'

- name: Invalidate Cloudfront Distribution
uses: awact/cloudfront-action@master
env:
SOURCE_PATH: '/*'
AWS_REGION: ap-northeast-2
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_IAM_MANAGER_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_IAM_MANAGER_SECRET_ACCESS_KEY }}
DISTRIBUTION_ID: ${{ secrets.DISTRIBUTION_ID_APP_CLASSIC }}
57 changes: 57 additions & 0 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# This is a basic workflow to help you get started with Actions

name: app-dev

# Controls when the workflow will run
on:
pull_request:
branches: [ "main", "classic" ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
deploy:
name: Build, Deploy to S3 bucket
runs-on: [ubuntu-latest]

strategy:
matrix:
node-version: [17.x]

steps:
- uses: actions/checkout@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install yarn
run: npm install --location=global yarn

- name: Package install
run: yarn

- name: Build
run: CI=false yarn build

- name: Transfer to S3 for serving static
uses: jakejarvis/s3-sync-action@master
with:
args: --acl public-read --follow-symlinks --delete
env:
AWS_S3_BUCKET: app-dev.terraswap.io
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_IAM_MANAGER_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_IAM_MANAGER_SECRET_ACCESS_KEY }}
AWS_REGION: ap-northeast-2
SOURCE_DIR: 'build'

- name: Invalidate Cloudfront Distribution
uses: awact/cloudfront-action@master
env:
SOURCE_PATH: '/*'
AWS_REGION: ap-northeast-2
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_IAM_MANAGER_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_IAM_MANAGER_SECRET_ACCESS_KEY }}
DISTRIBUTION_ID: ${{ secrets.DISTRIBUTION_ID_APP_DEV }}
57 changes: 57 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# This is a basic workflow to help you get started with Actions

name: app

# Controls when the workflow will run
on:
push:
branches: [ "main" ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
deploy:
name: Build, Deploy to S3 bucket
runs-on: [ubuntu-latest]

strategy:
matrix:
node-version: [17.x]

steps:
- uses: actions/checkout@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install yarn
run: npm install --location=global yarn

- name: Package install
run: yarn

- name: Build
run: CI=false yarn build

- name: Transfer to S3 for serving static
uses: jakejarvis/s3-sync-action@master
with:
args: --acl public-read --follow-symlinks --delete
env:
AWS_S3_BUCKET: app.terraswap.io
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_IAM_MANAGER_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_IAM_MANAGER_SECRET_ACCESS_KEY }}
AWS_REGION: ap-northeast-2
SOURCE_DIR: 'build'

- name: Invalidate Cloudfront Distribution
uses: awact/cloudfront-action@master
env:
SOURCE_PATH: '/*'
AWS_REGION: ap-northeast-2
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_IAM_MANAGER_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_IAM_MANAGER_SECRET_ACCESS_KEY }}
DISTRIBUTION_ID: ${{ secrets.DISTRIBUTION_ID_APP }}
3 changes: 3 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"semi": false
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@terra-dev/wallet-types": "^3.7.0",
"@terra-money/log-finder": "^1.1.6",
"@terra-money/log-finder-ruleset": "^3.0.0",
"@terra-money/react-base-components": "^2.0.0",
"@terra-money/react-base-components": "^2.1.2",
"@terra-money/terra.js": "^3.1.0",
"@terra-money/wallet-provider": "^3.9.2",
"@testing-library/jest-dom": "^5.11.4",
Expand Down
36 changes: 27 additions & 9 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,36 @@
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.svg" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;600;700">
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;500;600;700">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;600;700"
/>
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;500;600;700"
/>
<link
rel="stylesheet"
href="https://fonts.googleapis.com/icon?family=Material+Icons"
/>
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-3ZPHL7L3Y9"></script>
<script
async
src="https://www.googletagmanager.com/gtag/js?id=G-7TNNTT403E"
></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'G-3ZPHL7L3Y9');
window.dataLayer = window.dataLayer || []
function gtag() {
dataLayer.push(arguments)
}
gtag("js", new Date())

gtag("config", "G-7TNNTT403E")
</script>
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, user-scalable=no"
/>
<meta name="terra-webextension" />
<title>Terraswap</title>
</head>
Expand Down
98 changes: 0 additions & 98 deletions public/moonshine.json

This file was deleted.

Loading