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

Fix app name in Configuration file #12033

Open
wants to merge 913 commits into
base: master
Choose a base branch
from
Open
Changes from 7 commits
Commits
Show all changes
913 commits
Select commit Hold shift + click to select a range
283d303
implement new ui home
eric-son12 Mar 14, 2022
3c847fb
Merge branch 'ericson-implement-home' into 'abcpay2-0_rebranding'
kensauruss Mar 14, 2022
17d555f
Polish slide to send again
takYoon Mar 15, 2022
29ee968
fix show addressbook
eric-son12 Mar 15, 2022
78cbb47
Merge branch 'fb-takYoon-fix-slide-to-send' into 'abcpay2-0_rebranding'
kensauruss Mar 15, 2022
b5bbf97
Merge branch 'ericson-fix-show-addressbook' into 'abcpay2-0_rebranding'
kensauruss Mar 15, 2022
308a605
Shared Account
takYoon Mar 15, 2022
7e673ad
remove unused code
takYoon Mar 15, 2022
ba494f3
remove unused code + refactor
takYoon Mar 15, 2022
ec26674
Merge branch 'fb-takyoon-fix-feedback-shared-account' into 'abcpay2-0…
kensauruss Mar 15, 2022
d5b28fb
Missing recovery phrase when create new wallet from Setting with Rand…
takYoon Mar 15, 2022
12eacfe
Merge branch 'fb-takyoon-fix-feedback-fix-recovery-phrase' into 'abcp…
kensauruss Mar 15, 2022
dc8d4e6
Merge branch 'abcpay2-0_rebranding' of https://gitlab.com/abcpros/int…
hutyuanzz Mar 15, 2022
26f59c8
Change some status of Txs for Token
hutyuanzz Mar 15, 2022
77be478
Merge branch 'update-tx-detail-token' into 'abcpay2-0_rebranding'
kensauruss Mar 16, 2022
8e05c82
Improve after join or create new multisig wallet -> success -> open w…
takYoon Mar 16, 2022
d44b0f5
Merge branch 'fb-takYoon-fix-feedback-create-shared-account' into 'ab…
kensauruss Mar 16, 2022
c4d61ae
polish UI account + define wallet card component
eric-son12 Mar 16, 2022
88e075c
update receive addressfor tx history
hutyuanzz Mar 16, 2022
f177180
fix comment pr
eric-son12 Mar 17, 2022
820ce52
Merge branch 'ericson-wallet-card-polish-ui' into 'abcpay2-0_rebranding'
kensauruss Mar 17, 2022
d13123f
Merge branch 'abcpay2-0_rebranding' of https://gitlab.com/abcpros/int…
hutyuanzz Mar 17, 2022
03d7082
Merge branch 'update-from-address-for-txsHistory' into 'abcpay2-0_reb…
kensauruss Mar 17, 2022
86d85d9
implement tabs icon + handle account import
eric-son12 Mar 17, 2022
be10cbd
polish UI for transaction detail
takYoon Mar 17, 2022
afa17d1
Merge branch 'abcpay2-0_rebranding' into fb-takYoon-transaction-detail
takYoon Mar 17, 2022
cb2a649
polish tx-details in DARK Theme
takYoon Mar 17, 2022
fcc2a5a
Merge branch 'fb-takYoon-transaction-detail' into 'abcpay2-0_rebranding'
kensauruss Mar 18, 2022
081c6f3
fix comment
eric-son12 Mar 20, 2022
03be927
fix comment PR
eric-son12 Mar 21, 2022
16f0a3c
Merge branch 'ericson-fix-account-tab' into 'abcpay2-0_rebranding'
kensauruss Mar 21, 2022
5e14553
implement new ui setting pages
eric-son12 Mar 22, 2022
9ac9b2f
update polish ui for tx details after feedback
takYoon Mar 24, 2022
d428c7f
Merge branch 'fb-takYoon-transaction-detail' into 'abcpay2-0_rebranding'
kensauruss Mar 24, 2022
c769bd6
Merge branch 'ericson-implement-settings' into 'abcpay2-0_rebranding'
kensauruss Mar 24, 2022
13c7c99
fix can not open dev localhost on safari
takYoon Mar 24, 2022
cef2d6c
implement settings flow + fix comment
eric-son12 Mar 24, 2022
c123b23
Merge branch 'fb-takYoon-transaction-detail' into 'abcpay2-0_rebranding'
kensauruss Mar 24, 2022
9df17d5
remove unuse code
eric-son12 Mar 24, 2022
3aa5463
polish UI for txp details
takYoon Mar 25, 2022
2b9e043
Merge branch 'fb-takyoon-payment-proposal' into 'abcpay2-0_rebranding'
kensauruss Mar 25, 2022
38eb5f8
fix comment
eric-son12 Mar 25, 2022
fda34f9
Merge branch 'ericson-implement-settings-flow' into 'abcpay2-0_rebran…
kensauruss Mar 25, 2022
0bb43b1
polish UI for etoken token details
takYoon Mar 25, 2022
29b97dc
Merge branch 'fb-takyoon-payment-proposal' into 'abcpay2-0_rebranding'
kensauruss Mar 25, 2022
2ac1f53
implement new ui addressbook
eric-son12 Mar 25, 2022
92b6804
+ Remove Hide balance in Key Setting
Mar 25, 2022
7a35689
fix comment
eric-son12 Mar 26, 2022
88bf71b
Merge branch 'ericson-implement-addressbook' into 'abcpay2-0_rebranding'
kensauruss Mar 26, 2022
96696d4
implement chart donation sendfrom
hutyuanzz Mar 27, 2022
29bb2e5
Merge branch 'abcpay2-0_rebranding' of https://gitlab.com/abcpros/int…
hutyuanzz Mar 27, 2022
00750e6
commit tmp for polish UI for proposals-notifications
takYoon Mar 28, 2022
093d249
update icon for proposal
takYoon Mar 28, 2022
b94b4ac
fix issue with check list
takYoon Mar 28, 2022
5d963d1
remove unused code
takYoon Mar 28, 2022
a8dc9e3
remove unused code
takYoon Mar 28, 2022
fe7b5ac
Merge branch 'fb-takyoon-payment-proposal' into 'abcpay2-0_rebranding'
kensauruss Mar 28, 2022
3f5e623
hande scan page
hutyuanzz Mar 28, 2022
c0f2970
polish UI for import page
takYoon Mar 29, 2022
9763364
Merge branch 'implement-chart-donation-send-from' into 'abcpay2-0_reb…
kensauruss Mar 29, 2022
8912ff3
Merge branch 'fb-takyoon-import' into 'abcpay2-0_rebranding'
kensauruss Mar 29, 2022
ebd4441
Merge branch 'fb-megatroll-remove-hidebalance' into 'abcpay2-0_rebran…
kensauruss Mar 29, 2022
a8e6382
fix some feedback + polish ui
eric-son12 Mar 29, 2022
236dfce
Merge branch 'abcpay2-0_rebranding' into 'ericson-polish-iui'
eric-son12 Mar 29, 2022
68c320c
polish ui for payment prososal on tx details
takYoon Mar 29, 2022
0ee9a43
remove unused code
takYoon Mar 29, 2022
7d5d81d
fix notification of multisig
takYoon Mar 29, 2022
678d482
Add collapse and expanse in each section in Wallet-address page
Mar 29, 2022
343d975
Merge branch 'fb-takyoon-payment-proposal' into 'abcpay2-0_rebranding'
kensauruss Mar 29, 2022
d205ed6
polish UI for page select recipient for dark and light theme
takYoon Mar 29, 2022
248b0bd
Merge branch 'fb-takyoon-fix-multisig-flow' into 'abcpay2-0_rebranding'
kensauruss Mar 29, 2022
fadc822
fix bug css for select recipient page
takYoon Mar 29, 2022
ab22859
fix bug and feedback
takYoon Mar 29, 2022
be7392a
polish-ui-donation
hutyuanzz Mar 29, 2022
24daf70
Merge branch 'abcpay2-0_rebranding' into fb-takyoon-fix-multisig-flow
takYoon Mar 29, 2022
b535344
fix feedback for confirm page
takYoon Mar 29, 2022
2520e71
fix ui for contact in select recipient
takYoon Mar 29, 2022
8c9ce69
Merge branch 'fb-takyoon-fix-multisig-flow' into 'abcpay2-0_rebranding'
kensauruss Mar 29, 2022
12505b5
Update icon follow theme
Mar 29, 2022
0f6fe3e
Merge branch 'fb-megatroll-remove-hidebalance' into 'abcpay2-0_rebran…
kensauruss Mar 29, 2022
47d1a1f
fix comment
hutyuanzz Mar 29, 2022
e753608
Merge branch 'polish-ui-donation' into 'abcpay2-0_rebranding'
kensauruss Mar 29, 2022
9c57cf3
Merge branch 'abcpay2-0_rebranding' into 'ericson-polish-iui'
eric-son12 Mar 29, 2022
e8b0fb7
Merge branch 'ericson-polish-iui' into 'abcpay2-0_rebranding'
kensauruss Mar 29, 2022
34e2934
change the way come to Select Inputs in Send
takYoon Mar 30, 2022
752efa6
Merge branch 'abcpay2-0_rebranding' into fb-takyoon-fix-feedback
takYoon Mar 30, 2022
3481166
refactor code
takYoon Mar 30, 2022
2ac36a9
Merge branch 'fb-takyoon-fix-feedback' into 'abcpay2-0_rebranding'
kensauruss Mar 30, 2022
5c8a488
temporarily skip configure for iOS
van-tran Mar 30, 2022
b180f52
update UI for txps in tx details
takYoon Mar 30, 2022
891f72c
fix some feed back + polish UI
eric-son12 Mar 31, 2022
8af0190
Merge branch 'ericson-polish-ui' into abcpay2-0_rebranding
kensauruss Mar 31, 2022
f706498
sepearte config for android and ios
takYoon Mar 31, 2022
8c5d496
fix comment pr
eric-son12 Mar 31, 2022
fdfb730
polish wallet detail tx-history
eric-son12 Mar 31, 2022
ed2fa66
fix comment PR + user change currency i.e.
eric-son12 Mar 31, 2022
ec7f5ee
implement search page
takYoon Mar 31, 2022
6318acf
remove test function
takYoon Mar 31, 2022
268e05e
Merge branch 'ericson-polish-ui' into 'abcpay2-0_rebranding'
kensauruss Mar 31, 2022
6116146
Merge branch 'abcpay2-0_rebranding' of https://gitlab.com/abcpros/abc…
kensauruss Mar 31, 2022
51039cb
Merge branch 'abcpay2-0_rebranding' into fb-takyoon-fix-feedback
takYoon Mar 31, 2022
4444734
Merge branch 'features/vant/hotfix_avoid_exception' into 'abcpay2-0_r…
kensauruss Mar 31, 2022
1bb400f
Merge branch 'abcpay2-0_rebranding' of https://gitlab.com/abcpros/abc…
kensauruss Mar 31, 2022
4dd8663
refactor code
takYoon Mar 31, 2022
7a2e8f0
Merge branch 'fb-takyoon-fix-feedback' into 'abcpay2-0_rebranding'
kensauruss Mar 31, 2022
1b87adf
Merge branch 'abcpay2-0_rebranding' of https://gitlab.com/abcpros/abc…
kensauruss Mar 31, 2022
b7fd64b
change config
takYoon Apr 1, 2022
46ccccb
Fix decimal format display NaN in Key account screen.
kensauruss Apr 1, 2022
b0b0cbf
Merge branch 'fb-saurus-fixDecimalFormat' into 'abcpay2-0_rebranding'
kensauruss Apr 1, 2022
6ef7dd7
polish UI after feedback for page search-contact
takYoon Apr 1, 2022
834bcf5
polish UI for confirm token
takYoon Apr 1, 2022
861055c
remove unused code
takYoon Apr 1, 2022
94a395b
fix some issue + polish UI
eric-son12 Apr 1, 2022
f034aee
update multisig derivation path default for create and join
takYoon Apr 1, 2022
49423c4
dark theme disclaimer modal
eric-son12 Apr 1, 2022
2bc1328
Merge branch 'fb-takyoon-fix-feedback' into 'abcpay2-0_rebranding'
kensauruss Apr 1, 2022
c5332bf
Merge branch 'ericson-fix-some-issue' into abcpay2-0_rebranding
kensauruss Apr 1, 2022
b372e5b
Merge branch 'ericson-fix-some-issue' into 'abcpay2-0_rebranding'
kensauruss Apr 1, 2022
df7b808
skip running configure before generate android module
van-tt Apr 1, 2022
97a810f
upgrade version onto 2.0.2
van-tt Apr 1, 2022
cb45aa4
Merge branch 'vant/fix_missing_android_module' into 'abcpay2-0_rebran…
kensauruss Apr 2, 2022
465d505
Merge branch 'abcpay2-0_rebranding' into fb-takyoon-seperate-config-a…
van-tt Apr 2, 2022
d7fe6da
change-push-notification-capacitor
hutyuanzz Apr 2, 2022
ea8793a
Merge branch 'change-push-notification-capacitor' into 'abcpay2-0_reb…
Apr 2, 2022
8f3d965
Merge branch 'fb-takyoon-seperate-config-android-ios' into 'abcpay2-0…
van-tran Apr 2, 2022
90ff85e
Merge branch 'abcpay2-0_rebranding' of https://gitlab.com/abcpros/abc…
kensauruss Apr 2, 2022
86b3ea6
support rate etoken and-HNL
hutyuanzz Apr 4, 2022
7807d52
Merge branch 'support-rate-etoken-and-HNL' into 'abcpay2-0_rebranding'
Apr 4, 2022
cdb0cfc
Merge branch 'abcpay2-0_rebranding' of https://gitlab.com/abcpros/abc…
kensauruss Apr 4, 2022
72bfd9b
polish UI for join shared wallet
takYoon Apr 5, 2022
119cf07
polish ui for create wallet / shared wallet and joined wallet
takYoon Apr 5, 2022
755cfa0
polish ui + refactor code
takYoon Apr 6, 2022
05570b7
polish ui for proposal notification + feedback for create / join wallet
takYoon Apr 6, 2022
2f7c0f6
fix some ui & polish ui
eric-son12 Apr 6, 2022
a6b4378
Merge branch 'fb-takyoon-fix-feedback' into 'abcpay2-0_rebranding'
kensauruss Apr 6, 2022
9d4e2aa
Merge branch 'abcpay2-0_rebranding' of https://gitlab.com/abcpros/abc…
kensauruss Apr 6, 2022
6cef4e7
Merge branch 'abcpay2-0_rebranding' into 'ericson-fix-some-feedback'
eric-son12 Apr 6, 2022
8fc9fbe
Merge branch 'ericson-fix-some-feedback' into abcpay2-0_rebranding
kensauruss Apr 6, 2022
13aa63f
Merge branch 'ericson-fix-some-feedback' into 'abcpay2-0_rebranding'
kensauruss Apr 6, 2022
32f3f7f
Merge branch 'abcpay2-0_rebranding' of https://gitlab.com/abcpros/abc…
kensauruss Apr 6, 2022
5aa9e43
fix multisig spelling
kensauruss Apr 6, 2022
6e8254a
Merge branch 'fb-kensaurus-correctSpelling' into 'abcpay2-0_rebranding'
kensauruss Apr 6, 2022
16ae564
open support currency vnd
takYoon Apr 7, 2022
7fe440b
implement ui for desktop
eric-son12 Apr 7, 2022
f68d7e7
Merge branch 'ericson-implement-desktopUI' into 'abcpay2-0_rebranding'
kensauruss Apr 7, 2022
47658aa
support symbol currency
takYoon Apr 7, 2022
0a8e03d
Merge branch 'fb-takyoon-open-support-vnd' into 'abcpay2-0_rebranding'
kensauruss Apr 7, 2022
f785773
handle some ui for web view
eric-son12 Apr 8, 2022
673f7e6
handle some ui for web view
eric-son12 Apr 8, 2022
66fa5c1
Merge branch 'ericson-implement-web-view' of https://gitlab.com/abcpr…
eric-son12 Apr 8, 2022
6e0666c
fix cmt pr
eric-son12 Apr 8, 2022
0249d29
fix cmt
eric-son12 Apr 8, 2022
aa86d43
Merge branch 'ericson-implement-web-view' into 'abcpay2-0_rebranding'
kensauruss Apr 8, 2022
50ab502
fix ionic page scroll on desktop
takYoon Apr 8, 2022
7fcf9d3
Merge branch 'fb-takyoon-feedback' into 'abcpay2-0_rebranding'
kensauruss Apr 8, 2022
143a760
polish UI web view, fix some ui mobile app
eric-son12 Apr 9, 2022
32177f1
fix cmt
eric-son12 Apr 9, 2022
503937d
Merge branch 'ericson-polish-web-view' into 'abcpay2-0_rebranding'
kensauruss Apr 9, 2022
e344b06
change plugin for qrscanner
takYoon Apr 12, 2022
85368e8
Merge branch 'fb-takyoon-quick-fix' into 'abcpay2-0_rebranding'
kensauruss Apr 12, 2022
b399f83
polish ui for share invation code in dark and light theme
takYoon Apr 12, 2022
5fd2bb6
prettier for dark.scss
takYoon Apr 12, 2022
f6ef5fb
Merge branch 'fb-takyoon-fix-feedback' into 'abcpay2-0_rebranding'
kensauruss Apr 12, 2022
ce05152
implement new request specific amount + polish ui
eric-son12 Apr 12, 2022
9f21bfb
Merge branch 'abcpay2-0_rebranding' into 'ericson-fix-some-feedback-i…
eric-son12 Apr 12, 2022
da90ea1
fix feedback
eric-son12 Apr 12, 2022
50d5bec
Merge branch 'ericson-fix-some-feedback-issue' of https://gitlab.com/…
eric-son12 Apr 12, 2022
1b0e9ec
Merge branch 'ericson-fix-some-feedback-issue' of https://gitlab.com/…
eric-son12 Apr 12, 2022
d4d74b9
Merge branch 'ericson-fix-some-feedback-issue' into 'abcpay2-0_rebran…
kensauruss Apr 12, 2022
9753925
fix flow scan for specific amount
takYoon Apr 13, 2022
5088e43
Merge branch 'abcpay2-0_rebranding' into fb-takyoon-fix-feedback
takYoon Apr 13, 2022
352f483
remove unused code
takYoon Apr 13, 2022
32dcd55
update feedback from anh Binh for scan specific amount
takYoon Apr 14, 2022
68f4a7e
remove unused code
takYoon Apr 14, 2022
fb3f597
Merge branch 'fb-takyoon-fix-feedback' into 'abcpay2-0_rebranding'
kensauruss Apr 14, 2022
d46ef14
fix some feedback
eric-son12 Apr 14, 2022
8179a8a
Merge branch 'ericson-fix-some-feedback-13042022' into 'abcpay2-0_reb…
kensauruss Apr 14, 2022
7ab823b
fix feedback of abcpay 2.2 ( 1->5, 9 , 12 -> 14)
takYoon Apr 15, 2022
fd841fe
Merge pull request #1 from bcProFoundation/fb-takyoon-fix-feedback-15…
vince8x Apr 15, 2022
d3d203f
fix some feedback
eric-son12 Apr 15, 2022
3c715ae
Merge pull request #3 from bcProFoundation/ericson-fix-feedback-15042022
kensauruss Apr 15, 2022
466473e
commit tmp to fix issue for token send
takYoon Apr 16, 2022
c962fa0
fix select input format
takYoon Apr 17, 2022
ca82b50
Merge pull request #4 from bcProFoundation/fb-takyoon-fix-feedback-15…
kensauruss Apr 17, 2022
248c7e4
fix some feedback & issue
eric-son12 Apr 18, 2022
34f5bba
fix show fiatStr in detail TX
eric-son12 Apr 18, 2022
68879cb
fix(syntax): fix icon notification
eric-son12 Apr 18, 2022
215b922
fix (icon)
eric-son12 Apr 18, 2022
9e6b6ee
Merge pull request #17 from bcProFoundation/ericson-fix-feedback-1804…
kensauruss Apr 18, 2022
a75b29e
fix flow send back / send again
takYoon Apr 18, 2022
59367dc
fix flow send back / send again
takYoon Apr 18, 2022
13019f9
commit missing file change
takYoon Apr 18, 2022
37f2e27
fix issue naviagte send back on ios
takYoon Apr 19, 2022
14a9192
Merge pull request #18 from bcProFoundation/fb-takyoon-fix-feedback-1…
kensauruss Apr 19, 2022
1494c86
update lib camera for android and ios
takYoon Apr 19, 2022
13332b6
Merge pull request #19 from bcProFoundation/fb-takyoon-fix-feedback-1…
kensauruss Apr 19, 2022
ad29782
fix ghost town
takYoon Apr 19, 2022
1cb4412
Merge branch 'master' into fb-takyoon-fix-feedback-18042022
takYoon Apr 19, 2022
f723433
commit missing file
takYoon Apr 19, 2022
ba61e3d
fix some issue UI
eric-son12 Apr 19, 2022
e857e5c
Merge pull request #21 from bcProFoundation/ericson-fix-feedback-1904…
kensauruss Apr 19, 2022
5167cc7
fix issue can not send normal token
takYoon Apr 19, 2022
088d5f7
fix can not show contact in transaction history
takYoon Apr 19, 2022
90b3fc2
Merge pull request #20 from bcProFoundation/fb-takyoon-fix-feedback-1…
kensauruss Apr 19, 2022
ebc630c
fix some feedback
eric-son12 Apr 20, 2022
af48640
Merge pull request #22 from bcProFoundation/ericson-fix-feedback-2004…
kensauruss Apr 20, 2022
19f898d
update right app name
van-tt Apr 20, 2022
02e9d2c
commit tmp to update appconfig.json + token-details get contact name
takYoon Apr 21, 2022
61ced98
Merge branch 'master' into fb-takyoon-fix-feedback-18042022
takYoon Apr 21, 2022
a060821
fix bug -> select recipient (wallet account) at ' Recent transaction'…
takYoon Apr 21, 2022
2e733df
update translate for unknown sender
takYoon Apr 21, 2022
27fd0d2
fix scan etoken address to account or contact name in send flow
takYoon Apr 21, 2022
3cedbfa
Merge pull request #25 from bcProFoundation/features/vant/fix_app_name
kensauruss Apr 21, 2022
3f80fdc
fix some feedback
eric-son12 Apr 21, 2022
c1043ad
Merge pull request #26 from bcProFoundation/ericson-fix-feedback-2104…
kensauruss Apr 21, 2022
d795716
change wallet text to account
kensauruss Apr 21, 2022
40dcc16
Merge pull request #28 from bcProFoundation/fb-kensaurus-change-walle…
kensauruss Apr 22, 2022
2c859b0
Merge pull request #24 from bcProFoundation/fb-takyoon-fix-feedback-1…
kensauruss Apr 22, 2022
9ee93c8
change wallet text to account
kensauruss Apr 22, 2022
88f14a8
Merge pull request #29 from bcProFoundation/fb-kensaurus-change-walle…
kensauruss Apr 22, 2022
3408924
change wallet text to account
kensauruss Apr 22, 2022
58aaacc
udpate switch currency in flow send
takYoon Apr 23, 2022
1b9c329
polish some UI
eric-son12 Apr 23, 2022
50f7656
fix Adaptive icon on Android
van-tt Apr 23, 2022
3c510d8
Merge pull request #30 from bcProFoundation/fb-kensaurus-change-walle…
kensauruss Apr 23, 2022
22305f2
update capacitor-community/fcm plugin
kensauruss Apr 23, 2022
233b1b5
Revert "update capacitor-community/fcm plugin"
kensauruss Apr 23, 2022
ed2f20e
update community/fcm plugin
kensauruss Apr 23, 2022
64149c5
Merge branch 'master' into fb-kensaurus-communityfcm-plugin
kensauruss Apr 23, 2022
8bfcfbb
Merge remote-tracking branch 'origin/fb-kensaurus-communityfcm-plugin…
van-tt Apr 23, 2022
48b1f24
add MainActivity.java
van-tt Apr 23, 2022
c5a9d1a
fix right packageName
van-tt Apr 24, 2022
b5f59d5
Merge pull request #31 from bcProFoundation/ericson-fix-feedback-2304…
kensauruss Apr 25, 2022
7edb991
fix send max and switch currency on send
takYoon Apr 25, 2022
d33a487
Merge pull request #35 from bcProFoundation/fb-takyoon-fix-feedback-1…
kensauruss Apr 25, 2022
b5c75a3
fix some feedback, add push notification android
eric-son12 Apr 25, 2022
20d1697
change config
eric-son12 Apr 25, 2022
cee3b52
Merge branch 'master' into features/vant/fix_app_name
van-tt Apr 25, 2022
aa4a108
fix comment PR
eric-son12 Apr 25, 2022
edd3a90
Merge pull request #36 from bcProFoundation/ericson-fix-feedback-2504…
kensauruss Apr 25, 2022
b541e70
fixed BigInteger issue and notification config build for android / iOS
kensauruss Apr 25, 2022
90ecf52
Merge pull request #37 from bcProFoundation/fb-kensaurus-configNotifi…
vince8x Apr 25, 2022
54810d7
Merge branch 'master' into features/vant/fix_app_name
van-tt Apr 25, 2022
1d30cfd
Merge branch 'master' into features/vant/fix_app_name
van-tt Apr 25, 2022
1293107
change App Name
van-tt Apr 26, 2022
2a7cada
trigger build
van-tt Apr 26, 2022
3d75547
Delete MainActivity.java
van-tran Apr 26, 2022
b1618fe
adding new icon background
van-tt Apr 26, 2022
95e1619
Merge remote-tracking branch 'origin/features/vant/fix_app_name' into…
van-tt Apr 26, 2022
73dc553
adding new icon
van-tt Apr 26, 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: 3 additions & 1 deletion src/app/components/components.ts
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@ import { SearchBarComponent } from './search-bar/search-bar';
import { SliderCaptchaComponent } from './slider-captcha/slider-captcha';
import { WalletItemContent } from './wallet-item-content/wallet-item-content';
import { RecipientComponent } from './recipient/recipient.component'
import { WalletDetailCardComponent } from './wallet-detail-card/wallet-detail-card.component';
export const COMPONENTS = [
ActionCardComponent,
ActionCardV4Component,
@@ -32,5 +33,6 @@ export const COMPONENTS = [
PriceChart,
SliderCaptchaComponent,
NotificationComponent,
RecipientComponent
RecipientComponent,
WalletDetailCardComponent
];
91 changes: 47 additions & 44 deletions src/app/components/exchange-rates/exchange-rates.scss
Original file line number Diff line number Diff line change
@@ -1,51 +1,54 @@
.average-container {
text-align: center;
height: 21px;
float: right;
&.negative-avg {
color: #FFB4A9;
border-radius: 50vh;
exchange-rates {
.average-container {
text-align: center;
height: 21px;
float: right;
&.negative-avg {
color: #BA1B1B;
border-radius: 50vh;
}
&.possitive-avg {
color: #37A372;
border-radius: 50vh;
}
.average {
font-size: 12px;
line-height: 19px;
height: 21px;
font-weight: 500;
}
}
&.possitive-avg {
color: #73DAA5;
border-radius: 50vh;

.estimate-product {
margin: 0;
text-align: right;
padding-right: 20px;
font-style: italic;
font-size: smaller;
color: #bd9452;
}
.average {
font-size: 12px;
line-height: 19px;
height: 21px;
font-weight: 500;

.estimate-sign {
font-size: smaller;
color: #bd9452;
}
}

.estimate-product {
margin: 0;
text-align: right;
padding-right: 20px;
font-style: italic;
font-size: smaller;
color: #bd9452;
}

.estimate-sign {
font-size: smaller;
color: #bd9452;
}
.bp-list {
padding-top: 0;
padding-bottom: 0;
ion-item:not(.align-with-button){
--padding-start: 0.5rem;
--padding-end: 0;
--inner-padding-end: 1rem;
padding-left: 0;
ion-icon {
width: 35px;
height: 35px;
}
ion-note {
margin: 0;
.bp-list {
padding-top: 0;
padding-bottom: 0;
ion-item:not(.align-with-button){
--padding-start: 0.5rem;
--padding-end: 0;
--inner-padding-end: 1rem;
padding-left: 0;
ion-icon {
width: 35px;
height: 35px;
}
ion-note {
margin: 0;
}
}
}
}


3 changes: 2 additions & 1 deletion src/app/components/exchange-rates/exchange-rates.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component } from '@angular/core';
import { Component, ViewEncapsulation } from '@angular/core';
import { Router } from '@angular/router';
import * as _ from 'lodash';
import { ConfigProvider, CurrencyProvider, EventManagerService, Logger } from '../../providers';
@@ -25,6 +25,7 @@ export interface Card {
selector: 'exchange-rates',
templateUrl: 'exchange-rates.html',
styleUrls: ['exchange-rates.scss'],
encapsulation: ViewEncapsulation.None
})
export class ExchangeRates {
public isFiatIsoCodeSupported: boolean;
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<ng-container *ngIf="!isToken;else tokenCard">
<div class="wallet-card" [ngClass]="{
'bg-bch': wallet.coin == 'bch',
'bg-xec': wallet.coin == 'xec',
'bg-xpi': wallet.coin == 'xpi',
'bg-doge': wallet.coin == 'doge',
'bg-ltc': wallet.coin == 'ltc'
}">
<div class="wallet-card-header">
<div class="wallet-icon">
<div class="icon">
<img src="assets/img/currencies/{{wallet.coin}}.svg" alt="">
</div>
<div class="wallet-name">
<p class="name">{{wallet?.name}}</p>
<div class="wallet-info">
<span *ngIf="wallet?.cachedStatus && wallet?.cachedStatus.wallet && wallet?.cachedStatus.wallet?.singleAddress && isUtxoCoin()">Auditable</span>
<ng-container *ngIf="wallet?.credentials?.n > 1 || (!wallet?.credentials?.n && wallet?.n > 1) || !wallet?.isComplete() || (wallet?.isComplete() && wallet?.needsBackup)" class="secondary-label">
<span class="secondary-label-multisign" *ngIf="wallet?.credentials?.n > 1">Multisign {{ wallet?.credentials?.m }}-{{ wallet?.credentials?.n }}</span>
<span class="secondary-label-multisign" *ngIf="!wallet?.credentials?.n && wallet?.n > 1">Multisign {{ wallet?.m }}-{{ wallet?.n }}</span>
</ng-container>
</div>
</div>
</div>
<!-- <div class="wallet-setting" (click)="openWalletSettings(wallet.id)">
<img src="assets/img/wallet-details/wallet-setting-{{currentTheme}}.svg" alt="">
</div> -->
</div>

<div class="balance-content">
<div (tap)="updateAll(true)"
*ngIf="!wallet?.scanning && !walletNotRegistered && (wallet?.cachedStatus || wallet?.lastKnownBalance)">
<div class="balance-str">
<balance-to-show *ngIf="!wallet?.balanceHidden" [balance]="getBalance()"></balance-to-show>
<div *ngIf="wallet?.balanceHidden">******</div>
<ion-icon class="eye" [name]="wallet?.balanceHidden ? 'eye-outline' : 'eye-off-outline'" (click)="toggleBalance()"></ion-icon>
</div>
<div class="balance-alt-str" *ngIf="wallet?.cachedStatus && wallet?.cachedStatus.totalBalanceAlternative && !wallet?.balanceHidden">
~ {{getAlternativeBalance()}} {{wallet?.cachedStatus.alternativeIsoCode}}
</div>
<div class="balance-alt-str" *ngIf="wallet?.balanceHidden">
******
</div>
</div>

</div>

<div class="wallet-address">
<ion-spinner *ngIf="!address" name="dots"></ion-spinner>
<p *ngIf="address" class="wallet-add" copy-to-clipboard="{{ address }}"> {{(address | slice:-8)}}
<ion-icon name="copy-outline"></ion-icon>
</p>
</div>
</div>
</ng-container>

<ng-template #tokenCard>
<div class="wallet-card bg-default" [ngClass]="{
'bg-EAT': token?.tokenInfo?.symbol == 'EAT',
'bg-bcPro': token?.tokenInfo?.symbol == 'bcPro',
'bg-DoC': token?.tokenInfo?.symbol == 'DoC',
'bg-ABCSLP': token?.tokenInfo?.symbol == 'ABCSLP'
}">
<div class="wallet-card-header">
<div class="wallet-icon">
<div class="icon">
<img src="assets/img/currencies/{{token?.tokenInfo?.symbol}}.svg" alt="">
</div>
<div class="wallet-name">
<p class="name">{{token?.tokenInfo?.name}}</p>
<div class="wallet-info">
<span *ngIf="wallet?.cachedStatus && wallet?.cachedStatus.wallet && wallet?.cachedStatus.wallet?.singleAddress && isUtxoCoin()">Auditable</span>
<ng-container *ngIf="wallet?.credentials?.n > 1 || (!wallet?.credentials?.n && wallet?.n > 1) || !wallet?.isComplete() || (wallet?.isComplete() && wallet?.needsBackup)" class="secondary-label">
<span class="secondary-label-multisign" *ngIf="wallet?.credentials?.n > 1">Multisign {{ wallet?.credentials?.m }}-{{ wallet?.credentials?.n }}</span>
<span class="secondary-label-multisign" *ngIf="!wallet?.credentials?.n && wallet?.n > 1">Multisign {{ wallet?.m }}-{{ wallet?.n }}</span>
</ng-container>
</div>
</div>
</div>
<div class="wallet-setting" (click)="goToTokenInfo()">
<ion-icon name="information-outline"></ion-icon>
</div>
</div>

<div class="balance-content">
<div (tap)="updateAll(true)"
*ngIf="!wallet?.scanning && (wallet?.cachedStatus || wallet?.lastKnownBalance)">
<div class="balance-str">
<balance-to-show *ngIf="!wallet?.balanceHidden" [balance]="amountToken"></balance-to-show>
<div *ngIf="wallet?.balanceHidden">******</div>
<ion-icon class="eye" [name]="wallet?.balanceHidden ? 'eye-outline' : 'eye-off-outline'" (click)="toggleBalance()"></ion-icon>
</div>
<div class="balance-alt-str" *ngIf="!wallet?.balanceHidden">
~ 0.00 USD
</div>
<div class="balance-alt-str" *ngIf="wallet?.balanceHidden">
******
</div>
</div>

</div>

<div class="wallet-address">
<ion-spinner *ngIf="!wallet?.etokenAddress" name="dots"></ion-spinner>
<p *ngIf="wallet?.etokenAddress" class="wallet-add" copy-to-clipboard="{{ wallet?.etokenAddress }}"> {{(wallet?.etokenAddress | slice:-8)}}
<ion-icon name="copy-outline"></ion-icon>
</p>
</div>
</div>
</ng-template>

Loading