fix: Incoming tx on activity tab when transfering funds between wallets on the same client

[pedronfigueiredo]

Description

When sending a simple send transaction between two accounts of the same mnemonic on the same client, the incoming transaction is lost.

The issue failed to reproduce in production, which means it was about changes not in the latest release, v11.0.0.

The problem seems to be coming from the following function:

  _onIncomingTransactions({ added: transactions }) {
    log.debug('Detected new incoming transactions', transactions);

    const currentTransactions = this.store.getState().transactions || {};

    const incomingTransactions = transactions
      .filter((tx) => !this._hasTransactionHash(tx.hash, currentTransactions))
      .reduce((result, tx) => {
        result[tx.id] = tx;
        return result;
      }, {});

    const updatedTransactions = {
      ...currentTransactions,
      ...incomingTransactions,
    };

    this.store.updateState({ transactions: updatedTransactions });
  }

Since currentTransactions includes the outgoing simpleSend transaction with the same hash as the incoming type transaction contained in transactions, the incoming transaction gets filtered out, which means it's not available to be displayed in the activity tab.

The implemented solution is to keep both the simpleSend and incoming transaction by adding a new condition to the filter.

Manual testing steps

See original issue ticket video

Pre-merge author checklist

• I’ve followed MetaMask Coding Standards.
• I've clearly explained:
  • What problem this PR is solving.
  • How this problem was solved.
  • How reviewers can test my changes.
• I’ve indicated what issue this PR is linked to: Fixes #???
• I’ve included tests if applicable.
• I’ve documented any added code.
• I’ve applied the right labels on the PR (see labeling guidelines).
• I’ve properly set the pull request status:
  • In case it's not yet "ready for review", I've set it to "draft".
  • In case it's "ready for review", I've changed it from "draft" to "non-draft".

Pre-merge reviewer checklist

• I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed).
• I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.

[github-actions]

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

[metamaskbot]

Builds ready [a99ea44]

• builds: chrome, firefox
• builds (beta): chrome
• builds (flask): chrome, firefox
• builds (MMI): chrome, firefox
• build viz: Build System
• mv3: Background Module Init Stats
• mv3: UI Init Stats
• mv3: Module Load Stats
• mv3: Bundle Size Stats
• mv2: E2e Actions Stats
• code coverage: Report
• storybook: Storybook
• typescript migration: Dashboard
• all artifacts
• bundle viz:

  • background: 0, 1, 2, 3, 4
  • common: 0, 1, 2, 3, 4, 5, 6
  • content-script: 0
  • contentscript: contentscript
  • disable-console: disable-console
  • inpage: inpage
  • policy-load: policy-load
  • sentry-install: sentry-install
  • ui: 0, 1, 10, 11, 12, 2, 3, 4, 5, 6, 7, 8, 9

Page Load Metrics (1907 ± 135 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	119	298	170	49	23
		domContentLoaded	1565	2547	1907	282	135
		load	1565	2547	1907	282	135
		domInteractive	1565	2547	1907	282	135

Bundle size diffs [🚨 Warning! Bundle size has increased!]

• background: 37 Bytes (0.00%)
• ui: 0 Bytes (0.00%)
• common: 0 Bytes (0.00%)

[codecov]

Codecov Report

Patch coverage: 16.00% and project coverage change: -0.02% ⚠️

Comparison is base (da7dcb6) 68.38% compared to head (9f9be44) 68.36%.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop   #20973      +/-   ##
===========================================
- Coverage    68.38%   68.36%   -0.02%     
===========================================
  Files         1006     1006              
  Lines        40243    40262      +19     
  Branches     10760    10763       +3     
===========================================
+ Hits         27518    27522       +4     
- Misses       12725    12740      +15     

Files Changed	Coverage Δ
app/scripts/controllers/transactions/index.js	72.64% <ø> (ø)
...app/transaction-list/transaction-list.component.js	38.20% <16.00%> (-4.65%)	⬇️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[metamaskbot]

Builds ready [8858b8f]

• builds: chrome, firefox
• builds (beta): chrome
• builds (flask): chrome, firefox
• builds (MMI): chrome, firefox
• build viz: Build System
• mv3: Background Module Init Stats
• mv3: UI Init Stats
• mv3: Module Load Stats
• mv3: Bundle Size Stats
• mv2: E2e Actions Stats
• code coverage: Report
• storybook: Storybook
• typescript migration: Dashboard
• all artifacts
• bundle viz:

  • background: 0, 1, 2, 3, 4
  • common: 0, 1, 2, 3, 4, 5, 6
  • content-script: 0
  • contentscript: contentscript
  • disable-console: disable-console
  • inpage: inpage
  • policy-load: policy-load
  • sentry-install: sentry-install
  • ui: 0, 1, 10, 11, 12, 2, 3, 4, 5, 6, 7, 8, 9

Page Load Metrics (1761 ± 69 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	120	183	153	17	8
		domContentLoaded	1585	2093	1760	142	68
		load	1585	2094	1761	144	69
		domInteractive	1585	2093	1760	142	68

Bundle size diffs [🚨 Warning! Bundle size has increased!]

• background: 44 Bytes (0.00%)
• ui: 378 Bytes (0.00%)
• common: 0 Bytes (0.00%)

[metamaskbot]

Builds ready [ace23e2]

• builds: chrome, firefox
• builds (beta): chrome
• builds (flask): chrome, firefox
• builds (MMI): chrome, firefox
• build viz: Build System
• mv3: Background Module Init Stats
• mv3: UI Init Stats
• mv3: Module Load Stats
• mv3: Bundle Size Stats
• mv2: E2e Actions Stats
• code coverage: Report
• storybook: Storybook
• typescript migration: Dashboard
• all artifacts
• bundle viz:

  • background: 0, 1, 2, 3, 4
  • common: 0, 1, 2, 3, 4, 5, 6
  • content-script: 0
  • contentscript: contentscript
  • disable-console: disable-console
  • inpage: inpage
  • policy-load: policy-load
  • sentry-install: sentry-install
  • ui: 0, 1, 10, 11, 12, 2, 3, 4, 5, 6, 7, 8, 9

Page Load Metrics (1522 ± 26 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	118	164	134	13	6
		domContentLoaded	1434	1638	1522	54	26
		load	1434	1638	1522	54	26
		domInteractive	1434	1638	1522	54	26

Bundle size diffs [🚨 Warning! Bundle size has increased!]

• background: 44 Bytes (0.00%)
• ui: 378 Bytes (0.00%)
• common: 0 Bytes (0.00%)

[metamaskbot]

Builds ready [ddb326b]

• builds: chrome, firefox
• builds (beta): chrome
• builds (flask): chrome, firefox
• builds (MMI): chrome, firefox
• build viz: Build System
• mv3: Background Module Init Stats
• mv3: UI Init Stats
• mv3: Module Load Stats
• mv3: Bundle Size Stats
• mv2: E2e Actions Stats
• code coverage: Report
• storybook: Storybook
• typescript migration: Dashboard
• all artifacts
• bundle viz:

  • background: 0, 1, 2, 3, 4
  • common: 0, 1, 2, 3, 4, 5, 6
  • content-script: 0
  • contentscript: contentscript
  • disable-console: disable-console
  • inpage: inpage
  • policy-load: policy-load
  • sentry-install: sentry-install
  • ui: 0, 1, 10, 11, 12, 2, 3, 4, 5, 6, 7, 8, 9

Page Load Metrics (1637 ± 50 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	122	198	151	21	10
		domContentLoaded	1463	1922	1636	105	51
		load	1463	1922	1637	105	50
		domInteractive	1463	1922	1636	105	51

Bundle size diffs [🚨 Warning! Bundle size has increased!]

• background: 44 Bytes (0.00%)
• ui: 378 Bytes (0.00%)
• common: 0 Bytes (0.00%)

[metamaskbot]

Builds ready [55243bb]

• builds: chrome, firefox
• builds (beta): chrome
• builds (flask): chrome, firefox
• builds (MMI): chrome, firefox
• build viz: Build System
• mv3: Background Module Init Stats
• mv3: UI Init Stats
• mv3: Module Load Stats
• mv3: Bundle Size Stats
• mv2: E2e Actions Stats
• code coverage: Report
• storybook: Storybook
• typescript migration: Dashboard
• all artifacts
• bundle viz:

  • background: 0, 1, 2, 3, 4
  • common: 0, 1, 2, 3, 4, 5, 6, 7
  • content-script: 0
  • contentscript: contentscript
  • disable-console: disable-console
  • inpage: inpage
  • policy-load: policy-load
  • sentry-install: sentry-install
  • ui: 0, 1, 10, 11, 12, 2, 3, 4, 5, 6, 7, 8, 9

Page Load Metrics (1927 ± 73 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	129	232	170	23	11
		domContentLoaded	1690	2348	1926	150	72
		load	1690	2348	1927	152	73
		domInteractive	1690	2348	1925	150	72

[metamaskbot]

Builds ready [9f9be44]

• builds: chrome, firefox
• builds (beta): chrome
• builds (flask): chrome, firefox
• builds (MMI): chrome, firefox
• build viz: Build System
• mv3: Background Module Init Stats
• mv3: UI Init Stats
• mv3: Module Load Stats
• mv3: Bundle Size Stats
• mv2: E2e Actions Stats
• code coverage: Report
• storybook: Storybook
• typescript migration: Dashboard
• all artifacts
• bundle viz:

  • background: 0, 1, 2, 3, 4
  • common: 0, 1, 2, 3, 4, 5, 6, 7
  • content-script: 0
  • contentscript: contentscript
  • disable-console: disable-console
  • inpage: inpage
  • policy-load: policy-load
  • sentry-install: sentry-install
  • ui: 0, 1, 10, 11, 12, 2, 3, 4, 5, 6, 7, 8, 9

Page Load Metrics (1746 ± 73 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	126	241	165	32	15
		domContentLoaded	1520	2091	1746	152	73
		load	1520	2091	1746	152	73
		domInteractive	1520	2091	1746	152	73

Bundle size diffs [🚨 Warning! Bundle size has increased!]

• background: 44 Bytes (0.00%)
• ui: 378 Bytes (0.00%)
• common: 0 Bytes (0.00%)