Merge pull request #308 from input-output-hk/release/1.0.0-rc.3

Release/1.0.0 rc.3

README.md

@@ -23,10 +23,10 @@ All visual components should be developed in Storybook first.
 
 ### Continuous Deployment
 The `develop` and PR branches are deployed continuously for the purpose of testing and development:
-#### [Mainnet](https://cardano-explorer-mainnet.netlify.app)
-[![Netlify Status](https://api.netlify.com/api/v1/badges/09492acb-61fd-4745-8b0e-60c8886f60d1/deploy-status)](https://app.netlify.com/sites/cardano-explorer-mainnet/deploys)
-#### [Testnet](https://cardano-explorer-testnet.netlify.app)
-[![Netlify Status](https://api.netlify.com/api/v1/badges/16628b5d-b1f2-429b-a707-bbdec0564fe9/deploy-status)](https://app.netlify.com/sites/cardano-explorer-testnet/deploys)
+#### Mainnet
+[![Netlify Status](https://api.netlify.com/api/v1/badges/09492acb-61fd-4745-8b0e-60c8886f60d1/deploy-status)](https://cardano-explorer-mainnet.netlify.app)
+#### Testnet
+[![Netlify Status](https://api.netlify.com/api/v1/badges/16628b5d-b1f2-429b-a707-bbdec0564fe9/deploy-status)](https://cardano-explorer-testnet.netlify.app)
 
 ## Deployment
 A simple [Node.js program](deploy/index.js) is available for deploying to an AWS S3 bucket.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cardano-explorer-app",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0-rc.3",
   "description": "Cardano Explorer App",
   "author": "Daedalus Team @ Input Output HK",
   "license": "Apache-2.0",
@@ -34,7 +34,7 @@
   "dependencies": {
     "@types/react-addons-css-transition-group": "15.0.5",
     "browser-update": "3.3.9",
-    "cardano-graphql-ts": "1.0.0-rc.10",
+    "cardano-graphql-ts": "1.0.0-rc.12",
     "cardano-js": "0.3.0",
     "chroma-js": "2.1.0",
     "classnames": "2.2.6",

source/features/blocks/api/BlockDetails.graphql

@@ -3,13 +3,13 @@
 
 fragment BlockDetails on Block {
   ...BlockOverview
-  merkelRootHash
+  merkelRoot
   nextBlock {
-    id
+    hash
     number
   }
   previousBlock {
-    id
+    hash
     number
   }
   transactions(

source/features/blocks/api/BlockOverview.graphql

@@ -2,7 +2,7 @@ fragment BlockOverview on Block {
   createdAt
   createdBy
   epochNo,
-  id
+  hash
   number
   size
   slotWithinEpoch

source/features/blocks/api/transformers.ts

@@ -20,6 +20,7 @@ export const blockOverviewTransformer = (
     ...b,
     createdBy: formatCreatedBy(b.createdBy),
     epoch,
+    id: b.hash,
     number: b.number || '-',
     output: Currency.Util.lovelacesToAda(
       b.transactions_aggregate?.aggregate?.sum?.totalOutput || '0'
@@ -34,13 +35,13 @@ export const blockDetailsTransformer = (
   b: BlockDetailsFragment
 ): IBlockDetailed => ({
   ...blockOverviewTransformer(b),
-  merkleRoot: b.merkelRootHash || '',
+  merkleRoot: b.merkelRoot || '',
   nextBlock: {
-    id: b.nextBlock?.id || '',
+    id: b.nextBlock?.hash || '',
     number: b.nextBlock?.number || '-',
   },
   prevBlock: {
-    id: b.previousBlock?.id || '',
+    id: b.previousBlock?.hash || '',
     number: b.previousBlock?.number || '-',
   },
   transactions: b.transactions

source/features/i18n/translations/de.json

@@ -123,6 +123,8 @@
     "notExist": "Adresse existiert nicht:",
     "notFound": "Es tut uns Leid, wir konnten keine Ergebnisse finden zu:",
     "placeholder": "Suche nach Epochen, Blöcken, Addressen und Transaktionen",
+    "suggestion_block": "Suche nach einem Block",
+    "suggestion_epoch": "Suche nach einer Epoche",
     "title": "Suche"
   },
   "stakeDistribution": {

source/features/i18n/translations/en.json

@@ -123,6 +123,8 @@
     "notExist": "Address does not exist:",
     "notFound": "Sorry, we could not find any results matching:",
     "placeholder": "Search for epochs, blocks, addresses and transactions",
+    "suggestion_block": "Search for a block",
+    "suggestion_epoch": "Search for an epoch",
     "title": "Search"
   },
   "stakeDistribution": {

source/features/i18n/translations/ja.json

@@ -123,6 +123,8 @@
     "notExist": "アドレスが見つかりません",
     "notFound": "一致する検索結果はありません",
     "placeholder": "エポック、ブロック、アドレス、トランザクションを検索する",
+    "suggestion_block": "ブロックを検索",
+    "suggestion_epoch": "エポックを検索",
     "title": "検索"
   },
   "stakeDistribution": {

source/features/search/api/searchById.graphql

@@ -6,7 +6,7 @@ query searchById(
 ) {
   blocks(
     where: {
-     id: {
+     hash: {
        _eq: $id
      }
     }
@@ -15,7 +15,7 @@ query searchById(
   }
   transactions(
     where: {
-      id: {
+      hash: {
         _eq: $id
       }
     }

source/features/search/api/searchForTransactionById.graphql

@@ -5,7 +5,7 @@ query searchForTransactionById(
 ) {
   transactions(
     where: {
-      id: {
+      hash: {
         _eq: $id
       }
     }

source/features/search/specs/helpers/exampleAddressData.ts

@@ -4,17 +4,17 @@ export const exampleAddressData = {
   transactions: [
     {
       block: {
-        id: '5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb',
+        hash: '5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb',
       },
       fee: '0',
-      id: '927edb96f3386ab91b5f5d85d84cb4253c65b1c2f65fa7df25f81fab1d62987a',
+      hash: '927edb96f3386ab91b5f5d85d84cb4253c65b1c2f65fa7df25f81fab1d62987a',
       inputs: [],
       outputs: [
         {
           address:
             'Ae2tdPwUPEZ9vtyppa1FdJzvqJZkEcXgdHxVYAzTWcPaoNycVq5rc36LC1S',
           index: 0,
-          txId:
+          txHash:
             '927edb96f3386ab91b5f5d85d84cb4253c65b1c2f65fa7df25f81fab1d62987a',
           value: '538861000000',
         },

source/features/search/ui/SearchSuggestions.tsx

@@ -1,5 +1,6 @@
 import { observer } from 'mobx-react-lite';
 import React from 'react';
+import { useI18nFeature } from '../../i18n/context';
 import styles from './Search.module.scss';
 const ArrowRight = require('../../../public/assets/images/arrow-right.svg');
 
@@ -9,20 +10,21 @@ export interface ISearchSuggestionsProps {
 }
 
 const SearchSuggestions = (props: ISearchSuggestionsProps) => {
+  const { translate } = useI18nFeature().store;
   const { value, onSearchTypeSelect } = props;
 
   return (
     <div className={styles.searchSuggestionsContainer}>
       <ul className={styles.searchSuggestionsContent}>
         <li onClick={() => onSearchTypeSelect('epoch')}>
           <div>
-            Search for an epoch <span>{value}</span>
+            {translate('search.suggestion_epoch')} <span>{value}</span>
           </div>
           <ArrowRight />
         </li>
         <li onClick={() => onSearchTypeSelect('block')}>
           <div>
-            Search for a block <span>{value}</span>
+            {translate('search.suggestion_block')} <span>{value}</span>
           </div>
           <ArrowRight />
         </li>

source/features/transactions/api/TransactionDetails.graphql

@@ -1,16 +1,16 @@
 fragment TransactionDetails on Transaction {
   block {
     epochNo
-    id,
+    hash,
     number,
     slotWithinEpoch,
   }
   fee,
-  id,
+  hash,
   includedAt,
   inputs {
     address,
-    sourceTxId
+    sourceTxHash
     sourceTxIndex
     value,
   },

source/features/transactions/api/getBlockTransactions.graphql

@@ -8,7 +8,7 @@ query getBlockTransactions(
   transactions(
     where: {
       block: {
-        id: {
+        hash: {
           _eq: $blockId
         }
       }

source/features/transactions/api/transformers.ts

@@ -7,14 +7,15 @@ export const transactionDetailsTransformer = (
 ): ITransactionDetails => ({
   block: {
     epoch: tx.block?.epochNo || '-',
-    id: tx.block?.id,
+    id: tx.block?.hash,
     number: tx.block?.number,
   },
   fee: Currency.Util.lovelacesToAda(tx.fee),
-  id: tx.id,
+  id: tx.hash,
   includedAt: new Date(tx.includedAt),
   inputs: tx.inputs.map(i => ({
     ...i,
+    sourceTxId: i.sourceTxHash,
     value: Currency.Util.lovelacesToAda(i.value),
   })),
   outputs: tx.outputs.map(i => ({

yarn.lock

@@ -5319,10 +5319,10 @@ capture-stack-trace@^1.0.0:
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
   integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
 
-[email protected].10:
-  version "1.0.0-rc.10"
-  resolved "https://registry.yarnpkg.com/cardano-graphql-ts/-/cardano-graphql-ts-1.0.0-rc.10.tgz#3488938573c2977d6681fc5f25dd8886bfcb5793"
-  integrity sha512-pDlm68qLE21ebVFjgdppxCLqLKzM2SOtZVi5ocy+zk1VXmpvk1+14m6piEi3r9t4g6V0XkEZ1YHDR20vvCpsOw==
+[email protected].12:
+  version "1.0.0-rc.12"
+  resolved "https://registry.yarnpkg.com/cardano-graphql-ts/-/cardano-graphql-ts-1.0.0-rc.12.tgz#943292f4c0b3f650d5199146d725a239e3dc0788"
+  integrity sha512-qZ5MhgssL+dz50IB/UjYHzreHnQcS3pgTHaMTtXTG0xGBYuBoJchMK6tgrP2SLNFqnb5j93mAVMQor8+sWOhKQ==
 
 [email protected]:
   version "0.3.0"
@@ -15433,9 +15433,9 @@ websocket-driver@>=0.5.1:
     websocket-extensions ">=0.1.1"
 
 websocket-extensions@>=0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
 whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
   version "1.0.5"