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

Clarify Dashboard Send/Receive flows #190

Merged
merged 1 commit into from
Sep 4, 2023
Merged

Clarify Dashboard Send/Receive flows #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 5 additions & 29 deletions assets/style/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2471,19 +2471,7 @@ input {
outline-color: rgb(180, 180, 180);
}

.dcWallet-sWithdraw {
background-color: #ffffff29;
width: 50px;
height: 50px;
padding-top: 13px;
border-radius: 50%;
border-top-left-radius: 7px;
border-bottom-right-radius: 7px;
background-image: linear-gradient(183deg, #9621ff, #7d21ff);
cursor:pointer;
}

.dcWallet-stake {
.dcWallet-btn-left {
background-color: #ffffff29;
width: 100px;
height: 43px;
Expand All @@ -2496,7 +2484,7 @@ input {
cursor: pointer;
}

.dcWallet-unstake {
.dcWallet-btn-right {
background-color: #ffffff29;
width: 100px;
height: 43px;
Expand All @@ -2509,19 +2497,6 @@ input {
cursor:pointer;
}

.dcWallet-sDeposit {
background-color: #ffffff29;
width: 50px;
height: 50px;
padding-top: 13px;
border-radius: 50%;
border-top-right-radius: 7px;
border-bottom-left-radius: 7px;
background-image: linear-gradient(183deg, #9621ff, #7d21ff);
cursor:pointer;
}



.blackBack {
transition: all 0.15s ease-in-out;
Expand Down Expand Up @@ -2560,8 +2535,9 @@ input {
}
}

.transferMenu .transferHeader .transferExit {
cursor:pointer;
.transferExit {
position: absolute;
right: 15px;
}

.transferAnimation {
Expand Down
25 changes: 12 additions & 13 deletions index.template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,14 +502,14 @@ <h3 class="noselect balance-title">

<div class="row lessTop p-0">
<div class="col-6 d-flex" style="justify-content: flex-start;">
<div class="dcWallet-sWithdraw" onclick="MPW.toggleBottomMenu('transferMenu', 'transferAnimation')">
<i class="fas fa-arrow-up"></i>
<div class="dcWallet-btn-left" data-i18n="send" onclick="MPW.toggleBottomMenu('transferMenu', 'transferAnimation')">
Send
</div>
</div>

<div class="col-6 d-flex" style="justify-content: flex-end;">
<div class="dcWallet-sDeposit" onclick="MPW.guiRenderCurrentReceiveModal()" data-toggle="modal" data-target="#qrModal">
<i class="fas fa-arrow-down"></i>
<div class="dcWallet-btn-right" data-i18n="receive" onclick="MPW.guiRenderCurrentReceiveModal()" data-toggle="modal" data-target="#qrModal">
Receive
</div>
</div>
</div>
Expand Down Expand Up @@ -565,9 +565,8 @@ <h3 data-i18n="viewPrivateKey">View Private Key?</h3>
<!-- // Export Private Keys Modal -->

<div id="transferMenu" class="exportKeysModalColor transferMenu transferAnimation">
<div class="transferHeader">
<div data-i18n="transfer" class="transferHeaderText">Transfer</div>
<div class="transferExit" onclick="MPW.toggleBottomMenu('transferMenu', 'transferAnimation')"><i class="fa-solid fa-xmark"></i></div>
<div style="padding-top: 5px;">
<div class="transferExit ptr" onclick="MPW.toggleBottomMenu('transferMenu', 'transferAnimation')"><i class="fa-solid fa-xmark"></i></div>
</div>

<div class="transferBody">
Expand Down Expand Up @@ -846,13 +845,13 @@ <h3 class="noselect balance-title">

<div class="row lessTop p-0">
<div class="col-6 d-flex" style="justify-content: flex-start;">
<div data-i18n="stake" class="dcWallet-stake" onclick="MPW.toggleBottomMenu('stakingDelegate', 'transferAnimation')">
<div data-i18n="stake" class="dcWallet-btn-left" onclick="MPW.toggleBottomMenu('stakingDelegate', 'transferAnimation')">
Stake
</div>
</div>

<div class="col-6 d-flex" style="justify-content: flex-end;">
<div data-i18n="stakeUnstake" class="dcWallet-unstake" onclick="MPW.toggleBottomMenu('stakingUndelegate', 'transferAnimation')">
<div data-i18n="stakeUnstake" class="dcWallet-btn-right" onclick="MPW.toggleBottomMenu('stakingUndelegate', 'transferAnimation')">
Unstake
</div>
</div>
Expand All @@ -879,8 +878,8 @@ <h3 class="noselect balance-title">

<div id="stakingUndelegate" class="exportKeysModalColor transferMenu transferAnimation">
<div class="transferHeader">
<div data-i18n="stakeUnstake" class="transferHeaderText">Unstake</div>
<div class="transferExit" onclick="MPW.toggleBottomMenu('stakingUndelegate', 'transferAnimation')"><i class="fa-solid fa-xmark"></i></div>
<div data-i18n="stakeUnstake" class="sendHeaderText">Unstake</div>
<div class="transferExit ptr" onclick="MPW.toggleBottomMenu('stakingUndelegate', 'transferAnimation')"><i class="fa-solid fa-xmark"></i></div>
</div>

<div class="transferBody">
Expand Down Expand Up @@ -923,8 +922,8 @@ <h3 class="noselect balance-title">

<div id="stakingDelegate" class="exportKeysModalColor transferMenu transferAnimation">
<div class="transferHeader">
<div data-i18n="stake" class="transferHeaderText">Stake</div>
<div class="transferExit" onclick="MPW.toggleBottomMenu('stakingDelegate', 'transferAnimation')"><i class="fa-solid fa-xmark"></i></div>
<div data-i18n="stake" class="sendHeaderText">Stake</div>
<div class="transferExit ptr" onclick="MPW.toggleBottomMenu('stakingDelegate', 'transferAnimation')"><i class="fa-solid fa-xmark"></i></div>
</div>

<div class="transferBody">
Expand Down
1 change: 0 additions & 1 deletion locale/de/translation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ export const de_translation = {
redeemOrCreateCode: 'Erstelle Codes, oder löse Codes ein', //Redeem or Create Code

// Send
transfer: 'Verschicken', //Transfer
address: 'Adresse', //Address
receivingAddress: 'Empfänger Adresse', //Receiving address
sendAmountCoinsMax: 'Maximal', //MAX
Expand Down
1 change: 0 additions & 1 deletion locale/en/translation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ export const en_translation = {
redeemOrCreateCode: 'Redeem or Create Code', //

// Send
transfer: 'Transfer', //
address: 'Address', //
receivingAddress: 'Receiving address', //
sendAmountCoinsMax: 'MAX', //
Expand Down
1 change: 0 additions & 1 deletion locale/fr/translation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ export const fr_translation = {
redeemOrCreateCode: 'Remplacer ou créer un code', //Redeem or Create Code

// Send
transfer: 'Télécharger', //Transfer
address: 'Adresse', //Address
receivingAddress: 'Adresse de réception', //Receiving address
sendAmountCoinsMax: 'Maximum', //MAX
Expand Down
1 change: 0 additions & 1 deletion locale/ph/translation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ export const ph_translation = {
redeemOrCreateCode: 'I-redeem o Gumawa ng Code', //Redeem or Create Code

// Send
transfer: 'Ilipat', //Transfer
address: 'Address', //Address
receivingAddress: 'Address ng tatangap', //Receiving address
sendAmountCoinsMax: 'MAX', //MAX
Expand Down
1 change: 0 additions & 1 deletion locale/pt-br/translation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ export const pt_br_translation = {
redeemOrCreateCode: 'Resgatar ou Criar Código', //Redeem or Create Code

// Send
transfer: 'Transferir', //Transfer
address: 'Endereço', //Address
receivingAddress: 'Endereço de recepção', //Receiving address
sendAmountCoinsMax: 'Máximo', //MAX
Expand Down
1 change: 0 additions & 1 deletion locale/pt-pt/translation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ export const pt_pt_translation = {
redeemOrCreateCode: 'Resgatar ou Criar Código', //Redeem or Create Code

// Send
transfer: 'Transferir', //Transfer
address: 'Endereço', //Address
receivingAddress: 'Endereço de recepção', //Receiving address
sendAmountCoinsMax: 'Máximo', //MAX
Expand Down
1 change: 0 additions & 1 deletion locale/template/translation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var translation = {

Check warning on line 1 in locale/template/translation.js

View workflow job for this annotation

GitHub Actions / ESLint

locale/template/translation.js#L1 

'translation' is assigned a value but never used (@typescript-eslint/no-unused-vars)
// This document is to be used as a template as all the base code is in English
// Basic HTML tags are allowed such as <b><i> etc. All data is sanitized https://developer.mozilla.org/en-US/docs/Web/API/Element/innerHTML

Expand Down Expand Up @@ -99,7 +99,6 @@
redeemOrCreateCode: '', //Redeem or Create Code

// Send
transfer: '', //Transfer
address: '', //Address
receivingAddress: '', //Receiving address
sendAmountCoinsMax: '', //MAX
Expand Down
1 change: 0 additions & 1 deletion locale/uwu/translation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ export const uwu_translation = {
redeemOrCreateCode: 'Redeem or Cweate Cowode', //Redeem or Create Code

// Send
transfer: 'Twansfer', //Transfer
address: 'Addwess', //Address
receivingAddress: 'Receivwing addwess', //Receiving address
sendAmountCoinsMax: 'MAX♡', //MAX
Expand Down
Loading