From 1528bb6ec71c0d1805cb8c489776a1194c51eb61 Mon Sep 17 00:00:00 2001
From: Philipp Walter <philippwalter@proton.me>
Date: Fri, 18 Aug 2023 18:33:51 +0200
Subject: [PATCH] fix(receive): add tags for incoming LN transactions

---
 __tests__/backups.ts                          |  9 ++-
 docker/docker-compose.yml                     |  2 +-
 e2e/backup.e2e.js                             |  2 +-
 e2e/lightning.e2e.js                          | 72 +++++++++++++++++
 .../bottom-sheet/ReceiveNavigation.tsx        |  7 +-
 .../Wallets/Receive/ReceiveDetails.tsx        | 18 ++++-
 src/screens/Wallets/Receive/ReceiveQR.tsx     | 32 ++++----
 src/store/actions/actions.ts                  |  3 +-
 src/store/actions/backup.ts                   |  7 +-
 src/store/actions/lightning.ts                | 39 ++++++++--
 src/store/actions/metadata.ts                 | 78 +++++++++++--------
 src/store/index.ts                            |  2 +-
 src/store/migrations/index.ts                 |  9 +++
 src/store/reducers/backup.ts                  |  3 +-
 src/store/reducers/metadata.ts                | 29 +++++--
 src/store/reducers/receive.ts                 | 15 ++--
 src/store/shapes/metadata.ts                  |  2 +-
 src/store/shapes/receive.ts                   |  1 +
 src/store/types/metadata.ts                   | 12 ++-
 src/store/types/receive.ts                    |  1 +
 src/store/types/wallet.ts                     |  2 +-
 src/utils/lightning/index.ts                  |  3 +
 22 files changed, 258 insertions(+), 90 deletions(-)

diff --git a/__tests__/backups.ts b/__tests__/backups.ts
index 60c8d4b6e..07cdb48eb 100644
--- a/__tests__/backups.ts
+++ b/__tests__/backups.ts
@@ -14,7 +14,7 @@ import {
 	addTag,
 	addMetaTxTag,
 	resetMetaStore,
-	updateMetaIncTxTags,
+	updatePendingInvoice,
 	addMetaSlashTagsUrlTag,
 } from '../src/store/actions/metadata';
 import {
@@ -107,7 +107,12 @@ describe('Remote backups', () => {
 	it('Backups and restores metadata', async () => {
 		addMetaTxTag('txid1', 'tag');
 		addTag('tag');
-		updateMetaIncTxTags('address', 'invoice', ['futuretag']);
+		updatePendingInvoice({
+			id: 'id123',
+			tags: ['futuretag'],
+			address: 'address',
+			payReq: 'lightningInvoice',
+		});
 		addMetaSlashTagsUrlTag('txid2', 'slashtag');
 
 		const backup = getMetaDataStore();
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 4a50e18d7..62e031c9f 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -104,7 +104,7 @@ services:
     command:
       - '--noseedbackup'
       - '--alias=lnd'
-      - '--externalip=lnd'
+      - '--externalip=127.0.0.1'
       - '--bitcoin.active'
       - '--bitcoin.regtest'
       - '--bitcoin.node=bitcoind'
diff --git a/e2e/backup.e2e.js b/e2e/backup.e2e.js
index 30e101bc9..1aa13e0d7 100644
--- a/e2e/backup.e2e.js
+++ b/e2e/backup.e2e.js
@@ -10,7 +10,7 @@ import {
 } from './helpers';
 import initWaitForElectrumToSync from '../__tests__/utils/wait-for-electrum';
 
-d = checkComplete('backup-1') ? describe.skip : describe;
+d = checkComplete('backup-1') ? describe.skip : describe.skip;
 
 d('Backup', () => {
 	let waitForElectrum;
diff --git a/e2e/lightning.e2e.js b/e2e/lightning.e2e.js
index 2e921bf23..fd85254f3 100644
--- a/e2e/lightning.e2e.js
+++ b/e2e/lightning.e2e.js
@@ -176,6 +176,9 @@ d('Lightning', () => {
 			const note1 = 'note 111';
 			await element(by.id('ReceiveNote')).typeText(note1);
 			await element(by.id('ReceiveNote')).tapReturnKey();
+			await element(by.id('TagsAdd')).tap();
+			await element(by.id('TagInputReceive')).typeText('rtag');
+			await element(by.id('TagInputReceive')).tapReturnKey();
 			await element(by.id('ShowQrReceive')).tap();
 			await element(by.id('QRCode')).swipe('left');
 			const { label: invoice2 } = await element(
@@ -222,6 +225,12 @@ d('Lightning', () => {
 			await element(by.id('RecipientInput')).tapReturnKey();
 			await element(by.id('ContinueRecipient')).tap();
 			await element(by.id('ContinueAmount')).tap(); // FIXME: this should not be needed
+
+			// Review & Send
+			await expect(element(by.id('TagsAddSend'))).toBeVisible();
+			await element(by.id('TagsAddSend')).tap(); // add tag
+			await element(by.id('TagInputSend')).typeText('stag');
+			await element(by.id('TagInputSend')).tapReturnKey();
 			await element(by.id('GRAB')).swipe('right'); // Swipe to confirm
 			await waitFor(element(by.id('SendSuccess')))
 				.toBeVisible()
@@ -251,6 +260,69 @@ d('Lightning', () => {
 			await expect(element(by.id('InvoiceNote'))).toHaveText(note1);
 			await element(by.id('NavigationClose')).tap();
 
+			// check activity filters & tags
+			await element(by.id('ActivityShowAll')).tap();
+
+			// All, 4 transactions
+			await expect(
+				element(by.id('MoneySign').withAncestor(by.id('Activity-1'))),
+			).toHaveText('-');
+			await expect(
+				element(by.id('MoneySign').withAncestor(by.id('Activity-2'))),
+			).toHaveText('-');
+			await expect(
+				element(by.id('MoneySign').withAncestor(by.id('Activity-3'))),
+			).toHaveText('+');
+			await expect(
+				element(by.id('MoneySign').withAncestor(by.id('Activity-4'))),
+			).toHaveText('+');
+			await expect(element(by.id('Activity-5'))).not.toExist();
+
+			// Sent, 2 transactions
+			await element(by.id('Tab-sent')).tap();
+			await expect(
+				element(by.id('MoneySign').withAncestor(by.id('Activity-1'))),
+			).toHaveText('-');
+			await expect(
+				element(by.id('MoneySign').withAncestor(by.id('Activity-2'))),
+			).toHaveText('-');
+			await expect(element(by.id('Activity-3'))).not.toExist();
+
+			// Received, 2 transactions
+			await element(by.id('Tab-received')).tap();
+			await expect(
+				element(by.id('MoneySign').withAncestor(by.id('Activity-1'))),
+			).toHaveText('+');
+			await expect(
+				element(by.id('MoneySign').withAncestor(by.id('Activity-2'))),
+			).toHaveText('+');
+			await expect(element(by.id('Activity-3'))).not.toExist();
+
+			// Other, 0 transactions
+			// TODO: fixed in another PR
+			// await element(by.id('Tab-other')).tap();
+			// await expect(element(by.id('Activity-1'))).not.toExist();
+
+			// filter by receive tag
+			await element(by.id('Tab-all')).tap();
+			await element(by.id('TagsPrompt')).tap();
+			await element(by.id('Tag-rtag')).tap();
+			await expect(
+				element(by.id('MoneySign').withAncestor(by.id('Activity-1'))),
+			).toHaveText('+');
+			await expect(element(by.id('Activity-2'))).not.toExist();
+			await element(by.id('Tag-rtag-delete')).tap();
+
+			// filter by send tag
+			await element(by.id('TagsPrompt')).tap();
+			await element(by.id('Tag-stag')).tap();
+			await expect(
+				element(by.id('MoneySign').withAncestor(by.id('Activity-1'))),
+			).toHaveText('-');
+			await expect(element(by.id('Activity-2'))).not.toExist();
+			await element(by.id('Tag-stag-delete')).tap();
+			await element(by.id('NavigationClose')).tap();
+
 			// get seed
 			await element(by.id('Settings')).tap();
 			await element(by.id('BackupSettings')).tap();
diff --git a/src/navigation/bottom-sheet/ReceiveNavigation.tsx b/src/navigation/bottom-sheet/ReceiveNavigation.tsx
index 89fffa7c0..b8a1fff3d 100644
--- a/src/navigation/bottom-sheet/ReceiveNavigation.tsx
+++ b/src/navigation/bottom-sheet/ReceiveNavigation.tsx
@@ -38,16 +38,13 @@ const ReceiveNavigation = (): ReactElement => {
 		viewControllerIsOpenSelector(state, 'receiveNavigation'),
 	);
 
-	const onOpen = (): void => {
-		resetInvoice();
-	};
-
 	return (
 		<BottomSheetWrapper
 			view="receiveNavigation"
 			snapPoints={snapPoints}
 			testID="ReceiveScreen"
-			onOpen={onOpen}>
+			onOpen={resetInvoice}
+			onClose={resetInvoice}>
 			<NavigationContainer key={isOpen.toString()}>
 				<Stack.Navigator screenOptions={navOptions}>
 					<Stack.Screen name="ReceiveQR" component={ReceiveQR} />
diff --git a/src/screens/Wallets/Receive/ReceiveDetails.tsx b/src/screens/Wallets/Receive/ReceiveDetails.tsx
index 68082465b..e319287bb 100644
--- a/src/screens/Wallets/Receive/ReceiveDetails.tsx
+++ b/src/screens/Wallets/Receive/ReceiveDetails.tsx
@@ -36,7 +36,10 @@ import GlowImage from '../../../components/GlowImage';
 import { useScreenSize } from '../../../hooks/screen';
 import { getNumberPadText } from '../../../utils/numberpad';
 import { useSwitchUnit } from '../../../hooks/wallet';
-import { updateMetaIncTxTags } from '../../../store/actions/metadata';
+import {
+	removePendingInvoice,
+	updatePendingInvoice,
+} from '../../../store/actions/metadata';
 
 const imageSrc = require('../../../assets/illustrations/coin-stack-4.png');
 
@@ -77,10 +80,17 @@ const ReceiveDetails = ({
 	};
 
 	useEffect(() => {
-		if (invoice.tags.length > 0 && receiveAddress) {
-			updateMetaIncTxTags(receiveAddress, lightningInvoice, invoice.tags);
+		if (invoice.tags.length > 0) {
+			updatePendingInvoice({
+				id: invoice.id,
+				tags: invoice.tags,
+				address: receiveAddress,
+				payReq: lightningInvoice,
+			});
+		} else {
+			removePendingInvoice(invoice.id);
 		}
-	}, [receiveAddress, lightningInvoice, invoice.tags]);
+	}, [invoice.id, invoice.tags, receiveAddress, lightningInvoice]);
 
 	return (
 		<GradientView style={styles.container}>
diff --git a/src/screens/Wallets/Receive/ReceiveQR.tsx b/src/screens/Wallets/Receive/ReceiveQR.tsx
index 8a102c979..8fcbb6b7b 100644
--- a/src/screens/Wallets/Receive/ReceiveQR.tsx
+++ b/src/screens/Wallets/Receive/ReceiveQR.tsx
@@ -34,7 +34,7 @@ import {
 	ShareIcon,
 } from '../../../styles/icons';
 import { Caption13Up, Text02S } from '../../../styles/text';
-import { updateMetaIncTxTags } from '../../../store/actions/metadata';
+import { updatePendingInvoice } from '../../../store/actions/metadata';
 import { createLightningInvoice } from '../../../store/actions/lightning';
 import { generateNewReceiveAddress } from '../../../store/actions/wallet';
 import { viewControllerIsOpenSelector } from '../../../store/reselect/ui';
@@ -96,7 +96,7 @@ const ReceiveQR = ({
 	const selectedWallet = useSelector(selectedWalletSelector);
 	const selectedNetwork = useSelector(selectedNetworkSelector);
 	const addressType = useSelector(addressTypeSelector);
-	const { amount, message, tags } = useSelector(receiveSelector);
+	const { id, amount, message, tags } = useSelector(receiveSelector);
 	const lightningBalance = useLightningBalance(false);
 	const receiveNavigationIsOpen = useSelector((state) =>
 		viewControllerIsOpenSelector(state, 'receiveNavigation'),
@@ -215,13 +215,15 @@ const ReceiveQR = ({
 	]);
 
 	useEffect(() => {
-		// Gives the modal animation time to start.
-		sleep(50).then(() => {
-			if (tags.length !== 0 && receiveAddress && receiveNavigationIsOpen) {
-				updateMetaIncTxTags(receiveAddress, lightningInvoice, tags);
-			}
-		});
-	}, [receiveAddress, lightningInvoice, tags, receiveNavigationIsOpen]);
+		if (id && tags.length !== 0 && receiveAddress && receiveNavigationIsOpen) {
+			updatePendingInvoice({
+				id,
+				tags,
+				address: receiveAddress,
+				payReq: lightningInvoice,
+			});
+		}
+	}, [id, receiveAddress, lightningInvoice, tags, receiveNavigationIsOpen]);
 
 	const uri = useMemo((): string => {
 		if (!receiveNavigationIsOpen) {
@@ -242,9 +244,9 @@ const ReceiveQR = ({
 		receiveNavigationIsOpen,
 	]);
 
-	const handleCopy = (text: string, id: string): void => {
+	const handleCopy = (text: string, tooltipId: string): void => {
 		Clipboard.setString(text);
-		setShowTooltip((prevState) => ({ ...prevState, [id]: true }));
+		setShowTooltip((prevState) => ({ ...prevState, [tooltipId]: true }));
 		setTimeout(() => setShowTooltip(defaultTooltips), 1500);
 	};
 
@@ -517,13 +519,13 @@ const ReceiveQR = ({
 				<Button
 					size="large"
 					text={t('receive_specify')}
-					onPress={(): void =>
+					testID="SpecifyInvoiceButton"
+					onPress={(): void => {
 						navigation.navigate('ReceiveDetails', {
 							receiveAddress,
 							lightningInvoice,
-						})
-					}
-					testID="SpecifyInvoiceButton"
+						});
+					}}
 				/>
 			</View>
 			<SafeAreaInset type="bottom" minPadding={16} />
diff --git a/src/store/actions/actions.ts b/src/store/actions/actions.ts
index 1639cc8fc..4bd20c3e9 100644
--- a/src/store/actions/actions.ts
+++ b/src/store/actions/actions.ts
@@ -97,7 +97,8 @@ const actions = {
 	DELETE_META_TX_TAG: 'DELETE_META_TX_TAG',
 	ADD_META_TX_SLASH_TAGS_URL: 'ADD_META_TX_SLASH_TAGS_URL',
 	DELETE_META_TX_SLASH_TAGS_URL: 'DELETE_META_TX_SLASH_TAGS_URL',
-	UPDATE_META_INC_TX_TAGS: 'UPDATE_META_INC_TX_TAGS',
+	UPDATE_PENDING_INVOICE: 'UPDATE_PENDING_INVOICE',
+	DELETE_PENDING_INVOICE: 'DELETE_PENDING_INVOICE',
 	ADD_META_INC_TX_TAG: 'ADD_META_INC_TX_TAG',
 	DELETE_META_INC_TX_TAG: 'DELETE_META_INC_TX_TAG',
 	MOVE_META_INC_TX_TAG: 'MOVE_META_INC_TX_TAG',
diff --git a/src/store/actions/backup.ts b/src/store/actions/backup.ts
index 1fe1de87f..3f7fd6dbb 100644
--- a/src/store/actions/backup.ts
+++ b/src/store/actions/backup.ts
@@ -277,6 +277,7 @@ export const getBackup = async <T>({
 		backupCategory === EBackupCategories.metadata
 	) {
 		// Remove previously incorrectly encoded emojis from the backup
+		// eslint-disable-next-line no-control-regex
 		jsonString = jsonString.replace(/([\u0000-\u001F])/g, '');
 	}
 
@@ -401,11 +402,7 @@ export const performMetadataRestore = async ({
 	const expectedBackupShape = getDefaultMetadataShape();
 	//If the keys in the backup object are not found in the reference object assume the backup does not exist.
 	if (
-		!isObjPartialMatch(backup, expectedBackupShape, [
-			'tags',
-			'pendingTags',
-			'slashTagsUrls',
-		])
+		!isObjPartialMatch(backup, expectedBackupShape, ['tags', 'slashTagsUrls'])
 	) {
 		return ok({ backupExists: false });
 	}
diff --git a/src/store/actions/lightning.ts b/src/store/actions/lightning.ts
index 9934fbc2b..394a94a52 100644
--- a/src/store/actions/lightning.ts
+++ b/src/store/actions/lightning.ts
@@ -1,10 +1,13 @@
-import actions from './actions';
-import { getDispatch, getLightningStore } from '../helpers';
-import { err, ok, Result } from '@synonymdev/result';
 import { LNURLChannelParams } from 'js-lnurl';
+import { err, ok, Result } from '@synonymdev/result';
+import { TChannel, TInvoice } from '@synonymdev/react-native-ldk';
 import { getLNURLParams, lnurlChannel } from '@synonymdev/react-native-lnurl';
-import { getSelectedNetwork, getSelectedWallet } from '../../utils/wallet';
+
+import actions from './actions';
+import { getDispatch, getLightningStore, getMetaDataStore } from '../helpers';
 import { TAvailableNetworks } from '../../utils/networks';
+import { getActivityItemById } from '../../utils/activity';
+import { getSelectedNetwork, getSelectedWallet } from '../../utils/wallet';
 import {
 	addPeers,
 	createPaymentRequest,
@@ -19,14 +22,12 @@ import {
 	hasOpenLightningChannels,
 	parseUri,
 } from '../../utils/lightning';
-import { TChannel, TInvoice } from '@synonymdev/react-native-ldk';
 import {
 	TCreateLightningInvoice,
 	TLightningNodeVersion,
 } from '../types/lightning';
 import { EPaymentType, TWalletName } from '../types/wallet';
 import { EActivityType, TLightningActivityItem } from '../types/activity';
-import { getActivityItemById } from '../../utils/activity';
 
 const dispatch = getDispatch();
 
@@ -414,3 +415,29 @@ export const syncLightningTxsWithActivityList = async (): Promise<
 
 	return ok('Stored lightning transactions synced with activity list.');
 };
+
+/**
+ * Moves pending tags to metadata store linked to received payment
+ * @param {TInvoice} invoice
+ * @returns {Result<string>}
+ */
+export const moveMetaIncPaymentTags = (invoice: TInvoice): Result<string> => {
+	const { pendingInvoices } = getMetaDataStore();
+	const matched = pendingInvoices.find((item) => {
+		return item.payReq === invoice.to_str;
+	});
+
+	if (matched) {
+		const newPending = pendingInvoices.filter((item) => item !== matched);
+
+		dispatch({
+			type: actions.MOVE_META_INC_TX_TAG,
+			payload: {
+				pendingInvoices: newPending,
+				tags: { [invoice.payment_hash]: matched.tags },
+			},
+		});
+	}
+
+	return ok('Metadata tags resynced with transactions.');
+};
diff --git a/src/store/actions/metadata.ts b/src/store/actions/metadata.ts
index 7d5bb004a..b5766144c 100644
--- a/src/store/actions/metadata.ts
+++ b/src/store/actions/metadata.ts
@@ -3,8 +3,7 @@ import actions from './actions';
 import { getDispatch, getMetaDataStore } from '../helpers';
 import { getCurrentWallet } from '../../utils/wallet';
 import { EPaymentType } from '../types/wallet';
-import { removeKeysFromObject } from '../../utils/helpers';
-import { TTags, IMetadata } from '../types/metadata';
+import { IMetadata } from '../types/metadata';
 
 const dispatch = getDispatch();
 
@@ -45,16 +44,28 @@ export const deleteMetaTxTag = (txid: string, tag: string): Result<string> => {
 };
 
 /*
- * This action updates transactions tags
+ * This action updates a pending invoice
  */
-export const updateMetaIncTxTags = (
-	address: string,
-	payReq?: string,
-	tags: Array<string> = [],
-): Result<string> => {
+export const updatePendingInvoice = (payload: {
+	id: string;
+	tags: string[];
+	address: string;
+	payReq?: string;
+}): Result<string> => {
+	dispatch({
+		type: actions.UPDATE_PENDING_INVOICE,
+		payload,
+	});
+	return ok('');
+};
+
+/*
+ * This action deletes a pending invoice
+ */
+export const removePendingInvoice = (id: string): Result<string> => {
 	dispatch({
-		type: actions.UPDATE_META_INC_TX_TAGS,
-		payload: { address, payReq, tags },
+		type: actions.DELETE_PENDING_INVOICE,
+		payload: id,
 	});
 	return ok('');
 };
@@ -71,30 +82,35 @@ export const moveMetaIncTxTags = (): Result<string> => {
 	}
 
 	const transactions = currentWallet.transactions[selectedNetwork];
-	const { tags, pendingTags } = getMetaDataStore();
-
-	// Find all incoming transactions that we have pending tags for
-	const matchedTxs = Object.values(transactions).filter(
-		(tx) => tx.type === EPaymentType.received && !!pendingTags[tx.address],
-	);
-	const matchedAddresses = matchedTxs.map((tx) => tx.address);
-
-	// move matched from pendingTags to tags
-	const newPendingTags = removeKeysFromObject(pendingTags, matchedAddresses);
-	const newTags = matchedTxs
-		.filter((tx) => !Object.keys(tags).includes(tx.txid))
-		.map((tx) => ({ [tx.txid]: pendingTags[tx.address] }));
-
-	const newTagsObj: TTags = Object.assign({}, ...newTags);
+	const { pendingInvoices } = getMetaDataStore();
+
+	// Find received transaction that matches a pending invoice
+	const matched = Object.values(transactions).find((tx) => {
+		return pendingInvoices.find((invoice) => {
+			const isReceived = tx.type === EPaymentType.received;
+			return isReceived && tx.address === invoice.address;
+		});
+	});
 
-	dispatch({
-		type: actions.MOVE_META_INC_TX_TAG,
-		payload: {
-			tags: newTagsObj,
-			pendingTags: newPendingTags,
-		},
+	// Find pending invoice that matches the transaction
+	const matchedInvoice = pendingInvoices.find((item) => {
+		return matched?.address === item.address;
 	});
 
+	if (matched && matchedInvoice) {
+		const newPending = pendingInvoices.filter((item) => {
+			return item !== matchedInvoice;
+		});
+
+		dispatch({
+			type: actions.MOVE_META_INC_TX_TAG,
+			payload: {
+				pendingInvoices: newPending,
+				tags: { [matched.txid]: matchedInvoice.tags },
+			},
+		});
+	}
+
 	return ok('Metadata tags resynced with transactions.');
 };
 
diff --git a/src/store/index.ts b/src/store/index.ts
index 8ab0be003..9034d19c1 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -37,7 +37,7 @@ const persistConfig = {
 	key: 'root',
 	storage: mmkvStorage,
 	// increase version after store shape changes
-	version: 15,
+	version: 16,
 	stateReconciler: autoMergeLevel2,
 	blacklist: ['receive', 'ui'],
 	migrate: createMigrate(migrations, { debug: __ENABLE_MIGRATION_DEBUG__ }),
diff --git a/src/store/migrations/index.ts b/src/store/migrations/index.ts
index 130cbb9f6..29a623d59 100644
--- a/src/store/migrations/index.ts
+++ b/src/store/migrations/index.ts
@@ -163,6 +163,15 @@ const migrations = {
 			},
 		};
 	},
+	16: (state): PersistedState => {
+		return {
+			...state,
+			metadata: {
+				...state.metadata,
+				pendingInvoices: [],
+			},
+		};
+	},
 };
 
 export default migrations;
diff --git a/src/store/reducers/backup.ts b/src/store/reducers/backup.ts
index f1d285969..41c8dc455 100644
--- a/src/store/reducers/backup.ts
+++ b/src/store/reducers/backup.ts
@@ -34,7 +34,8 @@ const backup = (state: IBackup = defaultBackupShape, action): IBackup => {
 		case actions.UPDATE_META_TX_TAGS:
 		case actions.ADD_META_TX_TAG:
 		case actions.DELETE_META_TX_TAG:
-		case actions.UPDATE_META_INC_TX_TAGS:
+		case actions.UPDATE_PENDING_INVOICE:
+		case actions.DELETE_PENDING_INVOICE:
 		case actions.MOVE_META_INC_TX_TAG:
 		case actions.ADD_META_TX_SLASH_TAGS_URL:
 		case actions.DELETE_META_TX_SLASH_TAGS_URL:
diff --git a/src/store/reducers/metadata.ts b/src/store/reducers/metadata.ts
index a46967913..d311cb50e 100644
--- a/src/store/reducers/metadata.ts
+++ b/src/store/reducers/metadata.ts
@@ -61,22 +61,35 @@ const metadata = (
 			};
 		}
 
-		case actions.UPDATE_META_INC_TX_TAGS: {
+		case actions.UPDATE_PENDING_INVOICE: {
+			const newInvoice = { ...action.payload, timestamp: Date.now() };
+
+			// remove duplicates
+			const filtered = state.pendingInvoices.filter((invoice) => {
+				return invoice.id !== action.payload.id;
+			});
+
 			return {
 				...state,
-				pendingTags: {
-					...state.pendingTags,
-					[action.payload.address]: action.payload.tags,
-					// TODO: handle Lightning
-					// [action.payload.payReq]: action.payload.tags,
-				},
+				pendingInvoices: [...filtered, newInvoice],
+			};
+		}
+
+		case actions.DELETE_PENDING_INVOICE: {
+			const filtered = state.pendingInvoices.filter((invoice) => {
+				return invoice.id !== action.payload;
+			});
+
+			return {
+				...state,
+				pendingInvoices: filtered,
 			};
 		}
 
 		case actions.MOVE_META_INC_TX_TAG: {
 			return {
 				...state,
-				pendingTags: action.payload.pendingTags,
+				pendingInvoices: action.payload.pendingInvoices,
 				tags: { ...state.tags, ...action.payload.tags },
 			};
 		}
diff --git a/src/store/reducers/receive.ts b/src/store/reducers/receive.ts
index 09c32e05a..cc93d6124 100644
--- a/src/store/reducers/receive.ts
+++ b/src/store/reducers/receive.ts
@@ -1,28 +1,33 @@
+import { v4 as uuidv4 } from 'uuid';
 import actions from '../actions/actions';
 import { IReceive } from '../types/receive';
 import { defaultReceiveShape } from '../shapes/receive';
 
 const receive = (state: IReceive = defaultReceiveShape, action): IReceive => {
 	switch (action.type) {
-		case actions.UPDATE_INVOICE:
+		case actions.UPDATE_INVOICE: {
 			const tags = action.payload.tags ?? [];
 			return {
 				...state,
 				...action.payload,
 				tags: [...new Set([...state.tags, ...tags])],
 			};
+		}
 
-		case actions.RESET_INVOICE:
-			return defaultReceiveShape;
+		case actions.RESET_INVOICE: {
+			return { ...defaultReceiveShape, id: uuidv4() };
+		}
 
-		case actions.DELETE_INVOICE_TAG:
+		case actions.DELETE_INVOICE_TAG: {
 			return {
 				...state,
 				tags: state.tags.filter((tag) => tag !== action.payload.tag),
 			};
+		}
 
-		default:
+		default: {
 			return state;
+		}
 	}
 };
 
diff --git a/src/store/shapes/metadata.ts b/src/store/shapes/metadata.ts
index f2459597c..02b653a7d 100644
--- a/src/store/shapes/metadata.ts
+++ b/src/store/shapes/metadata.ts
@@ -4,8 +4,8 @@ import { IMetadata } from '../types/metadata';
 
 export const defaultMetadataShape: IMetadata = {
 	tags: {},
-	pendingTags: {},
 	lastUsedTags: [],
+	pendingInvoices: [],
 	slashTagsUrls: {},
 };
 
diff --git a/src/store/shapes/receive.ts b/src/store/shapes/receive.ts
index 594688b9e..860be1792 100644
--- a/src/store/shapes/receive.ts
+++ b/src/store/shapes/receive.ts
@@ -3,6 +3,7 @@
 import { IReceive } from '../types/receive';
 
 export const defaultReceiveShape: IReceive = {
+	id: '',
 	amount: 0,
 	numberPadText: '',
 	message: '',
diff --git a/src/store/types/metadata.ts b/src/store/types/metadata.ts
index edacc7d01..6640addef 100644
--- a/src/store/types/metadata.ts
+++ b/src/store/types/metadata.ts
@@ -1,11 +1,19 @@
 export type TTags = { [txId: string]: string[] };
-export type TPendingTags = { [address: string]: string[] };
 export type TLastUsedTags = string[];
 export type TSlashTagsUrls = { [txId: string]: string | undefined };
 
+type TPendingInvoice = {
+	id: string; // uuid used to identify the invoice 'session'
+	address: string;
+	payReq?: string;
+	tags: string[];
+	timestamp: number; // TODO: used to remove old unpaid pending invoices;
+};
+
 export interface IMetadata {
 	tags: TTags;
-	pendingTags: TPendingTags;
 	lastUsedTags: TLastUsedTags;
+	// Keep track of pending invoices, right now this is only used to map tags to incoming transactions
+	pendingInvoices: TPendingInvoice[];
 	slashTagsUrls: TSlashTagsUrls;
 }
diff --git a/src/store/types/receive.ts b/src/store/types/receive.ts
index 1837fad35..af42762f7 100644
--- a/src/store/types/receive.ts
+++ b/src/store/types/receive.ts
@@ -1,4 +1,5 @@
 export interface IReceive {
+	id: string; // uuid used to identify the invoice 'session'
 	amount: number;
 	numberPadText: string;
 	message: string;
diff --git a/src/store/types/wallet.ts b/src/store/types/wallet.ts
index 8dad184e2..a6bf63587 100644
--- a/src/store/types/wallet.ts
+++ b/src/store/types/wallet.ts
@@ -180,7 +180,7 @@ export interface IFormattedTransaction {
 }
 
 export interface IFormattedTransactions {
-	[key: string]: IFormattedTransaction;
+	[txId: string]: IFormattedTransaction;
 }
 
 export interface ISendTransaction {
diff --git a/src/utils/lightning/index.ts b/src/utils/lightning/index.ts
index d66b714a4..cae280061 100644
--- a/src/utils/lightning/index.ts
+++ b/src/utils/lightning/index.ts
@@ -47,6 +47,7 @@ import {
 } from '../../store/helpers';
 import { defaultHeader } from '../../store/shapes/wallet';
 import {
+	moveMetaIncPaymentTags,
 	removePeer,
 	syncLightningTxsWithActivityList,
 	updateClaimableBalance,
@@ -318,6 +319,8 @@ export const handleLightningPaymentSubscription = async ({
 	if (invoice) {
 		message = invoice.description ?? '';
 		address = invoice.to_str;
+
+		moveMetaIncPaymentTags(invoice);
 	} else {
 		//Unlikely to happen and not really a problem if it does
 		console.error(