Merge commit '5fe6645b0cbd544455d7b4cfd983294d07809a19' into dependab…

…ot/npm_and_yarn/walletconnect/jsonrpc-types-1.0.4

firefly.diff

@@ -1097,6 +1097,7 @@
  delete mode 100644 packages/shared/lib/core/app/stores/time.store.ts
  delete mode 100644 packages/shared/lib/core/app/utils/shouldBeDarkMode.ts
  delete mode 100644 packages/shared/lib/core/i18n/utils/parseCurrency.ts
+ delete mode 100644 packages/shared/lib/core/layer-2/abis/index.ts
  delete mode 100644 packages/shared/lib/core/layer-2/actions/fetchSelectedAccountLayer2Balance.ts
  delete mode 100644 packages/shared/lib/core/layer-2/actions/index.ts
  delete mode 100644 packages/shared/lib/core/layer-2/actions/loadEvmAddressForSelectedAccount.ts
@@ -1521,6 +1522,7 @@
  rename packages/shared/{components/atoms => src/components}/tiles/Tile.svelte (85%)
  rename packages/shared/{components/atoms/tiles/index.js => src/components/tiles/index.ts} (57%)
  rename packages/shared/{ => src}/components/types/text-prop.type.ts (100%)
+ rename packages/{mobile/capacitor/plugins/secure-filesystem-access/android/src/main/res/.gitkeep => shared/src/lib/auxiliary/country/index.ts} (100%)
  rename packages/shared/{ => src}/lib/auxiliary/deep-link/actions/index.ts (100%)
  rename packages/shared/{ => src}/lib/auxiliary/deep-link/actions/resetDeepLink.ts (57%)
  rename packages/shared/{ => src}/lib/auxiliary/deep-link/constants/index.ts (100%)
@@ -1559,7 +1561,7 @@
  rename packages/shared/{lib/contexts/governance => src/lib/auxiliary/third-party}/index.ts (72%)
  rename packages/shared/{lib/core/profile/actions/profiles/checkAndMigrateProfiles.ts => src/lib/auxiliary/third-party/migrations/firefly-stardust/firefly-stardust-migrations.ts} (52%)
  rename packages/{mobile/lib/contexts/settings => shared/src/lib/auxiliary/transak}/index.ts (100%)
- rename packages/{mobile/capacitor/plugins/secure-filesystem-access/android/src/main/res/.gitkeep => shared/src/lib/auxiliary/wallet-connect/index.ts} (100%)
+ rename specs/images/.gitkeep => packages/shared/src/lib/auxiliary/wallet-connect/index.ts (100%)
  rename packages/shared/{ => src}/lib/auxiliary/wordlists/english.ts (100%)
  rename packages/shared/{ => src}/lib/auxiliary/wordlists/index.ts (100%)
  rename packages/shared/{ => src}/lib/auxiliary/wordlists/utils/generateRandomWord.ts (90%)
@@ -1792,7 +1794,6 @@
  rename packages/shared/{ => src}/lib/core/app/utils/needsToAcceptLatestPrivacyPolicy.ts (100%)
  rename packages/shared/{ => src}/lib/core/app/utils/needsToAcceptLatestTermsOfService.ts (100%)
  rename packages/shared/{ => src}/lib/core/app/utils/openUrlInBrowser.ts (59%)
- rename specs/images/.gitkeep => packages/shared/src/lib/core/contact/helpers/index.ts (100%)
  rename packages/shared/{lib/core/ledger => src/lib/core/contact}/index.ts (72%)
  rename packages/shared/{ => src}/lib/core/error/actions/index.ts (100%)
  rename packages/shared/{ => src}/lib/core/error/actions/logAndNotifyError.ts (70%)
@@ -1846,9 +1847,8 @@
  rename packages/shared/{ => src}/lib/core/i18n/utils/getGroupSeparator.ts (83%)
  rename packages/shared/{ => src}/lib/core/i18n/utils/index.ts (100%)
  rename packages/shared/{ => src}/lib/core/i18n/utils/replaceCurrencyDecimal.ts (100%)
+ rename packages/shared/{lib/core/layer-2/abis/isc-sandbox.abi.ts => src/lib/core/isc/abis/isc-magic-contract-sandbox.abi.ts} (89%)
  rename packages/shared/{ => src}/lib/core/layer-2/abis/erc20.abi.ts (98%)
- rename packages/shared/{ => src}/lib/core/layer-2/abis/index.ts (68%)
- rename packages/shared/{ => src}/lib/core/layer-2/abis/isc-sandbox.abi.ts (99%)
  rename packages/shared/{ => src}/lib/core/layer-2/classes/simple-buffer.class.ts (100%)
  rename packages/shared/{ => src}/lib/core/layer-2/constants/accounts-contract.constant.ts (100%)
  rename packages/shared/{ => src}/lib/core/layer-2/constants/contract-functions.constant.ts (100%)

packages/desktop/components/AccountSwitcher.svelte

@@ -9,7 +9,6 @@
     import { PopupId, openPopup } from '@desktop/auxiliary/popup'
 
     export let breadcrumb: boolean = false
-    export let compact: boolean = false
     export let hasCreateAccount: boolean = false
     export let placement: 'bottom-start' | 'bottom-end' = 'bottom-start'
 
@@ -30,7 +29,19 @@
                 onClick: () => onAccountClick(account.index),
             }
         })
+
+        const totalBalance = Object.values($allAccountFiatBalances)
+            .reduce((acc, balance) => Number(acc) + Number(balance), 0)
+            .toString()
+
+        items = items.concat({
+            title: localize('general.totalBalance'),
+            subtitle: formatCurrency(totalBalance),
+            selected: false,
+            hidden: accounts.length < 2,
+        })
     }
+
     $: setItems($visibleActiveAccounts, $selectedAccount?.index)
 
     function onCreateAccountClick(): void {
@@ -41,7 +52,7 @@
 
 <Menu
     {items}
-    {compact}
+    compact={false}
     {...hasCreateAccount && { button: { text: localize('general.newAccount'), onClick: onCreateAccountClick } }}
     {placement}
     maxHeight={320}
@@ -51,12 +62,12 @@
             {#if breadcrumb}
                 <Indicator color={$selectedAccount?.color} size="sm" />
             {/if}
-            <div class="flex flex-row justify-center items-center {compact ? 'space-x-1' : 'space-x-2'}">
-                <Text type={compact ? 'base' : 'body1'}>
+            <div class="flex flex-row justify-center items-center {breadcrumb ? 'space-x-1' : 'space-x-2'}">
+                <Text type={breadcrumb ? 'base' : 'body1'}>
                     {$selectedAccount?.name}
                 </Text>
                 {#if !breadcrumb}
-                    <Icon name={IconName.ChevronSelectorVertical} size={compact ? 'xs' : 'sm'} textColor="secondary" />
+                    <Icon name={IconName.ChevronSelectorVertical} size="sm" textColor="secondary" />
                 {/if}
             </div>
         </div>

packages/desktop/views/dashboard/components/Breadcrumbs.svelte

@@ -66,7 +66,7 @@
     />
     <div class="flex flex-row space-x-1 items-center">
         <div class="shrink-0">
-            <AccountSwitcher breadcrumb compact />
+            <AccountSwitcher breadcrumb hasCreateAccount />
         </div>
         <Icon name={IconName.ChevronRight} size="sm" />
         <Breadcrumb

packages/shared/package.json

@@ -5,7 +5,7 @@
     "author": "Bloom Labs Ltd <[email protected]>",
     "license": "PolyForm Strict License 1.0.0",
     "dependencies": {
-        "@bloomwalletio/ui": "0.21.1",
+        "@bloomwalletio/ui": "0.21.3",
         "@ethereumjs/common": "4.3.0",
         "@ethereumjs/rlp": "5.0.2",
         "@ethereumjs/tx": "5.3.0",

packages/shared/src/locales/de.json

@@ -1023,7 +1023,7 @@
             "selectAmount": "{tokenName} senden",
             "selectRecipient": "{assetName} senden an",
             "transactionSummary": "Transaktion an {recipient}",
-            "ircAssetsToL2Hint": "You are about to send an IRC asset to an EVM network. Most EVM based wallets don't support displaying IRC assets correctly.",
+            "ircAssetsToL2Hint": "Du bist dabei, ein IRC-Asset an ein EVM-Netzwerk zu senden. Die meisten EVM-basierten Wallets unterstützen die Anzeige von IRC-Assets nicht.",
             "surplusIncluded": "Diese Transaktion enthält eine überschüssige Betrag. Bitte überprüfe, ob dies der Betrag ist, den du senden möchtest."
         },
         "walletFinder": {
@@ -1094,10 +1094,10 @@
             "success": "Signierte Transaktion"
         },
         "tokenApproval": {
-            "title": "Approve {dappName} to access {assetName}",
-            "hint": "{address} is requesting approval to spend {assetName}",
-            "action": "Approve",
-            "success": "Successfully approved"
+            "title": "{dappName} genehmigen, um auf {assetName} zuzugreifen",
+            "hint": "{address} beantragt die Freigabe für {assetName}",
+            "action": "Genehmigen",
+            "success": "Erfolgreich genehmigt"
         },
         "sendTransaction": {
             "title": "Transaktion senden",
@@ -1106,9 +1106,9 @@
         },
         "smartContractCall": {
             "title": "Aufruf des Smart Contracts an {contractAddress}",
-            "unableToVerify": "Bloom is unable to parse the smart contract data, only proceed with apps you trust.",
-            "partiallyVerified": "Bloom has partially parsed the smart contract data, proceed with apps you trust.",
-            "viewSmartContract": "View Contract",
+            "unableToVerify": "Bloom kann die Smart-Contract-Daten nicht analysieren. Fahre nur mit Apps fort, denen du vertraust.",
+            "partiallyVerified": "Bloom hat die Smart-Contract-Daten teilweise analysiert. Fahre nur mit Apps fort, denen du vertraust.",
+            "viewSmartContract": "Zeige Contract",
             "action": "Bestätigen",
             "success": "Aufruf des Smart Contracts an {recipient}"
         },

packages/shared/src/locales/en.json

@@ -1738,7 +1738,8 @@
         "average": "Average",
         "fast": "Fast",
         "spender": "Spender",
-        "status": "Status"
+        "status": "Status",
+        "totalBalance": "Total balance"
     },
     "filters":{
         "title": "Filters",

packages/shared/src/locales/nl.json

@@ -1023,7 +1023,7 @@
             "selectAmount": "Verzend {tokenName}",
             "selectRecipient": "Verzend {assetName} naar",
             "transactionSummary": "Transactie naar {recipient}",
-            "ircAssetsToL2Hint": "You are about to send an IRC asset to an EVM network. Most EVM based wallets don't support displaying IRC assets correctly.",
+            "ircAssetsToL2Hint": "Je staat op het punt om een IRC asset naar een EVM netwerk te sturen. De meeste op EVM gebaseerde wallets geven IRC assets vaak onjuist weer.",
             "surplusIncluded": "Deze transactie bevat een overschot. Controleer of dit het bedrag is dat u wilt versturen."
         },
         "walletFinder": {
@@ -1094,10 +1094,10 @@
             "success": "Ondertekende transactie"
         },
         "tokenApproval": {
-            "title": "Approve {dappName} to access {assetName}",
-            "hint": "{address} is requesting approval to spend {assetName}",
-            "action": "Approve",
-            "success": "Successfully approved"
+            "title": "{dappName} goedkeuren voor toegang tot {assetName}",
+            "hint": "{address} vraagt goedkeuring voor het uitgeven van {assetName}",
+            "action": "Goedkeuren",
+            "success": "Succesvol goedgekeurd"
         },
         "sendTransaction": {
             "title": "Transactie verzenden",
@@ -1106,9 +1106,9 @@
         },
         "smartContractCall": {
             "title": "Smart Contract-oproep naar {contractAddress}",
-            "unableToVerify": "Bloom is unable to parse the smart contract data, only proceed with apps you trust.",
-            "partiallyVerified": "Bloom has partially parsed the smart contract data, proceed with apps you trust.",
-            "viewSmartContract": "View Contract",
+            "unableToVerify": "Bloom is niet in staat om de smart contract data te verifiëren. Ga alleen verder met apps die je vertrouwt.",
+            "partiallyVerified": "Bloem heeft de gegevens van het smart contract gedeeltelijk geverifieerd, ga door met apps die je vertrouwt.",
+            "viewSmartContract": "Bekijk Contract",
             "action": "Bevestig",
             "success": "Smart contract oproep naar {recipient}"
         },
@@ -1735,7 +1735,7 @@
         "slow": "Langzaam",
         "average": "Gemiddeld",
         "fast": "Snel",
-        "spender": "Spender",
+        "spender": "Uitgever",
         "status": "Status"
     },
     "filters": {

packages/shared/src/locales/pl.json

@@ -4,7 +4,7 @@
             "welcome": {
                 "title": "Witaj w",
                 "subtitle": "Czas na nową przygodę...",
-                "legalAction": "Potwierdź, że przeczytałeś i akceptujesz:",
+                "legalAction": "Potwierdź, że przeczytałeś i akceptujesz",
                 "button": "Zaczynamy"
             },
             "importThirdPartyProfiles": {
@@ -26,7 +26,7 @@
                         "failedProfileMigration": "Nie można dokonać migracji profilu"
                     },
                     "errors": {
-                        "appIsOpen": "Portfel z którego próbujesz zaimportować jest uruchomiony. Zamknij portfel i spróbuj ponownie.",
+                        "appIsOpen": "Portfel, z którego próbujesz zaimportować, jest uruchomiony. Zamknij portfel i spróbuj ponownie.",
                         "unknown": "Wystąpił nieznany błąd podczas próby importowania profili"
                     },
                     "notifications": {
@@ -1023,7 +1023,7 @@
             "selectAmount": "Wyślij {tokenName}",
             "selectRecipient": "Wyślij {assetName} do",
             "transactionSummary": "Transakcja do {recipient}",
-            "ircAssetsToL2Hint": "You are about to send an IRC asset to an EVM network. Most EVM based wallets don't support displaying IRC assets correctly.",
+            "ircAssetsToL2Hint": "Zamierzasz wysłać asset IRC do sieci EVM. Większość portfeli opartych na EVM nie obsługuje prawidłowego wyświetlania assetów IRC.",
             "surplusIncluded": "Ta transakcja zawiera nadwyżkę środków. Proszę sprawdzić, czy na pewno jest to kwota, którą chcesz wysłać."
         },
         "walletFinder": {
@@ -1094,10 +1094,10 @@
             "success": "Podpisana transakcja"
         },
         "tokenApproval": {
-            "title": "Approve {dappName} to access {assetName}",
-            "hint": "{address} is requesting approval to spend {assetName}",
-            "action": "Approve",
-            "success": "Successfully approved"
+            "title": "Zezwól {dappName} na dostęp do {assetName}",
+            "hint": "{address} prosi o zgodę na wydanie środków {assetName}",
+            "action": "Zezwalam",
+            "success": "Zatwierdzono pomyślnie"
         },
         "sendTransaction": {
             "title": "Wyślij transakcję",
@@ -1106,9 +1106,9 @@
         },
         "smartContractCall": {
             "title": "Interakcja smart kontraktu z {contractAddress}",
-            "unableToVerify": "Bloom is unable to parse the smart contract data, only proceed with apps you trust.",
-            "partiallyVerified": "Bloom has partially parsed the smart contract data, proceed with apps you trust.",
-            "viewSmartContract": "View Contract",
+            "unableToVerify": "Bloom nie jest w stanie przeanalizować danych smart kontraktu. Korzystaj tylko z zaufanych aplikacji.",
+            "partiallyVerified": "Bloom częściowo przeanalizował dane smart kontraktu. Korzystaj tylko z zaufanych aplikacji.",
+            "viewSmartContract": "Wyświetl kontrakt",
             "action": "Potwierdź",
             "success": "Interakcja smart kontraktu z {recipient}"
         },
@@ -1297,7 +1297,7 @@
         "manageVotingPower": {
             "title": "Zarządzaj siłą głosu",
             "body": "Zdefiniuj swoją siłę głosu, aby głosować na propozycje.",
-            "hint": "Wszystkie środki, które przydzielasz do głosowania, zostają zablokowane. Aby móc ich ponownie użyć, musisz zmniejszyć swoją siłę głosu. Ma to wpływ na wszystkie propozycje na które aktualnie głosujesz.",
+            "hint": "Wszystkie środki, które przydzielasz do głosowania, zostają zablokowane. Aby móc ich ponownie użyć, musisz zmniejszyć swoją siłę głosu. Ma to wpływ na wszystkie propozycje, na które aktualnie głosujesz.",
             "amountZero": "Pamiętaj, że ustawienie Twojej siły głosu na zero, zatrzyma Twoje wszystkie Twoje aktywne głosy we wszystkich propozycjach."
         },
         "addProposal": {
@@ -1641,7 +1641,7 @@
         "mintNativeTokenDescription": "Mintuj natywny token zgodny ze standardem IRC30",
         "mintNftDescription": "Mintuj NFT zgodnie z normą IRC27",
         "faucetRequestDescription": "Zażądaj tokenów z faucetu sieci {network}",
-        "refreshTokenMetadataHint": "Spowoduje to zresetowanie wszystkich metadanych Twoich tokenów (wraz z ich statusem weryfikacji) oraz odkrycie wszelkich ukrytych aktywów.",
+        "refreshTokenMetadataHint": "Spowoduje to zresetowanie wszystkich metadanych Twoich tokenów (wraz z ich statusem weryfikacji) oraz przywrócenie wszystkich ukrytych aktywów.",
         "excluded": "Wykluczone",
         "developerTools": "Narzędzia deweloperskie",
         "testDeepLinkDescription": "Symuluj deep link wysyłany do Bloom",
@@ -1735,7 +1735,7 @@
         "slow": "Powoli",
         "average": "Średnio",
         "fast": "Szybko",
-        "spender": "Spender",
+        "spender": "Wydający",
         "status": "Status"
     },
     "filters": {

packages/shared/src/locales/tr.json

@@ -1023,7 +1023,7 @@
             "selectAmount": "Gönder {tokenName}",
             "selectRecipient": "{assetName}'i şuraya gönder",
             "transactionSummary": "Transaction to {recipient}",
-            "ircAssetsToL2Hint": "You are about to send an IRC asset to an EVM network. Most EVM based wallets don't support displaying IRC assets correctly.",
+            "ircAssetsToL2Hint": "Bir IRC varlığını bir EVM ağına göndermek üzeresiniz. Çoğu EVM tabanlı cüzdan, IRC varlıklarının doğru şekilde görüntülenmesini desteklemez.",
             "surplusIncluded": "Bu işlem fazla tutar içermektedir. Lütfen göndermek istediğiniz tutarın bu olup olmadığını bir kez daha kontrol edin."
         },
         "walletFinder": {
@@ -1094,10 +1094,10 @@
             "success": "İmzalı işlem"
         },
         "tokenApproval": {
-            "title": "Approve {dappName} to access {assetName}",
-            "hint": "{address} is requesting approval to spend {assetName}",
-            "action": "Approve",
-            "success": "Successfully approved"
+            "title": "{assetName} erişimi için {dappName} uygulamasını onaylayın",
+            "hint": "{address}, {assetName} tutarında harcama yapmak için onay istiyor",
+            "action": "Onayla",
+            "success": "Başarıyla onaylandı"
         },
         "sendTransaction": {
             "title": "İşlemi gönder",
@@ -1106,9 +1106,9 @@
         },
         "smartContractCall": {
             "title": "{contractAddress} adresine akıllı sözleşme çağrısı",
-            "unableToVerify": "Bloom is unable to parse the smart contract data, only proceed with apps you trust.",
-            "partiallyVerified": "Bloom has partially parsed the smart contract data, proceed with apps you trust.",
-            "viewSmartContract": "View Contract",
+            "unableToVerify": "Bloom akıllı sözleşme verilerini ayrıştıramıyor, yalnızca güvendiğiniz uygulamalarla devam ediyor.",
+            "partiallyVerified": "Bloom akıllı sözleşme verilerini kısmen ayrıştırdı, güvendiğiniz uygulamalarla devam edin.",
+            "viewSmartContract": "Sözleşmeyi Görüntüle",
             "action": "Onayla",
             "success": "{recipient} adlı kişiye akıllı sözleşme çağrısı"
         },
@@ -1735,8 +1735,8 @@
         "slow": "Yavaş",
         "average": "Ortalama",
         "fast": "Hızlı",
-        "spender": "Spender",
-        "status": "Status"
+        "spender": "Harcayan",
+        "status": "Durum"
     },
     "filters": {
         "title": "Filtreler",