Merge pull request #772 from alephium/2.1.3

2.1.3 - part 1

locales/bg-BG/translation.json

@@ -447,5 +447,7 @@
   "Address keys export": "Address keys export",
   "Public key copied.": "Public key copied.",
   "Could not copy public key.": "Could not copy public key.",
-  "Copy the keys of an address.": "Copy the keys of an address."
+  "Copy the keys of an address.": "Copy the keys of an address.",
+  "Transaction hash": "Transaction hash",
+  "Copy hash": "Copy hash"
 }

locales/de-DE/translation.json

@@ -447,5 +447,7 @@
   "Address keys export": "Address keys export",
   "Public key copied.": "Public key copied.",
   "Could not copy public key.": "Could not copy public key.",
-  "Copy the keys of an address.": "Copy the keys of an address."
+  "Copy the keys of an address.": "Copy the keys of an address.",
+  "Transaction hash": "Transaction hash",
+  "Copy hash": "Copy hash"
 }

locales/en-US/translation.json

@@ -447,5 +447,7 @@
   "Address keys export": "Address keys export",
   "Public key copied.": "Public key copied.",
   "Could not copy public key.": "Could not copy public key.",
-  "Copy the keys of an address.": "Copy the keys of an address."
+  "Copy the keys of an address.": "Copy the keys of an address.",
+  "Transaction hash": "Transaction hash",
+  "Copy hash": "Copy hash"
 }

locales/es-ES/translation.json

@@ -447,5 +447,7 @@
   "Address keys export": "Address keys export",
   "Public key copied.": "Public key copied.",
   "Could not copy public key.": "Could not copy public key.",
-  "Copy the keys of an address.": "Copy the keys of an address."
+  "Copy the keys of an address.": "Copy the keys of an address.",
+  "Transaction hash": "Transaction hash",
+  "Copy hash": "Copy hash"
 }

locales/fr-FR/translation.json

@@ -447,5 +447,7 @@
   "Address keys export": "Export de clés",
   "Public key copied.": "Clé publique copiée.",
   "Could not copy public key.": "Impossible de copier la clé privée.",
-  "Copy the keys of an address.": "Copier les clés d'une adresse."
+  "Copy the keys of an address.": "Copier les clés d'une adresse.",
+  "Transaction hash": "Hash de la transaction",
+  "Copy hash": "Copier le hash"
 }

locales/id-ID/translation.json

@@ -447,5 +447,7 @@
   "Address keys export": "Ekspor kunci alamat",
   "Public key copied.": "Kunci publik disalin.",
   "Could not copy public key.": "Tidak dapat menyalin kunci publik.",
-  "Copy the keys of an address.": "Salin kunci alamat."
+  "Copy the keys of an address.": "Salin kunci alamat.",
+  "Transaction hash": "Transaction hash",
+  "Copy hash": "Copy hash"
 }

locales/pt-PT/translation.json

@@ -447,5 +447,7 @@
   "Address keys export": "Address keys export",
   "Public key copied.": "Public key copied.",
   "Could not copy public key.": "Could not copy public key.",
-  "Copy the keys of an address.": "Copy the keys of an address."
+  "Copy the keys of an address.": "Copy the keys of an address.",
+  "Transaction hash": "Transaction hash",
+  "Copy hash": "Copy hash"
 }

locales/ru-RU/translation.json

@@ -447,5 +447,7 @@
   "Address keys export": "Address keys export",
   "Public key copied.": "Public key copied.",
   "Could not copy public key.": "Could not copy public key.",
-  "Copy the keys of an address.": "Copy the keys of an address."
+  "Copy the keys of an address.": "Copy the keys of an address.",
+  "Transaction hash": "Transaction hash",
+  "Copy hash": "Copy hash"
 }

locales/tr-TR/translation.json

@@ -447,5 +447,7 @@
   "Address keys export": "Address keys export",
   "Public key copied.": "Public key copied.",
   "Could not copy public key.": "Could not copy public key.",
-  "Copy the keys of an address.": "Copy the keys of an address."
+  "Copy the keys of an address.": "Copy the keys of an address.",
+  "Transaction hash": "Transaction hash",
+  "Copy hash": "Copy hash"
 }

locales/vi-VN/translation.json

@@ -447,5 +447,7 @@
   "Address keys export": "Address keys export",
   "Public key copied.": "Public key copied.",
   "Could not copy public key.": "Could not copy public key.",
-  "Copy the keys of an address.": "Copy the keys of an address."
+  "Copy the keys of an address.": "Copy the keys of an address.",
+  "Transaction hash": "Transaction hash",
+  "Copy hash": "Copy hash"
 }

package.json

@@ -103,7 +103,7 @@
     "react-redux": "^8.0.5",
     "react-router-dom": "^6.3.0",
     "react-scrollbars-custom": "^4.1.1",
-    "react-tooltip": "^5.4.0",
+    "react-tooltip": "^5.19.0",
     "redux": "^4.2.0",
     "semver-compare": "^1.0.0",
     "styled-components": "^5.3.1",

src/components/PageComponents/PanelTitle.tsx

@@ -26,6 +26,7 @@ interface PanelTitleProps {
   size?: 'small' | 'big'
   useLayoutId?: boolean
   isSticky?: boolean
+  centerText?: boolean
 }
 
 const PanelTitle: FC<PanelTitleProps> = ({
@@ -34,14 +35,15 @@ const PanelTitle: FC<PanelTitleProps> = ({
   onBackButtonClick,
   size,
   useLayoutId = true,
-  isSticky = false
+  isSticky = false,
+  centerText = false
 }) => {
   const { scrollY } = useScroll()
 
   const titleScale = useTransform(scrollY, [0, 50], [1, 0.6])
 
   return (
-    <TitleContainer layoutId={useLayoutId ? 'sectionTitle' : ''} isSticky={isSticky}>
+    <TitleContainer layoutId={useLayoutId ? 'sectionTitle' : ''} isSticky={isSticky} centerText={centerText}>
       {onBackButtonClick && (
         <BackArrow
           onClick={onBackButtonClick}
@@ -60,11 +62,13 @@ const PanelTitle: FC<PanelTitleProps> = ({
 
 export default PanelTitle
 
-export const TitleContainer = styled(motion.div)<{ isSticky: boolean }>`
+export const TitleContainer = styled(motion.div)<Pick<PanelTitleProps, 'isSticky' | 'centerText'>>`
   display: flex;
   align-items: center;
   top: 0;
 
+  ${({ centerText }) => centerText && 'text-align: center'};
+
   ${({ isSticky }) =>
     isSticky &&
     css`

src/modals/TransactionDetailsModal.tsx

@@ -142,6 +142,11 @@ const TransactionDetailsModal = ({ transaction, onClose }: TransactionDetailsMod
       <Details role="table">
         {direction !== 'swap' && (
           <>
+            <DetailsRow label={t('Transaction hash')}>
+              <TransactionHash onClick={handleShowTxInExplorer}>
+                <HashEllipsed hash={transaction.hash} tooltipText={t('Copy hash')} />
+              </TransactionHash>
+            </DetailsRow>
             <DetailsRow label={t('From')}>
               {direction === 'out' ? (
                 <AddressList>
@@ -398,3 +403,7 @@ const NFTThumbnails = styled.div`
   flex-wrap: wrap;
   justify-content: flex-end;
 `
+
+const TransactionHash = styled(ActionLink)`
+  max-width: 125px;
+`

src/pages/HomePage/UnlockPanel.tsx

@@ -77,7 +77,7 @@ const UnlockPanel = ({ onNewWalletLinkClick }: UnlockPanelProps) => {
 
   return (
     <>
-      <PanelTitle useLayoutId={false} size="big">
+      <PanelTitle useLayoutId={false} size="big" centerText>
         {dAppName ? t('Connect to dApp') : t('Welcome back.')}
       </PanelTitle>
       <ParagraphStyled centered secondary>

src/pages/HomePage/index.tsx

@@ -39,7 +39,7 @@ const HomePage = () => {
       <FloatingPanel verticalAlign="center" horizontalAlign="center" transparentBg borderless>
         {showNewWalletActions ? (
           <>
-            <PanelTitle useLayoutId={false} size="big">
+            <PanelTitle useLayoutId={false} size="big" centerText>
               {t('New wallet')}
             </PanelTitle>
             <NewWalletActions onExistingWalletLinkClick={() => setShowNewWalletActions(false)} />
@@ -48,7 +48,7 @@ const HomePage = () => {
           <UnlockPanel onNewWalletLinkClick={() => setShowNewWalletActions(true)} />
         ) : (
           <>
-            <PanelTitle useLayoutId={false} size="big">
+            <PanelTitle useLayoutId={false} size="big" centerText>
               {t('Welcome.')}
             </PanelTitle>
             <NewWalletActions />

src/storage/settings/settingsPersistentStorage.ts

@@ -37,9 +37,9 @@ const networkBasePresets: Record<NetworkPreset, NetworkSettings> = {
   },
   localhost: {
     networkId: 4,
-    nodeHost: 'http://localhost:12973',
+    nodeHost: 'http://localhost:22973',
     explorerApiHost: 'http://localhost:9090',
-    explorerUrl: 'http://localhost:3000'
+    explorerUrl: 'http://localhost:23000'
   }
 }