Merge branch 'develop' into chore/disable-hmr-logs

bloomwalletio · May 29, 2024 · 7aac3c2 · 7aac3c2
2 parents 3f7a8bc + 9c2fd2f
commit 7aac3c2
Show file tree

Hide file tree

Showing 12 changed files with 134 additions and 43 deletions.
diff --git a/packages/desktop/views/dashboard/campaigns/components/CampaignHeader.svelte b/packages/desktop/views/dashboard/campaigns/components/CampaignHeader.svelte
@@ -4,13 +4,14 @@
     import { ICampaign } from '@contexts/campaigns'
     import { openUrlInBrowser } from '@core/app'
     import { TIDE_BASE_URL, TideWebsiteEndpoint } from '@core/tide'
-    import Pane from '@ui/atoms/Pane.svelte'
+    import { Pane, NetworkAvatar } from '@ui'
     import { MediaPlaceholder } from '@ui/molecules'
     import CampaignParticipantsPill from './CampaignParticipantsPill.svelte'
     import CampaignRewardsPill from './CampaignRewardsPill.svelte'
     import CampaignStatusPill from './CampaignStatusPill.svelte'
     import CampaignTimestampPill from './CampaignTimestampPill.svelte'
     import sanitizeHtml from 'sanitize-html'
+    import { NetworkNamespace } from '@core/network'
     import { localize } from '@core/i18n'
     import CampaignUsersPill from './CampaignUsersPill.svelte'
 
@@ -109,7 +110,8 @@
                 class="whitespace-pre-line overflow-hidden text-ellipsis line-clamp-3">{description}</Text
             >
             <div class="w-full flex flex-row justify-between gap-4">
-                <div class="flex flex-row gap-2">
+                <div class="flex flex-row gap-2 items-center">
+                    <NetworkAvatar size="xs" networkId={`${NetworkNamespace.Evm}:${campaign.chainId}`} showTooltip />
                     <CampaignStatusPill {campaign} />
                     <CampaignTimestampPill {campaign} />
                     <CampaignUsersPill {campaign} />

diff --git a/packages/desktop/views/dashboard/campaigns/components/CampaignsGalleryItem.svelte b/packages/desktop/views/dashboard/campaigns/components/CampaignsGalleryItem.svelte
@@ -2,8 +2,9 @@
     import { Text } from '@bloomwalletio/ui'
     import { ICampaign, featuredCampaigns } from '@contexts/campaigns'
     import { setSelectedCampaign } from '@contexts/campaigns/stores'
-    import { MediaPlaceholder } from '@ui'
+    import { MediaPlaceholder, NetworkAvatar } from '@ui'
     import { CampaignsRoute, campaignsRouter } from '../'
+    import { NetworkNamespace } from '@core/network'
     import CampaignParticipantsPill from './CampaignParticipantsPill.svelte'
     import CampaignStatusPill from './CampaignStatusPill.svelte'
     import CampaignTimestampPill from './CampaignTimestampPill.svelte'
@@ -45,7 +46,8 @@
     </div>
     <div class="w-full flex flex-col items-start p-3 gap-2 overflow-hidden">
         <Text type="body2" truncate>{campaign.title}</Text>
-        <div class="flex flex-row gap-2">
+        <div class="flex flex-row gap-2 items-center">
+            <NetworkAvatar size="xs" networkId={`${NetworkNamespace.Evm}:${campaign.chainId}`} showTooltip />
             <CampaignStatusPill {campaign} />
             <CampaignTimestampPill {campaign} />
             <CampaignParticipantsPill {campaign} />

diff --git a/packages/desktop/views/dashboard/components/DashboardSidebar.svelte b/packages/desktop/views/dashboard/components/DashboardSidebar.svelte
@@ -58,10 +58,7 @@
                   },
               ]
             : []),
-        ...(features?.campaigns?.enabled &&
-        profileFeatures?.campaigns &&
-        ($activeProfile?.network?.id === SupportedStardustNetworkId.Shimmer ||
-            $activeProfile?.network?.id === SupportedStardustNetworkId.Testnet)
+        ...(features?.campaigns?.enabled && profileFeatures?.campaigns
             ? [
                   {
                       icon: IconName.Trophy,

diff --git a/packages/shared/src/locales/de.json b/packages/shared/src/locales/de.json
@@ -1023,6 +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.",
             "surplusIncluded": "Diese Transaktion enthält eine überschüssige Betrag. Bitte überprüfe, ob dies der Betrag ist, den du senden möchtest."
         },
         "walletFinder": {
@@ -1092,15 +1093,22 @@
             "action": "Signieren",
             "success": "Signierte Transaktion"
         },
+        "tokenApproval": {
+            "title": "Approve {dappName} to access {assetName}",
+            "hint": "{address} is requesting approval to spend {assetName}",
+            "action": "Approve",
+            "success": "Successfully approved"
+        },
         "sendTransaction": {
             "title": "Transaktion senden",
             "action": "Senden",
             "success": "{assetName} an {recipient} gesendet"
         },
         "smartContractCall": {
             "title": "Aufruf des Smart Contracts an {contractAddress}",
-            "unableToVerify": "Bloom kann den Smart Contract nicht verifizieren. Fahre nur mit Apps fort, denen du vertraust.",
-            "viewSmartContract": "Smart Contract anzeigen",
+            "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",
             "action": "Bestätigen",
             "success": "Aufruf des Smart Contracts an {recipient}"
         },
@@ -1724,9 +1732,11 @@
         "question": "Frage",
         "id": "ID",
         "location": "Standort",
-        "slow": "Slow",
-        "average": "Average",
-        "fast": "Fast"
+        "slow": "Langsam",
+        "average": "Durchschnitt",
+        "fast": "Schnell",
+        "spender": "Spender",
+        "status": "Status"
     },
     "filters": {
         "title": "Filter",

diff --git a/packages/shared/src/locales/es-ES.json b/packages/shared/src/locales/es-ES.json
@@ -1023,6 +1023,7 @@
             "selectAmount": "Enviar {tokenName}",
             "selectRecipient": "Enviar {assetName} a",
             "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.",
             "surplusIncluded": "Esta transacción contiene una cantidad excedente.  Verifique que esta sea la cantidad que desea enviar."
         },
         "walletFinder": {
@@ -1092,15 +1093,22 @@
             "action": "Sign",
             "success": "Signed transaction"
         },
+        "tokenApproval": {
+            "title": "Approve {dappName} to access {assetName}",
+            "hint": "{address} is requesting approval to spend {assetName}",
+            "action": "Approve",
+            "success": "Successfully approved"
+        },
         "sendTransaction": {
             "title": "Send transaction",
             "action": "Send",
             "success": "Sent {assetName} to {recipient}"
         },
         "smartContractCall": {
             "title": "Smart contract call to {contractAddress}",
-            "unableToVerify": "Bloom is unable to verify the smart contract call. Only proceed with apps you trust.",
-            "viewSmartContract": "View Smart Contract",
+            "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",
             "action": "Confirm",
             "success": "Smart contract call to {recipient}"
         },
@@ -1726,7 +1734,9 @@
         "location": "Location",
         "slow": "Slow",
         "average": "Average",
-        "fast": "Fast"
+        "fast": "Fast",
+        "spender": "Spender",
+        "status": "Status"
     },
     "filters": {
         "title": "Filtros",

diff --git a/packages/shared/src/locales/fr.json b/packages/shared/src/locales/fr.json
@@ -1023,6 +1023,7 @@
             "selectAmount": "Envoyer {tokenName}",
             "selectRecipient": "Envoyer {assetName} à",
             "transactionSummary": "Transaction vers {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.",
             "surplusIncluded": "This transaction contains a surplus amount. Please double check this is the amount you want to send."
         },
         "walletFinder": {
@@ -1092,15 +1093,22 @@
             "action": "Sign",
             "success": "Signed transaction"
         },
+        "tokenApproval": {
+            "title": "Approve {dappName} to access {assetName}",
+            "hint": "{address} is requesting approval to spend {assetName}",
+            "action": "Approve",
+            "success": "Successfully approved"
+        },
         "sendTransaction": {
             "title": "Send transaction",
             "action": "Send",
             "success": "Sent {assetName} to {recipient}"
         },
         "smartContractCall": {
             "title": "Smart contract call to {contractAddress}",
-            "unableToVerify": "Bloom is unable to verify the smart contract call. Only proceed with apps you trust.",
-            "viewSmartContract": "View Smart Contract",
+            "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",
             "action": "Confirm",
             "success": "Smart contract call to {recipient}"
         },
@@ -1726,7 +1734,9 @@
         "location": "Location",
         "slow": "Slow",
         "average": "Average",
-        "fast": "Fast"
+        "fast": "Fast",
+        "spender": "Spender",
+        "status": "Status"
     },
     "filters": {
         "title": "Filters",

diff --git a/packages/shared/src/locales/it.json b/packages/shared/src/locales/it.json
@@ -1023,6 +1023,7 @@
             "selectAmount": "Send {tokenName}",
             "selectRecipient": "Invia {assetName} a",
             "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.",
             "surplusIncluded": "Questa transazione contiene un importo in eccesso. Si prega di controllare due volte questo è l'importo che si desidera inviare."
         },
         "walletFinder": {
@@ -1092,15 +1093,22 @@
             "action": "Sign",
             "success": "Signed transaction"
         },
+        "tokenApproval": {
+            "title": "Approve {dappName} to access {assetName}",
+            "hint": "{address} is requesting approval to spend {assetName}",
+            "action": "Approve",
+            "success": "Successfully approved"
+        },
         "sendTransaction": {
             "title": "Send transaction",
             "action": "Send",
             "success": "Sent {assetName} to {recipient}"
         },
         "smartContractCall": {
             "title": "Smart contract call to {contractAddress}",
-            "unableToVerify": "Bloom is unable to verify the smart contract call. Only proceed with apps you trust.",
-            "viewSmartContract": "View Smart Contract",
+            "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",
             "action": "Confirm",
             "success": "Smart contract call to {recipient}"
         },
@@ -1726,7 +1734,9 @@
         "location": "Location",
         "slow": "Slow",
         "average": "Average",
-        "fast": "Fast"
+        "fast": "Fast",
+        "spender": "Spender",
+        "status": "Status"
     },
     "filters": {
         "title": "Filtri",

diff --git a/packages/shared/src/locales/nl.json b/packages/shared/src/locales/nl.json
@@ -1023,6 +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.",
             "surplusIncluded": "Deze transactie bevat een overschot. Controleer of dit het bedrag is dat u wilt versturen."
         },
         "walletFinder": {
@@ -1092,15 +1093,22 @@
             "action": "Ondertekenen",
             "success": "Ondertekende transactie"
         },
+        "tokenApproval": {
+            "title": "Approve {dappName} to access {assetName}",
+            "hint": "{address} is requesting approval to spend {assetName}",
+            "action": "Approve",
+            "success": "Successfully approved"
+        },
         "sendTransaction": {
             "title": "Transactie verzenden",
             "action": "Verzend",
             "success": "{assetName} verzonden naar {recipient}"
         },
         "smartContractCall": {
             "title": "Smart Contract-oproep naar {contractAddress}",
-            "unableToVerify": "Bloom is niet in staat om de smart Contract-oproep te verifiëren. Ga alleen verder met apps die je vertrouwt.",
-            "viewSmartContract": "Bekijk Smart Contract",
+            "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",
             "action": "Bevestig",
             "success": "Smart contract oproep naar {recipient}"
         },
@@ -1724,9 +1732,11 @@
         "question": "Vraag",
         "id": "ID",
         "location": "Locatie",
-        "slow": "Slow",
-        "average": "Average",
-        "fast": "Fast"
+        "slow": "Langzaam",
+        "average": "Gemiddeld",
+        "fast": "Snel",
+        "spender": "Spender",
+        "status": "Status"
     },
     "filters": {
         "title": "Filters",

diff --git a/packages/shared/src/locales/pl.json b/packages/shared/src/locales/pl.json
@@ -1023,6 +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.",
             "surplusIncluded": "Ta transakcja zawiera nadwyżkę środków. Proszę sprawdzić, czy na pewno jest to kwota, którą chcesz wysłać."
         },
         "walletFinder": {
@@ -1092,15 +1093,22 @@
             "action": "Podpisz",
             "success": "Podpisana transakcja"
         },
+        "tokenApproval": {
+            "title": "Approve {dappName} to access {assetName}",
+            "hint": "{address} is requesting approval to spend {assetName}",
+            "action": "Approve",
+            "success": "Successfully approved"
+        },
         "sendTransaction": {
             "title": "Wyślij transakcję",
             "action": "Wyślij",
             "success": "Wysłano {assetName} do {recipient}"
         },
         "smartContractCall": {
             "title": "Interakcja smart kontraktu z {contractAddress}",
-            "unableToVerify": "Bloom nie może zweryfikować interakcji z smart kontraktem. Kontynuuj tylko z aplikacjami, którym ufasz.",
-            "viewSmartContract": "Zobacz Smart Kontrakt",
+            "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",
             "action": "Potwierdź",
             "success": "Interakcja smart kontraktu z {recipient}"
         },
@@ -1724,9 +1732,11 @@
         "question": "Pytanie",
         "id": "ID",
         "location": "Lokalizacja",
-        "slow": "Slow",
-        "average": "Average",
-        "fast": "Fast"
+        "slow": "Powoli",
+        "average": "Średnio",
+        "fast": "Szybko",
+        "spender": "Spender",
+        "status": "Status"
     },
     "filters": {
         "title": "Filtry",

diff --git a/packages/shared/src/locales/pt-BR.json b/packages/shared/src/locales/pt-BR.json
@@ -1023,6 +1023,7 @@
             "selectAmount": "Send {tokenName}",
             "selectRecipient": "Send {assetName} to",
             "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.",
             "surplusIncluded": "Esta transação contém um excesso de valor. Por favor, verifique novamente se este é o valor que deseja enviar."
         },
         "walletFinder": {
@@ -1092,15 +1093,22 @@
             "action": "Assinar",
             "success": "Signed transaction"
         },
+        "tokenApproval": {
+            "title": "Approve {dappName} to access {assetName}",
+            "hint": "{address} is requesting approval to spend {assetName}",
+            "action": "Approve",
+            "success": "Successfully approved"
+        },
         "sendTransaction": {
             "title": "Enviar transação",
             "action": "Enviar",
             "success": "Sent {assetName} to {recipient}"
         },
         "smartContractCall": {
             "title": "Smart contract call to {contractAddress}",
-            "unableToVerify": "Bloom is unable to verify the smart contract call. Only proceed with apps you trust.",
-            "viewSmartContract": "View Smart Contract",
+            "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",
             "action": "Confirm",
             "success": "Smart contract call to {recipient}"
         },
@@ -1726,7 +1734,9 @@
         "location": "Location",
         "slow": "Slow",
         "average": "Average",
-        "fast": "Fast"
+        "fast": "Fast",
+        "spender": "Spender",
+        "status": "Status"
     },
     "filters": {
         "title": "Filters",