Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OriginInfo for TransactionInfo #12987

Merged
merged 2 commits into from
Apr 14, 2022
Merged

Conversation

supermassive
Copy link
Collaborator

@supermassive supermassive commented Apr 12, 2022

Resolves brave/brave-browser#21915

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@supermassive supermassive added this to the 1.39.x - Nightly milestone Apr 12, 2022
@github-actions github-actions bot added the CI/storybook-url Deploy storybook and provide a unique URL for each build label Apr 12, 2022
@supermassive supermassive force-pushed the OriginInfoForTransactionInfo branch from 233586b to ec1f7fb Compare April 13, 2022 06:29
defaultCurrencies,
selectedPendingTransaction: transactionInfo
} = useSelector(({ wallet }: { wallet: WalletState }) => wallet)

const originInfo = transactionInfo?.originInfo ?? activeOrigin
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Legacy" transactions coming from prefs won't have originInfo(hence it is optional). Falling back to activeOrigin as it worked before. But maybe that case should be presented in UI in some special way.

@@ -655,10 +655,12 @@ export async function sendEthTransaction (store: Store, payload: SendEthTransact
gasEstimation: undefined
}
// @ts-expect-error google closure is ok with undefined for other fields but mojom runtime is not
addResult = await apiProxy.txService.addUnapprovedTransaction({ ethTxData1559: txData1559 }, payload.from)
const txDataUnion: BraveWallet.TxDataUnion = { ethTxData1559: txData1559 };
addResult = await apiProxy.txService.addUnapprovedTransaction(txDataUnion, payload.from, null)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

null here as last argument so chrome://wallet will be set as origin

@supermassive supermassive marked this pull request as ready for review April 13, 2022 06:59
@supermassive supermassive requested a review from a team as a code owner April 13, 2022 06:59
@github-actions github-actions bot added rebase and removed rebase labels Apr 13, 2022
@supermassive supermassive force-pushed the OriginInfoForTransactionInfo branch 3 times, most recently from bd8ddb6 to 8f2e02e Compare April 13, 2022 09:42
@supermassive supermassive force-pushed the OriginInfoForTransactionInfo branch from 8f2e02e to 19f8b73 Compare April 13, 2022 10:44
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

Copy link
Member

@yrliou yrliou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM nice work

components/brave_wallet/browser/eth_tx_manager_unittest.cc Outdated Show resolved Hide resolved
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@supermassive supermassive merged commit 4282153 into master Apr 14, 2022
@supermassive supermassive deleted the OriginInfoForTransactionInfo branch April 14, 2022 05:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/storybook-url Deploy storybook and provide a unique URL for each build
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Store initiator origin info for DAPP requests
3 participants