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.

Sign up for GitHub

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

Jump to bottom

Stop xmr proof service at dispute #4474

Merged
merged 13 commits into from Sep 4, 2020
Merged

Stop xmr proof service at dispute #4474

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0434ba5
Refactor dependency structure to enable adding dispute managers
chimp1984 Sep 3, 2020
e74edc2
Add check if dispute is open
chimp1984 Sep 3, 2020
8e9e87c
Enable onFiatPaymentReceived again (was for dev testing)
chimp1984 Sep 3, 2020
99dca96
Ensure that p2p network and wallet are ready
chimp1984 Sep 3, 2020
6a57332
Make var local
chimp1984 Sep 3, 2020
b800820
Set default services based on localhost check not on devMode check
chimp1984 Sep 4, 2020
023eb97
Change min required confirmations from 0 to 1.
chimp1984 Sep 4, 2020
7cc021d
Add monero orange color code for tx confidence indicator
chimp1984 Sep 4, 2020
4e27b93
Show tx confidence indicator for XMR blocks. Show info icon
chimp1984 Sep 4, 2020
6ab679c
Adjust auto-conf css for badge
chimp1984 Sep 4, 2020
1016c73
Add null check. Improve text
chimp1984 Sep 4, 2020
5b58887
Do not overwrite useDevMode with useDevModeHeader
chimp1984 Sep 4, 2020
a7e1015
Change hex color code to lower case
chimp1984 Sep 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion core/src/main/java/bisq/core/app/BisqExecutable.java
View file
Open in desktop
Expand Up @@ -165,7 +165,6 @@ protected void applyInjector() {

protected void setupDevEnv() {
DevEnv.setDevMode(config.useDevMode);
DevEnv.setDevMode(config.useDevModeHeader);
DevEnv.setDaoActivated(config.daoActivated);
}

Expand Down
2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/theme-light.css
View file
Open in desktop
Expand Up @@ -108,7 +108,7 @@
-bs-chart-dao-line2: -bs-color-blue-5;

/* Monero orange color code */
-xmr-orange: #F26822;
-xmr-orange: #f26822;
}

.warning-box {
Expand Down