-
Notifications
You must be signed in to change notification settings - Fork 0
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
Fb takyoon swap #102
base: master
Are you sure you want to change the base?
Fb takyoon swap #102
Conversation
* master: update android version to 2.2.1 roll back to latest release refactor code fix not clear encrypt password
* fb-testing-swap: update feature flag testing config for abcpay and swap
* master: (25 commits) pump version update feedback handle some case & fix bug update Vietnamese translated edit messgage when claim unsuccess Add translate for claim voucher fix bug update missing package after merge master add translate claim voucher fix bug for send page fix bug remove whitelist for localhost add type json to header handle claim code update code for ionic native http call apply new native http call for ionic fix some claim voucher from lixi remove test line code add flow qr scan voucher update code for scan case ... # Conflicts: # src/app/app.module.ts
implement swap ui
@@ -18,6 +18,9 @@ <h2> | |||
{{ 'Home' | translate }} | |||
</h2> | |||
<div class="group-btn-top"> | |||
<ion-button fill="clear" slot="icon-only" class="chart-btn" (click)="openCreateSwapPage()"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should remove or add variable to show/hide this button
<div class="receive-container"> | ||
<div class="title" translate>You receive</div> | ||
<div class="list-coin"> | ||
<!-- <ion-item lines="none"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove unuse code
this.orderId = this.navPramss.orderId; | ||
this.getOrderInfo(); | ||
} | ||
// else(this.navPramss.orderId) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove unuse code
this.router.navigate(['/']); | ||
return false; | ||
} | ||
// canActivate( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove unuse code
…on-swap * fb-takyoon-enable-multiple-address-token: handle multiple address for token
No description provided.