Merge pull request #11 from Duddino/revert-8-revert-7-revert-5-github…

…-preview Revert "Revert "Revert "GitHub preview"""
Duddino · Sep 25, 2023 · fa092a9 · fa092a9
2 parents b592d6c + 7721476
commit fa092a9
Show file tree

Hide file tree

Showing 26 changed files with 642 additions and 914 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
diff --git a/index.template.html b/index.template.html
@@ -475,7 +475,7 @@ <h3 class="noselect balance-title">
                                         <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});">
+                                        <a class="dropdown-item ptr" id="guiNewAddress" data-toggle="modal" data-target="#qrModal" onclick="MPW.wallet.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">
@@ -519,8 +519,19 @@ <h3 class="noselect balance-title">
                         </center>
                       </div>
 
-                      <div id="activityDashboard" class="col-12 mb-5">
-
+                      <div class="col-12 mb-5">
+                        <center><span data-i18n="activity" class="dcWallet-activityLbl">Activity</span></center>
+                        <div class="dcWallet-activity">
+                          <div class="scrollTable">
+                            <div id="activity-list-content"></div>
+                            <center>
+                              <button class="pivx-button-medium" id="activityLoadMore" onclick="MPW.updateActivityGUI(false)">
+                                <span class="buttoni-icon"><i class="fas fa-sync fa-tiny-margin" id="activityLoadMoreIcon"></i></span>
+                                <span class="buttoni-text" data-i18n="loadMore">Load more</span>
+                              </button>
+                            </center>
+                          </div>
+                        </div>
                       </div>
                     </div>
 
@@ -850,7 +861,18 @@ <h3 class="noselect balance-title">
                   </div>
 
                   <div class="col-12 mb-5">
-		      <div id="stakeActivity"> </div>
+                    <center><span class="dcWallet-activityLbl"><span data-i18n="rewardHistory">Reward History</span> (<span id="staking-rewards-title">-</span>)</span></center>
+                    <div class="dcWallet-activity">
+                      <div class="scrollTable">
+                        <div id="staking-rewards-content"></div>
+                        <center>
+                          <button class="pivx-button-medium" id="stakingLoadMore" onclick="MPW.updateActivityGUI(true)">
+                            <span class="buttoni-icon"><i class="fas fa-sync fa-tiny-margin" id="stakingLoadMoreIcon"></i></span>
+                            <span class="buttoni-text" data-i18n="loadMore">Load more</span>
+                          </button>
+                        </center>
+                      </div>
+                    </div>
                   </div>
                 </div>
 
@@ -1235,6 +1257,6 @@ <h2 id="mnLastSeen" class="stake-balances" style="overflow-wrap: anywhere; top:
     </div>
 
     <div class="blackBack blackBackHide d-none" id="blackBack"></div>
-    <div id="app"></div>
+
   </body>
 </html>
diff --git a/locale/de/translation.js b/locale/de/translation.js
@@ -228,7 +228,7 @@ export const de_translation = {
     description: 'Beschreibung', //Description
     activityBlockReward: 'Block-Erlös', //Block Reward
     activitySentTo: 'Gesendet an', //Sent to
-    activitySentToSelf: 'Umbuchung', //Self
+    activitySentToSelf: 'Umbuchung', //Sent to self
     activityShieldedAddress: 'Geschützte Adresse', //Shielded address
     activityReceivedShield: 'Erhalten von geschützter Adresse', //Received from Shielded address
     activityReceivedFrom: 'Erhalten von', //Received from

diff --git a/locale/en/translation.js b/locale/en/translation.js
@@ -224,11 +224,12 @@ export const en_translation = {
     time: 'Time',
     description: 'Description',
     activityBlockReward: 'Block Reward',
-    activitySentTo: 'Sent to {r}',
-    activitySelf: 'self',
+    activitySentTo: 'Sent to',
+    activitySentToSelf: 'Sent to self',
     activityShieldedAddress: 'Shielded address',
-    activityReceivedFrom: 'Received from {s}',
-    activityDelegatedTo: 'Delegated to {r}',
+    activityReceivedShield: 'Received from Shielded address',
+    activityReceivedFrom: 'Received from',
+    activityDelegatedTo: 'Delegated to',
     activityUndelegated: 'Undelegated',
     activityUnknown: 'Unknown Tx',
     password: 'Password',

diff --git a/locale/es-mx/translation.js b/locale/es-mx/translation.js
@@ -232,11 +232,12 @@ export const es_mx_translation = {
     time: 'Hora', //Time
     description: 'Descripción', //Description
     activityBlockReward: 'Recompensa del Bloque', //Block Reward
-    activitySentTo: 'Enviar a {r}', //Sent to
-    activitySelf: 'ti mismo', //Self
+    activitySentTo: 'Enviar a', //Sent to
+    activitySentToSelf: 'Enviar a ti mismo', //Sent to self
     activityShieldedAddress: 'Dirección Shielded', //Shielded address
-    activityReceivedFrom: 'Recibido de {s}', //Received from
-    activityDelegatedTo: 'Delegado a {r}', //Delegated to
+    activityReceivedShield: 'Recibido desde dirección Shielded', //Received from Shielded address
+    activityReceivedFrom: 'Recibido de', //Received from
+    activityDelegatedTo: 'Delegado a', //Delegated to
     activityUndelegated: 'No delegado', //Undelegated
     activityUnknown: 'Tx desconocido', //Unknown Tx
     password: 'Contraseña', //Password

diff --git a/locale/fr/translation.js b/locale/fr/translation.js
@@ -232,11 +232,12 @@ export const fr_translation = {
     time: 'Heure', //Time
     description: 'Description', //Description
     activityBlockReward: 'Récompense en bloc', //Block Reward
-    activitySentTo: 'Envoyé à {r}', //Sent to
-    activitySelf: 'soi-même', //Self
+    activitySentTo: 'Envoyé à', //Sent to
+    activitySentToSelf: 'Envoyé à soi-même', //Sent to self
     activityShieldedAddress: 'Adresse protégée', //Shielded address
-    activityReceivedFrom: 'Reçu de {s}', //Received from
-    activityDelegatedTo: 'Délégué à {r}', //Delegated to
+    activityReceivedShield: "Reçu d'une adresse protégée", //Received from Shielded address
+    activityReceivedFrom: 'Reçu de', //Received from
+    activityDelegatedTo: 'Délégué à', //Delegated to
     activityUndelegated: 'Non délégué', //Undelegated
     activityUnknown: 'Transaction inconnu', //Unknown Tx
     password: 'Mot de passe', //Password

diff --git a/locale/it/translation.js b/locale/it/translation.js
@@ -214,11 +214,12 @@ export const it_translation = {
     time: 'Tempo', //Time
     description: 'Descrizione', //Description
     activityBlockReward: 'Ricompensa del blocco', //Block Reward
-    activitySentTo: 'Inviato a {r}', //Sent to
-    activitySelf: 'te stesso', //Self
+    activitySentTo: 'Invia a ', //Sent to
+    activitySentToSelf: 'Invia a te stesso', //Sent to self
     activityShieldedAddress: 'Indirizzo protetto', //Shielded address
-    activityReceivedFrom: 'Ricevuto da {s}', //Received from
-    activityDelegatedTo: 'Delegato a {r}', //Delegated to
+    activityReceivedShield: 'Ricevi tramite indirizzo protetto', //Received from Shielded address
+    activityReceivedFrom: 'Ricevuto da ', //Received from
+    activityDelegatedTo: 'Delegato a ', //Delegated to
     activityUndelegated: 'Non delegato', //Undelegated
     activityUnknown: 'Tx sconosciuta', //Unknown Tx
     password: 'Password', //Password

diff --git a/locale/ph/translation.js b/locale/ph/translation.js
@@ -235,11 +235,12 @@ export const ph_translation = {
     time: 'Oras', //Time
     description: 'Description', //Description
     activityBlockReward: 'Block Reward', //Block Reward
-    activitySentTo: 'Naipadala sa {r}', //Sent to
-    activitySelf: 'sarili', //Self
+    activitySentTo: 'Naipadala sa ', //Sent to
+    activitySentToSelf: 'Naipadala sa sarili', //Sent to self
     activityShieldedAddress: 'Shielded address', //Shielded address
-    activityReceivedFrom: 'Natanggap mula sa {s}', //Received from
-    activityDelegatedTo: 'Delegated to {r}', //Delegated to
+    activityReceivedShield: 'Natanggap mula sa Shielded address', //Received from Shielded address
+    activityReceivedFrom: 'Natanggap mula sa', //Received from
+    activityDelegatedTo: 'Delegated to', //Delegated to
     activityUndelegated: 'Undeligated', //Undelegated
     activityUnknown: 'Unknown Tx', //Unknown Tx
     password: 'Password', //Password

diff --git a/locale/pt-br/translation.js b/locale/pt-br/translation.js
@@ -232,11 +232,12 @@ export const pt_br_translation = {
     time: 'Tempo', //Time
     description: 'Descrição', //Description
     activityBlockReward: 'Bloco Recompensa', //Block Reward
-    activitySentTo: 'Enviado para {r}', //Sent to
-    activitySelf: 'si mesmo', //Self
+    activitySentTo: 'Enviado para', //Sent to
+    activitySentToSelf: 'Enviado para si mesmo', //Sent to self
     activityShieldedAddress: 'Endereço Protegido', //Shielded address
-    activityReceivedFrom: 'Recebido de {s}', //Received from
-    activityDelegatedTo: 'Delegado a {r}', //Delegated to
+    activityReceivedShield: 'Recebido de Endereço Protegido', //Received from Shielded address
+    activityReceivedFrom: 'Recebido de', //Received from
+    activityDelegatedTo: 'Delegado a', //Delegated to
     activityUndelegated: 'Não é Delegado', //Undelegated
     activityUnknown: 'Tx desconhecido', //Unknown Tx
     password: 'Senha', //Password

diff --git a/locale/pt-pt/translation.js b/locale/pt-pt/translation.js
@@ -232,11 +232,12 @@ export const pt_pt_translation = {
     time: 'Tempo', //Time
     description: 'Descrição', //Description
     activityBlockReward: 'Bloco Recompensa', //Block Reward
-    activitySentTo: 'Enviado para {r}', //Sent to
-    activitySelf: 'si mesmo', //Self
+    activitySentTo: 'Enviado para', //Sent to
+    activitySentToSelf: 'Enviado para si mesmo', //Sent to self
     activityShieldedAddress: 'Endereço Protegido', //Shielded address
-    activityReceivedFrom: 'Recebido de {s}', //Received from
-    activityDelegatedTo: 'Delegado a {r}', //Delegated to
+    activityReceivedShield: 'Recebido de Endereço Protegido', //Received from Shielded address
+    activityReceivedFrom: 'Recebido de', //Received from
+    activityDelegatedTo: 'Delegado a', //Delegated to
     activityUndelegated: 'Não é Delegado', //Undelegated
     activityUnknown: 'Tx desconhecido', //Unknown Tx
     password: 'Senha', //Password

diff --git a/locale/template/translation.js b/locale/template/translation.js
@@ -225,11 +225,12 @@ export const translation_template = {
     time: '', //Time
     description: '', //Description
     activityBlockReward: '', //Block Reward
-    activitySentTo: '', //Sent to {}
-    activitySelf: '', // self
+    activitySentTo: '', //Sent to
+    activitySentToSelf: '', //Sent to self
     activityShieldedAddress: '', //Shielded address
-    activityReceivedFrom: '', //Received from {}
-    activityDelegatedTo: '', // Delegated to {}
+    activityReceivedShield: '', //Received from Shielded address
+    activityReceivedFrom: '', //Received from
+    activityDelegatedTo: '', //Delegated to
     activityUndelegated: '', //Undelegated
     activityUnknown: '', //Unknown Tx
     password: '', //Password

diff --git a/locale/uwu/translation.js b/locale/uwu/translation.js
@@ -228,11 +228,12 @@ export const uwu_translation = {
     time: 'Time', //Time
     description: 'Descwiption', //Description
     activityBlockReward: 'Bwock Rewawrd', //Block Reward
-    activitySentTo: 'Sentu to {r}', //Sent to
-    activitySelf: 'selfu', //Self
-    activityReceivedShield: 'Shielded addwess', //Received from Shielded address
-    activityReceivedFrom: 'Recewived fwom {s}', //Received from
-    activityDelegatedTo: 'Delegwated to {r}', //Delegated to
+    activitySentTo: 'Sentu to', //Sent to
+    activitySentToSelf: 'Sentu to selfu', //Sent to self
+    activityShieldedAddress: 'Shielded addwess', //Shielded address
+    activityReceivedShield: 'Recewived fwom Shielded addwess', //Received from Shielded address
+    activityReceivedFrom: 'Recewived fwom', //Received from
+    activityDelegatedTo: 'Delegwated to', //Delegated to
     activityUndelegated: 'Undelegwated', //Undelegated
     activityUnknown: 'Unknown Tx', //Unknown Tx
     password: 'Password', //Password