Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
6bd9a8a
fix(account): change styling & add aeur tag
admrid May 10, 2019
ac8fb47
fix(Balance): delete unnec lines
admrid May 10, 2019
9497b67
fix(accpuntInfo): add currency tag & change styling
admrid May 14, 2019
2134360
fix(accpuntInfo): change styling of watchAsset btn
admrid May 14, 2019
418f356
fix(travis.yml): add runrecord to check test errors
admrid May 14, 2019
c4015a7
fix(travis.yml): change runrecord to run
admrid May 14, 2019
8f33ce1
fix(cypress): change tests to work w currency tags
admrid May 15, 2019
c3e5f92
fix(cypress): test
admrid May 15, 2019
f4286e8
fix(topNav, accountInfo): add currency tabs & styling etc.
admrid May 15, 2019
c61a689
fix(topNav, accountInfo): add minor styling changes
admrid May 15, 2019
328925f
fix(topNav, accountInfo): add copy func to acc address
admrid May 15, 2019
e5e9593
Merge branch 'staging' into aeurtag
phraktle May 15, 2019
5593641
fix(topNav, accountInfo): fix noscroll
admrid May 16, 2019
799bf3e
fix(topNav, sideNav, navigation): add cursor pointer
admrid May 16, 2019
4f85de9
Merge branch 'aeurtag' of https://github.com/Augmint/augmint-web into…
admrid May 16, 2019
e7634c7
fix(topNav): minor style fixes
admrid May 16, 2019
34a61be
fix(topNav): add Balance label
admrid May 16, 2019
ccfa677
fix(topNav, userBalances): minor css tweaks & change userBalance init…
admrid May 16, 2019
31c38ef
fix(Balance): add acc address & minor style fixies
admrid May 17, 2019
e1d4777
Merge branch 'staging' into aeurtag
phraktle May 17, 2019
d903ff9
Merge branch 'staging' into aeurtag
phraktle May 18, 2019
8a24144
feat(accountAddress, Balance): add acc copy feat to Balance module
admrid May 21, 2019
3a426a1
Merge branch 'staging' into aeurtag
admrid May 22, 2019
986f8a5
fix(accountAddress): convert to class component
admrid May 22, 2019
af3247c
fix(accountAddress): make it statful
admrid May 23, 2019
c489665
feat(button): add variations to button
admrid May 27, 2019
e0b83d4
feat(Balance): make it deploy ready
admrid May 28, 2019
9aa5182
fix(accountAddress): make logic better
admrid May 28, 2019
4c79c23
Merge branch 'staging' into aeurtag
admrid May 28, 2019
2cd666d
feat(NetworkAlert): add component
admrid May 29, 2019
739bd75
feat(augmintToken): add BTN to link to /under-the-hood
admrid May 29, 2019
87e06c4
feat(topNav): delete network link
admrid May 29, 2019
5ba8bbd
Merge branch 'aeurtag' of https://github.com/Augmint/augmint-web into…
admrid May 29, 2019
62870df
fix(topNav): change ETH decimals back to 4
admrid May 29, 2019
bccbc7e
fix(cypress): add btn to test
admrid May 29, 2019
66e7a8a
fix(Balance): set previous layout for this PR
admrid May 29, 2019
4f78902
Merge branch 'staging' into aeurtag
phraktle May 30, 2019
cbc7fe5
Merge branch 'staging' into aeurtag
phraktle May 30, 2019
fb0caa8
feat(topNav): minor style changes
admrid May 30, 2019
f4a48d2
Merge branch 'aeurtag' of https://github.com/Augmint/augmint-web into…
admrid May 30, 2019
13a0711
feat(topNav): minor style tweaks
admrid May 30, 2019
3eb90f7
feat(topNav): make Victor happy & delete unnec styling
admrid May 31, 2019
1fc442a
fix(topNav): pushing pixels one final time
admrid May 31, 2019
28ee69f
fix(account): init redesign
admrid Jun 3, 2019
fb42667
fix(merge conflicts)
admrid Jun 4, 2019
8a3cc5b
feat(account, button) init & add circle icon opt to btns
admrid Jun 7, 2019
8d01cbf
fix(button) minor react errors
admrid Jun 7, 2019
f07dda0
Merge branch 'staging' into account
phraktle Jun 11, 2019
601e553
feat(watchAssetButton) add top icon styling
admrid Jun 14, 2019
a58c36c
feat(fontawesome): add 5.9.0
admrid Jun 19, 2019
e2a0e2f
Merge branch 'account' of https://github.com/Augmint/augmint-web into…
admrid Jun 19, 2019
dbfd6e3
fix(button): styling
admrid Jun 20, 2019
0d695b6
feat(buttonGroup): init
admrid Jun 20, 2019
498759a
fix(): add minor styling changes
admrid Jun 21, 2019
b0b1449
fix(Balance): add minor styling changes & fix responsive views
admrid Jun 27, 2019
10f2e00
fix(watchAssetButton): styling
admrid Jun 27, 2019
ae39572
fix(account): merge staging into
admrid Jun 27, 2019
22be0cd
fix(cypress): add timeout
admrid Jun 27, 2019
91f0b35
fix(button, Balance): style
admrid Jul 1, 2019
e2d2f59
fix(watchAssetButton): add visibility logic
admrid Jul 1, 2019
83cee13
fix(TransferList): fix mobile horizontal scrolling
admrid Jul 1, 2019
ba50608
Merge branch 'staging' into account
phraktle Jul 2, 2019
2fa9a64
Merge branch 'account' of https://github.com/Augmint/augmint-web into…
admrid Jul 2, 2019
3363553
fix(account): minor style changes
admrid Jul 2, 2019
1f75fde
feat(Balance): add repay & release btns & logic
admrid Jul 2, 2019
f005263
fix(button): danger styling
admrid Jul 2, 2019
527f6fe
style(Balance)
admrid Jul 3, 2019
584b99f
refactor(buttonGroup)
admrid Jul 3, 2019
05eef2e
refactor(Balance): remove buttonGroup & add visibility logic for send…
admrid Jul 3, 2019
163c294
Merge branch 'staging' into account
admrid Jul 3, 2019
9695036
Merge branch 'staging' into account
rszaloki Jul 23, 2019
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 cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,13 @@ Cypress.Commands.add("assertUserAEurBalanceOnUI", (balance, options = {}) => {
const decimals = 2;
const fmt = new Intl.NumberFormat("en", { minimumFractionDigits: decimals, maximumFractionDigits: decimals });

cy.get("[data-testid=userAEurBalance]")
cy.get("[data-testid=userAEurBalance]", { timeout: 8000 })
.invoke("text")
.should("equal", fmt.format(balance) + " A€");
});

// assert user balance on UI.
Cypress.Commands.add("assertUserEthBalanceOnUI", (_expectedEth, decimals = 13, options = {}) => {
Cypress.Commands.add("assertUserEthBalanceOnUI", (_expectedEth, decimals = 5, options = {}) => {
const fmt = new Intl.NumberFormat("en", { minimumFractionDigits: decimals, maximumFractionDigits: decimals });
cy.get("[data-testid=accountInfoBlock]").should("not.have.class", "loading");

Expand Down
Loading