Page MenuHomePhabricator
Files F13711160

D17310.id51482.diff
No OneTemporary
Actions

D17310.id51482.diff
View Options

diff --git a/cashtab/package-lock.json b/cashtab/package-lock.json
--- a/cashtab/package-lock.json
+++ b/cashtab/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "cashtab",
- "version": "3.2.9",
+ "version": "3.2.10",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "cashtab",
- "version": "3.2.9",
+ "version": "3.2.10",
"dependencies": {
"@bitgo/utxo-lib": "^11.0.0",
"@zxing/browser": "^0.1.4",
diff --git a/cashtab/package.json b/cashtab/package.json
--- a/cashtab/package.json
+++ b/cashtab/package.json
@@ -1,6 +1,6 @@
{
"name": "cashtab",
- "version": "3.2.9",
+ "version": "3.2.10",
"private": true,
"scripts": {
"start": "node scripts/start.js",
diff --git a/cashtab/src/components/Home/TxHistory.js b/cashtab/src/components/Home/TxHistory.js
deleted file mode 100644
--- a/cashtab/src/components/Home/TxHistory.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) 2024 The Bitcoin developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import Tx from 'components/Home/Tx';
-
-const TxHistory = ({
- txs,
- hashes,
- fiatPrice,
- fiatCurrency,
- cashtabState,
- updateCashtabState,
- chaintipBlockheight,
- userLocale = 'en-US',
-}) => {
- return (
- <>
- {txs.map(tx => (
- <Tx
- key={tx.txid}
- hashes={hashes}
- tx={tx}
- fiatPrice={fiatPrice}
- fiatCurrency={fiatCurrency}
- cashtabState={cashtabState}
- updateCashtabState={updateCashtabState}
- chaintipBlockheight={chaintipBlockheight}
- userLocale={userLocale}
- />
- ))}
- </>
- );
-};
-
-TxHistory.propTypes = {
- txs: PropTypes.array,
- hashes: PropTypes.arrayOf(PropTypes.string),
- fiatPrice: PropTypes.number,
- fiatCurrency: PropTypes.string,
- cashtabState: PropTypes.shape({
- contactList: PropTypes.arrayOf(
- PropTypes.shape({
- address: PropTypes.string.isRequired,
- name: PropTypes.string.isRequired,
- }),
- ),
- settings: PropTypes.shape({
- fiatCurrency: PropTypes.string.isRequired,
- sendModal: PropTypes.bool.isRequired,
- autoCameraOn: PropTypes.bool.isRequired,
- hideMessagesFromUnknownSenders: PropTypes.bool.isRequired,
- balanceVisible: PropTypes.bool.isRequired,
- minFeeSends: PropTypes.bool.isRequired,
- }),
- cashtabCache: PropTypes.shape({
- tokens: PropTypes.object.isRequired,
- }),
- }),
- updateCashtabState: PropTypes.func,
- userLocale: PropTypes.string,
- chaintipBlockheight: PropTypes.number,
-};
-
-export default TxHistory;
diff --git a/cashtab/src/components/Home/TxHistory.tsx b/cashtab/src/components/Home/TxHistory.tsx
new file mode 100644
--- /dev/null
+++ b/cashtab/src/components/Home/TxHistory.tsx
@@ -0,0 +1,50 @@
+// Copyright (c) 2024 The Bitcoin developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+import React from 'react';
+import Tx from 'components/Home/Tx';
+import { CashtabTx } from 'wallet';
+import CashtabState from 'config/CashtabState';
+
+interface TxHistoryProps {
+ txs: CashtabTx[];
+ hashes: string[];
+ fiatPrice: number | null;
+ fiatCurrency: string;
+ cashtabState: CashtabState;
+ updateCashtabState: () => void;
+ chaintipBlockheight: number;
+ userLocale: string;
+}
+
+const TxHistory: React.FC<TxHistoryProps> = ({
+ txs,
+ hashes,
+ fiatPrice,
+ fiatCurrency,
+ cashtabState,
+ updateCashtabState,
+ chaintipBlockheight,
+ userLocale = 'en-US',
+}) => {
+ return (
+ <>
+ {txs.map(tx => (
+ <Tx
+ key={tx.txid}
+ hashes={hashes}
+ tx={tx}
+ fiatPrice={fiatPrice}
+ fiatCurrency={fiatCurrency}
+ cashtabState={cashtabState}
+ updateCashtabState={updateCashtabState}
+ chaintipBlockheight={chaintipBlockheight}
+ userLocale={userLocale}
+ />
+ ))}
+ </>
+ );
+};
+
+export default TxHistory;

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 26, 10:37 (3 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5573305
Default Alt Text
D17310.id51482.diff (4 KB)

Event Timeline