Make mixing labels more understandable
MODIFY
HiddenWallet.Gui/app/html/wallet-content.html
HiddenWallet.Gui/app/html/wallet-content.html
<td style="width:200px;"><span class="label label-success" style="font-size: 13px;" id="tumbler-denomination"></span></td>
</tr>
<tr>
- <td><label>Anonymity Set:</label></td>
+ <td><label>Required Users (Anonymity Set):</label></td>
<td><span class="label label-success" style="font-size: 13px;" id="tumbler-anonymity-set"></span></td>
</tr>
<tr>
- <td><label>Registered Peers:</label></td>
+ <td><label>Registered Users:</label></td>
<td><span class="label label-success" style="font-size: 13px;" id="tumbler-peer-count"></span></td>
</tr>
<tr>
<td><span class="label label-success" style="font-size: 13px;" id="tumbler-fee-per-round"></span></td>
</tr>
<tr>
- <td><label>Waited For Peers In Previous Round:</label></td>
+ <td><label>Waited For Users In Previous Round:</label></td>
<td><span class="label label-success" style="font-size: 13px;" id="tumbler-time-spent-waiting"></span></td>
</tr>
<tr>
</button>
</div>
</div>
- <button id="cancel-mixing-button" style="display:none" class="btn btn-lg btn-danger btn-block" onclick="cancelMix()">
+ <div id="mixing-in-process-div" style="display:none">
+ <span class="label label-info" style="font-size: 13px;">Have some patience! Waiting for other users to register for the mix may take a while...</span>
+ <br />
+ <br />
+ <button id="cancel-mixing-button" class="btn btn-lg btn-danger btn-block" onclick="cancelMix()">
Stop Mixing
</button>
</div>
</div>
+</div>
\ No newline at end of file

MODIFY
HiddenWallet.Gui/app/js/wallet-phase.ts
HiddenWallet.Gui/app/js/wallet-phase.ts
@@ -167,16 +167,16 @@ function mixerShow() {
let mixerHrs: HTMLCollectionOf<Element> = document.getElementsByClassName("mixer-hr");
- let cancelMixingButton: HTMLElement = document.getElementById("cancel-mixing-button");
+ let mixingInProcessDiv: HTMLElement = document.getElementById("mixing-in-process-div");
let mixingInputElements: HTMLElement = document.getElementById("mixing-input-elements");
let isMixOngoing: boolean = httpGetTumbler("ongoing-mix", true).Value;
if (isMixOngoing) {
mixingInputElements.style.display = "none";
- cancelMixingButton.style.display = "inline";
+ mixingInProcessDiv.style.display = "inline";
}
else {
mixingInputElements.style.display = "inline";
- cancelMixingButton.style.display = "none";
+ mixingInProcessDiv.style.display = "none";
}
if (isTumblerOnline === false) {
@@ -269,10 +269,10 @@ function mix() {
let json: any;
let mixingInputElements: HTMLElement = document.getElementById("mixing-input-elements");
- let cancelMixingButton: HTMLElement = document.getElementById("cancel-mixing-button");
+ let mixingInProcessDiv: HTMLElement = document.getElementById("mixing-in-process-div");
mixingInputElements.style.display = "none";
- cancelMixingButton.style.display = "inline";
+ mixingInProcessDiv.style.display = "inline";
httpPostTumblerAsync("tumble", obj, function (json) {
try {

Make mixing labels more understandable