Skip to content

Commit

Permalink
Merge branch 'master' into jest
Browse files Browse the repository at this point in the history
  • Loading branch information
@Duddino
Duddino authored Oct 4, 2023
2 parents 08f0836 + 7182f34 commit d590027
Show file tree
Hide file tree
Showing 22 changed files with 455 additions and 202 deletions.
94 changes: 17 additions & 77 deletions index.template.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,83 +445,12 @@ <h3 class="modal-title" id="contactsModalTitle" data-i18n="contacts" style="text
<!-- WALLET FEATURES -->
<div id="guiWallet" style="display: none;">
<div class="row p-0">
<!-- Balance in PIVX & USD-->
<div class="col-12 p-0 mb-5">
<center>
<div class="dcWallet-balances mb-4">

<div class="row lessBot p-0">
<div class="col-6 d-flex dcWallet-topLeftMenu" style="justify-content: flex-start;">
<h3 class="noselect balance-title">
<span class="reload noselect" onclick="MPW.refreshChainData()"><i id="balanceReload" class="fa-solid fa-rotate-right"></i></span>
</h3>
</div>

<div class="col-6 d-flex dcWallet-topRightMenu" style="justify-content: flex-end;">
<div class="btn-group dropleft">
<i class="fa-solid fa-ellipsis-vertical" style="width: 20px;" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></i>
<div class="dropdown">
<div class="dropdown-move">
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<a class="dropdown-item ptr" onclick="MPW.renderWalletBreakdown()" data-toggle="modal" data-target="#walletBreakdownModal">
<i class="fa-solid fa-chart-pie"></i> <span data-i18n="balanceBreakdown">Balance Breakdown</span>
</a>
<a class="dropdown-item ptr" onclick="MPW.openExplorer()">
<i class="fa-solid fa-magnifying-glass"></i> <span data-i18n="viewOnExplorer">View on Explorer</span>
</a>
<a class="dropdown-item ptr" onclick="MPW.guiRenderContacts()" data-toggle="modal" data-target="#contactsModal">
<i class="fa-solid fa-address-book"></i> <span data-i18n="contactsBook">Contacts</span>
</a>
<a id="guiExportWalletItem" class="dropdown-item ptr" data-toggle="modal" data-target="#exportPrivateKeysModal" data-backdrop="static" data-keyboard="false" onclick="MPW.toggleExportUI()">
<i class="fas fa-key"></i> <span data-i18n="export">Export</span>
</a>
<a class="dropdown-item ptr" id="guiNewAddress" data-toggle="modal" data-target="#qrModal" onclick="MPW.getNewAddress({updateGUI: true, verify: true});">
<i class="fas fa-sync-alt"></i> <span data-i18n="refreshAddress">Refresh address</span>
</a>
<a class="dropdown-item ptr" data-toggle="modal" data-target="#redeemCodeModal">
<i class="fa-solid fa-gift"></i> <span data-i18n="redeemOrCreateCode">Redeem or Create Code</span>
</a>
</div>
</div>
</div>
</div>
</div>
</div>

<canvas id="identicon" class="innerShadow" style="width: 65px; height: 65px;" data-jdenticon-value=""></canvas><br />
<span class="ptr" onclick="MPW.renderWalletBreakdown()" data-toggle="modal" data-target="#walletBreakdownModal">
<span class="dcWallet-pivxBalance" id="guiBalance"></span>
<span id="guiBalanceTicker" class="dcWallet-pivxTicker">PIV</span>
<i class="fa-solid fa-plus" style="opacity: 0.5; position: relative; left: 2px;"></i>
</span>
<br />
<div class="dcWallet-usdBalance">
<span id="guiBalanceValue" class="dcWallet-usdValue">$-</span>
<span id="guiBalanceValueCurrency" class="dcWallet-usdValue">USD</span>
</div>

<div class="row lessTop p-0">
<div class="col-6 d-flex" style="justify-content: flex-start;">
<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-btn-right" data-i18n="receive" onclick="MPW.guiRenderCurrentReceiveModal()" data-toggle="modal" data-target="#qrModal">
Receive
</div>
</div>
</div>


</div>
</center>
</div>

<div id="activityDashboard" class="col-12 mb-5">

</div>
<!-- Balance in PIVX & USD-->
<div id="walletBalance" class="col-12 p-0 mb-5">
</div>

<div id="activityDashboard" class="col-12 mb-5">
</div>
</div>

<!-- Export Private Key Modal -->
Expand Down Expand Up @@ -932,6 +861,17 @@ <h3 class="noselect balance-title">
</div>
</div>

<div id="ownerAddressContainer">
<label data-i18n="ownerAddress">(Optional) Owner Address</label><br />

<div class="input-group mb-3">
<input class="btn-group-input" data-i18n="ownerAddress" oninput='MPW.guiCheckRecipientInput(event)' style="font-family: monospace;" type="text" id="delegateOwnerAddress" placeholder="(Optional) Owner Address" autocomplete="nope" />
<div class="input-group-append">
<span class="input-group-text ptr" onclick="MPW.guiSelectContact(MPW.doms.domStakeOwnerAddress)"><i class="fa-solid fa-address-book fa-2xl"></i></span>
</div>
</div>
</div>

<div class="text-right pb-2">
<button class="pivx-button-medium w-100" style="margin:0px;" onclick="MPW.delegateGUI()">
<span class="buttoni-icon"><i class="fas fa-paper-plane fa-tiny-margin"></i></span>
Expand Down
3 changes: 2 additions & 1 deletion locale/de/translation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ export default {
// Stake
stake: 'Delegieren', //Stake
stakeUnstake: 'Abberufen', //Unstake
ownerAddress: '', //(Optional) Owner Address
rewardHistory: 'Vergütungshistorie', //Reward History
loadMore: 'Zeige mehr', //Load more

Expand Down Expand Up @@ -249,7 +250,7 @@ export default {
popupSetColdAddr: 'Gib eine kalte Staking Adresse an', //Set your Cold Staking address
popupCurrentAddress: 'Aktuelle Adresse', //Current address:
popupColdStakeNote:
'Eine kalte Staking Adresse delegiert Münzen für dich. Sie kann nicht für Transaktionen verwendet werden, so kannst du auch fremde kalte Adressen verwenden!', //A Cold Address stakes coins on your behalf, it cannot spend coins, so it's even safe to use a stranger's Cold Address!
'Eine kalte Staking Adresse delegiert Münzen für dich. Sie kann nicht für Transaktionen verwendet werden, so kannst du auch fremde kalte Adressen verwenden!', //A Cold Address stakes coins on your behalf, it cannot spend coins, so it's even safe to use a stranger\'s Cold Address!
popupExample: 'Beispiel', //Example:
popupWalletLock: 'Möchtest du deine Geldbörse sperren?', //Do you want to lock your wallet?
popupWalletWipe:
Expand Down
1 change: 1 addition & 0 deletions locale/en/translation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ export default {
// Stake
stake: 'Stake', //
stakeUnstake: 'Unstake', //
ownerAddress: '(Optional) Owner Address',
rewardHistory: 'Reward History', //
loadMore: 'Load more', //

Expand Down
1 change: 1 addition & 0 deletions locale/es-mx/translation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ export default {
// Stake
stake: 'Stake', //Stake
stakeUnstake: 'Unstake', //Unstake
ownerAddress: '', //(Optional) Owner Address
rewardHistory: 'Historial de recompensas', //Reward History
loadMore: 'Cargar más', //Load more

Expand Down
1 change: 1 addition & 0 deletions locale/fr/translation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ export default {
// Stake
stake: 'Stake', //Stake
stakeUnstake: 'Unstake', //Unstake
ownerAddress: '', //(Optional) Owner Address
rewardHistory: 'Historique des récompenses', //Reward History
loadMore: 'Chargez plus', //Load more

Expand Down
1 change: 1 addition & 0 deletions locale/it/translation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ export default {
// Stake
stake: 'Stake', //Stake
stakeUnstake: 'Unstake', //Unstake
ownerAddress: '', //(Optional) Owner Address
rewardHistory: 'Cronologia delle ricompense', //Reward History
loadMore: 'Carica altro', //Load more

Expand Down
1 change: 1 addition & 0 deletions locale/ph/translation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ export default {
// Stake
stake: 'Stake', //Stake
stakeUnstake: 'Unstake', //Unstake
ownerAddress: '', //(Optional) Owner Address
rewardHistory: 'History ng iyong Reward', //Reward History
loadMore: 'Load more', //Load more

Expand Down
1 change: 1 addition & 0 deletions locale/pt-br/translation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ export default {
// Stake
stake: 'Stake', //Stake
stakeUnstake: 'Unstake', //Unstake
ownerAddress: '', //(Optional) Owner Address
rewardHistory: 'Histórico de recompensas', //Reward History
loadMore: 'Carregar mais', //Load more

Expand Down
1 change: 1 addition & 0 deletions locale/pt-pt/translation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ export default {
// Stake
stake: 'Stake', //Stake
stakeUnstake: 'Unstake', //Unstake
ownerAddress: '', //(Optional) Owner Address
rewardHistory: 'Histórico de recompensas', //Reward History
loadMore: 'Carregar mais', //Load more

Expand Down
1 change: 1 addition & 0 deletions locale/template/translation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ export default {
// Stake
stake: '', //Stake
stakeUnstake: '', //Unstake
ownerAddress: '', //(Optional) Owner Address
rewardHistory: '', //Reward History
loadMore: '', //Load more

Expand Down
1 change: 1 addition & 0 deletions locale/uwu/translation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ export default {
// Stake
stake: '', //Stake
stakeUnstake: '', //Unstake
ownerAddress: '(Optional) Owner Addwess', //(Optional) Owner Address
rewardHistory: 'Rewawrd Histowy', //Reward History
loadMore: 'Lowoad Mowore', //Load more

Expand Down
Loading

0 comments on commit d590027

Please sign in to comment.