Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
1d85421
testing config for abcpay and swap
takYoon Aug 17, 2022
fe2a421
update feature flag
takYoon Aug 23, 2022
c8ece8c
handle multiple address for token
takYoon Aug 25, 2022
69082a7
Merge branch 'master' into fb-takyoon-enable-multiple-address-token
takYoon Aug 25, 2022
3399e93
inital swap
takYoon Aug 25, 2022
6387993
Merge branch 'fb-testing-swap' into fb-takyoon-swap
takYoon Aug 26, 2022
41f082c
update code
takYoon Aug 26, 2022
5328fa0
update code for app-init
takYoon Aug 26, 2022
9190e98
update code for swap
takYoon Aug 27, 2022
ba9e877
updat code for swap layout
takYoon Aug 30, 2022
3bde2bc
update code for swap layout
takYoon Sep 2, 2022
821ef16
UPDATE SWAP LAYOUT
takYoon Sep 3, 2022
42e7a56
commit code
takYoon Sep 5, 2022
04d0010
update create swap code
takYoon Sep 6, 2022
fd158cd
update code for create swap
takYoon Sep 7, 2022
a544a32
finish flow in create swap page
takYoon Sep 8, 2022
5e9a45e
refactor code + format amount on input
takYoon Sep 10, 2022
a61db7b
Merge branch 'master' into fb-takyoon-swap
takYoon Sep 11, 2022
7f650f9
fix app module after merge
takYoon Sep 11, 2022
cd379ad
create content for order detail
takYoon Sep 15, 2022
388143b
update code for swap
takYoon Sep 20, 2022
df294ad
add bignumber js handle case small number
takYoon Sep 20, 2022
17649e6
update code for order swap
takYoon Sep 21, 2022
500f564
integration abcpay with swap
takYoon Sep 22, 2022
012cb98
update code for swap component
takYoon Sep 22, 2022
3b6a935
implement swap ui
eric-son12 Sep 22, 2022
22d4cd6
Merge branch 'fb-takyoon-swap' into ericson-swap-ui
eric-son12 Sep 22, 2022
fe44d6d
Merge pull request #100 from bcProFoundation/ericson-swap-ui
takYoon Sep 26, 2022
06ffd1e
polish ui swap
eric-son12 Sep 26, 2022
3b25a7b
refactor code
eric-son12 Sep 26, 2022
b8ec009
Merge pull request #101 from bcProFoundation/ericson-polish-ui-swap
takYoon Sep 26, 2022
7fd8441
update code for swap
takYoon Sep 27, 2022
11414ae
fix bug create order
takYoon Sep 27, 2022
415fa4a
add new code to handle network ( livenet, testnet )
takYoon Sep 29, 2022
d55a1f5
Merge branch 'fb-takyoon-enable-multiple-address-token' into fb-takyo…
takYoon Oct 7, 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
6 changes: 4 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
AWS_URL_CONFIG = https://domainname/bws/api
// AWS_URL_CONFIG = https://aws-dev.abcpay.cash/bws/api
// ENABLE_ANIMATIONS change to false if env is desktop
AWS_URL_CONFIG = http://localhost:3232/bws/api
ENABLE_ANIMATIONS = true
ACTIVATE_SCANNER = true
LIXI_LOTUS_URL = https://domainname/api
LIXI_LOTUS_URL = https://dev.lixilotus.com/api
BUILD_SWAP_STANDALONE = false
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
"apexcharts": "^3.28.1",
"apple-wallet-ng": "^1.1.1",
"base64-js": "^1.5.1",
"bignumber.js": "^9.1.0",
"bitauth": "git+https://github.com/bitpay/bitauth.git#68cf0353bf517a7e5293478608839fa904351eb6",
"buffer-compare": "^1.1.1",
"capacitor-resources": "^2.0.5",
Expand Down Expand Up @@ -138,6 +139,7 @@
"ngx-build-plus": "^13.0.1",
"ngx-countdown": "^13.0.0",
"ngx-markdown": "^12.0.1",
"ngx-mask": "^13.1.15",
"ngx-qrcode2": "^9.0.0",
"ngx-text-overflow-clamp": "0.0.1",
"nm": "^1.0.0",
Expand Down Expand Up @@ -268,4 +270,4 @@
"trailingComma": "none",
"arrowParens": "avoid"
}
}
}
4 changes: 3 additions & 1 deletion scripts/setenv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ let awsUrl =
? awsUrlCLI
: process.env.AWS_URL_CONFIG;
let lixiLotusUrl = process.env.LIXI_LOTUS_URL;
let buildSwapAlone = process.env.BUILD_SWAP_STANDALONE;
if (environment === 'production') {
nameEnv = 'production';
} else if (environment === 'development') {
Expand All @@ -49,7 +50,8 @@ export const env = {
ratesAPI: new CurrencyProvider().getRatesApi(),
activateScanner: ${activateScanner},
awsUrl: '${awsUrl}',
lixiLotusUrl: '${lixiLotusUrl}'
lixiLotusUrl: '${lixiLotusUrl}' ,
buildSwapALone: ${buildSwapAlone}
};
export default env;`;

Expand Down
24 changes: 24 additions & 0 deletions src/app/app-init.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { Injectable } from '@angular/core';
import { Router } from '@angular/router';

@Injectable()
export class AppInitService {

constructor(private Router: Router) {}

init() {
return new Promise<void>((resolve, reject) => {

// Simple example from an array. In reality, I used the response of
// a GET. Important thing is that the app will wait for this promise to resolve
// const newDynamicRoutes = [{
// routeName: '',
// component: 'SwapPage'
// }]
const routes = this.Router.config;
// routes.push({ path: '', component: SwapPage });
this.Router.resetConfig(routes);
resolve();
});
}
}
Loading