fix: merge conflicts

MetaMask · May 6, 2024 · 99c3db1 · 99c3db1
2 parents c602b33 + 44e29aa
commit 99c3db1
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 154 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -407,54 +407,20 @@ jobs:
  command: |
  #!/bin/bash
 
- # GitHub Personal Access Token for API Authentication
- GITHUB_TOKEN="${GITHUB_TOKEN}"
- BRANCH="${CIRCLE_BRANCH}"
-
- # Fetch the PRs associated with the current branch and check the response
- PR_RESPONSE=$(curl -s -H "Authorization: token ${GITHUB_TOKEN}" \
- "https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls?state=open&head=${CIRCLE_PROJECT_USERNAME}:${BRANCH}")
- echo "https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls?state=open&head=${CIRCLE_PROJECT_USERNAME}:${BRANCH}"
-
- # Check if the response contains valid JSON
- if ! echo "$PR_RESPONSE" | jq empty; then
- echo "Failed to parse JSON response."
- echo "$PR_RESPONSE"
- exit 1
- fi
-
- # Check if we received an array of PRs
- if ! echo "$PR_RESPONSE" | jq -e '. | type == "array"'; then
- echo "$PR_RESPONSE"
- echo "Expected an array of PRs, got something else."
- exit 1
- fi
+ GH_LABEL=team-mmi
 
- # Check if the array of PRs is empty
- PR_COUNT=$(echo "$PR_RESPONSE" | jq '. | length')
+ echo $CIRCLE_PULL_REQUESTS | sed 's/,/\n/g'
 
- # If no PRs are found, exit gracefully
- if [ "$PR_COUNT" -eq 0 ]; then
- echo "No open PRs found. Exiting."
- echo "false" > ./RUN_MMI_OPTIONAL
- exit 0
- fi
-
- # Extract label names from the PR_RESPONSE
- LABEL_NAMES=$(echo "$PR_RESPONSE" | jq -r '.[0].labels[].name')
+ # See if any associated PRs have matching label
+ HAS_MATCHING_PR=$(echo $CIRCLE_PULL_REQUESTS \
+ | sed -e 's#,#\n#g' -e 's#/github.com/#/api.github.com/repos/#g' -e 's#/pull/#/pulls/#g' \
+ | xargs -n1 curl -s \
+ | jq -s "map((.labels|map(select(.name==\"${GH_LABEL}\"))))|flatten|length > 0")
 
- echo "Labels found: $LABEL_NAMES"
+ echo "${GH_LABEL} tag presence: ${HAS_MATCHING_PR}"
 
- # Check if "team-mmi" label is present
- if echo "$LABEL_NAMES" | grep -qw "team-mmi"; then
- echo "team-mmi tag found."
- # assign the RUN_MMI_OPTIONAL variable to true
- echo "true" > ./RUN_MMI_OPTIONAL
- else
- echo "team-mmi tag not found."
- # assign the RUN_MMI_OPTIONAL variable to false
- echo "false" > ./RUN_MMI_OPTIONAL
- fi
+ # assign the RUN_MMI_OPTIONAL variable
+ echo "${HAS_MATCHING_PR}" > ./RUN_MMI_OPTIONAL
  - persist_to_workspace:
  root: .
  paths:

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
@@ -728,26 +728,16 @@
  },
  "@metamask/address-book-controller": {
  "packages": {
- "@metamask/address-book-controller>@metamask/controller-utils": true,
- "@metamask/base-controller": true
+ "@metamask/address-book-controller>@metamask/base-controller": true,
+ "@metamask/controller-utils": true
  }
  },
- "@metamask/address-book-controller>@metamask/controller-utils": {
+ "@metamask/address-book-controller>@metamask/base-controller": {
  "globals": {
- "URL": true,
- "console.error": true,
- "fetch": true,
  "setTimeout": true
  },
  "packages": {
- "@ethereumjs/tx>@ethereumjs/util": true,
- "@metamask/controller-utils>@spruceid/siwe-parser": true,
- "@metamask/ethjs>@metamask/ethjs-unit": true,
- "@metamask/utils": true,
- "bn.js": true,
- "browserify>buffer": true,
- "eslint>fast-deep-equal": true,
- "eth-ens-namehash": true
+ "immer": true
  }
  },
  "@metamask/announcement-controller": {

diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
@@ -728,26 +728,16 @@
  },
  "@metamask/address-book-controller": {
  "packages": {
- "@metamask/address-book-controller>@metamask/controller-utils": true,
- "@metamask/base-controller": true
+ "@metamask/address-book-controller>@metamask/base-controller": true,
+ "@metamask/controller-utils": true
  }
  },
- "@metamask/address-book-controller>@metamask/controller-utils": {
+ "@metamask/address-book-controller>@metamask/base-controller": {
  "globals": {
- "URL": true,
- "console.error": true,
- "fetch": true,
  "setTimeout": true
  },
  "packages": {
- "@ethereumjs/tx>@ethereumjs/util": true,
- "@metamask/controller-utils>@spruceid/siwe-parser": true,
- "@metamask/ethjs>@metamask/ethjs-unit": true,
- "@metamask/utils": true,
- "bn.js": true,
- "browserify>buffer": true,
- "eslint>fast-deep-equal": true,
- "eth-ens-namehash": true
+ "immer": true
  }
  },
  "@metamask/announcement-controller": {

diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
@@ -728,26 +728,16 @@
  },
  "@metamask/address-book-controller": {
  "packages": {
- "@metamask/address-book-controller>@metamask/controller-utils": true,
- "@metamask/base-controller": true
+ "@metamask/address-book-controller>@metamask/base-controller": true,
+ "@metamask/controller-utils": true
  }
  },
- "@metamask/address-book-controller>@metamask/controller-utils": {
+ "@metamask/address-book-controller>@metamask/base-controller": {
  "globals": {
- "URL": true,
- "console.error": true,
- "fetch": true,
  "setTimeout": true
  },
  "packages": {
- "@ethereumjs/tx>@ethereumjs/util": true,
- "@metamask/controller-utils>@spruceid/siwe-parser": true,
- "@metamask/ethjs>@metamask/ethjs-unit": true,
- "@metamask/utils": true,
- "bn.js": true,
- "browserify>buffer": true,
- "eslint>fast-deep-equal": true,
- "eth-ens-namehash": true
+ "immer": true
  }
  },
  "@metamask/announcement-controller": {

diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
@@ -728,26 +728,16 @@
  },
  "@metamask/address-book-controller": {
  "packages": {
- "@metamask/address-book-controller>@metamask/controller-utils": true,
- "@metamask/base-controller": true
+ "@metamask/address-book-controller>@metamask/base-controller": true,
+ "@metamask/controller-utils": true
  }
  },
- "@metamask/address-book-controller>@metamask/controller-utils": {
+ "@metamask/address-book-controller>@metamask/base-controller": {
  "globals": {
- "URL": true,
- "console.error": true,
- "fetch": true,
  "setTimeout": true
  },
  "packages": {
- "@ethereumjs/tx>@ethereumjs/util": true,
- "@metamask/controller-utils>@spruceid/siwe-parser": true,
- "@metamask/ethjs>@metamask/ethjs-unit": true,
- "@metamask/utils": true,
- "bn.js": true,
- "browserify>buffer": true,
- "eslint>fast-deep-equal": true,
- "eth-ens-namehash": true
+ "immer": true
  }
  },
  "@metamask/announcement-controller": {

diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
@@ -867,26 +867,16 @@
  },
  "@metamask/address-book-controller": {
  "packages": {
- "@metamask/address-book-controller>@metamask/controller-utils": true,
- "@metamask/base-controller": true
+ "@metamask/address-book-controller>@metamask/base-controller": true,
+ "@metamask/controller-utils": true
  }
  },
- "@metamask/address-book-controller>@metamask/controller-utils": {
+ "@metamask/address-book-controller>@metamask/base-controller": {
  "globals": {
- "URL": true,
- "console.error": true,
- "fetch": true,
  "setTimeout": true
  },
  "packages": {
- "@ethereumjs/tx>@ethereumjs/util": true,
- "@metamask/controller-utils>@spruceid/siwe-parser": true,
- "@metamask/ethjs>@metamask/ethjs-unit": true,
- "@metamask/utils": true,
- "bn.js": true,
- "browserify>buffer": true,
- "eslint>fast-deep-equal": true,
- "eth-ens-namehash": true
+ "immer": true
  }
  },
  "@metamask/announcement-controller": {

diff --git a/package.json b/package.json
@@ -271,7 +271,7 @@
  "@metamask-institutional/transaction-update": "^0.2.0",
  "@metamask/abi-utils": "^2.0.2",
  "@metamask/accounts-controller": "^11.0.0",
- "@metamask/address-book-controller": "^3.1.7",
+ "@metamask/address-book-controller": "^4.0.1",
  "@metamask/announcement-controller": "^6.1.0",
  "@metamask/approval-controller": "^6.0.0",
  "@metamask/assets-controllers": "^29.0.0",
@@ -572,7 +572,6 @@
  "nock": "^13.2.9",
  "node-fetch": "^2.6.1",
  "nyc": "^15.1.0",
- "polyfill-crypto.getrandomvalues": "^1.0.0",
  "postcss": "^8.4.32",
  "postcss-rtlcss": "^4.0.9",
  "prettier": "^2.7.1",

diff --git a/shared/constants/methods-tags.ts b/shared/constants/methods-tags.ts
@@ -25,8 +25,6 @@ export const methodsWithConfirmation = [
  ...methodsRequiringNetworkSwitch,
  'wallet_requestPermissions',
  'wallet_requestSnaps',
- 'wallet_snap',
- 'wallet_invokeSnap',
  'eth_decrypt',
  'eth_sign',
  'eth_requestAccounts',

diff --git a/shared/modules/selectors/smart-transactions.ts b/shared/modules/selectors/smart-transactions.ts
@@ -13,7 +13,7 @@ import {
 type SmartTransactionsMetaMaskState = {
  metamask: {
  preferences: {
- smartTransactionsOptInStatus: boolean | null;
+ smartTransactionsOptInStatus?: boolean | null;
  };
  internalAccounts: {
  selectedAccount: string;
@@ -62,7 +62,7 @@ type SmartTransactionsMetaMaskState = {
 export const getSmartTransactionsOptInStatus = (
  state: SmartTransactionsMetaMaskState,
 ): boolean | null => {
- return state.metamask.preferences?.smartTransactionsOptInStatus;
+ return state.metamask.preferences?.smartTransactionsOptInStatus ?? null;
 };
 
 export const getCurrentChainSupportsSmartTransactions = (

diff --git a/test/helpers/setup-helper.js b/test/helpers/setup-helper.js
@@ -111,7 +111,7 @@ if (!window.crypto) {
 }
 if (!window.crypto.getRandomValues) {
  // eslint-disable-next-line node/global-require
- window.crypto.getRandomValues = require('polyfill-crypto.getrandomvalues');
+ window.crypto.getRandomValues = require('crypto').webcrypto.getRandomValues;
 }
 
 // TextEncoder/TextDecoder

diff --git a/ui/pages/confirmations/components/confirm/title/title.test.tsx b/ui/pages/confirmations/components/confirm/title/title.test.tsx
@@ -24,7 +24,7 @@ describe('ConfirmTitle', () => {
  expect(getByText('Signature request')).toBeInTheDocument();
  expect(
  getByText(
- 'Only sign this message if you fully understand the content and trust the requesting site',
+ 'Only confirm this message if you approve the content and trust the requesting site.',
  ),
  ).toBeInTheDocument();
  });
@@ -38,7 +38,7 @@ describe('ConfirmTitle', () => {
  expect(getByText('Signature request')).toBeInTheDocument();
  expect(
  getByText(
- 'Review everything below before continuing. Once done, this transaction can’t be undone',
+ 'Only confirm this message if you approve the content and trust the requesting site.',
  ),
  ).toBeInTheDocument();
  });

diff --git a/ui/pages/confirmations/components/confirm/title/title.tsx b/ui/pages/confirmations/components/confirm/title/title.tsx
@@ -28,8 +28,8 @@ const ConfirmTitle: React.FC = memo(() => {
 
  const typeToDescTKey: Partial<Record<TransactionType, string>> = useMemo(
  () => ({
- [TransactionType.personalSign]: t('confirmTitleDescPersonalSignature'),
- [TransactionType.signTypedData]: t('confirmTitleDescTypedDataSignature'),
+ [TransactionType.personalSign]: t('confirmTitleDescSignature'),
+ [TransactionType.signTypedData]: t('confirmTitleDescSignature'),
  [TransactionType.contractInteraction]: t(
  'confirmTitleDescContractInteractionTransaction',
  ),

diff --git a/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap b/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
@@ -140,7 +140,7 @@ exports[`Confirm matches snapshot for personal signature type 1`] = `
  <p
  class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--padding-bottom-4 mm-box--color-text-alternative"
  >
- Only sign this message if you fully understand the content and trust the requesting site
+ Only confirm this message if you approve the content and trust the requesting site.
  </p>
  <div
  class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
@@ -373,7 +373,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
  <p
  class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--padding-bottom-4 mm-box--color-text-alternative"
  >
- Review everything below before continuing. Once done, this transaction can’t be undone
+ Only confirm this message if you approve the content and trust the requesting site.
  </p>
  <div
  class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"

diff --git a/ui/pages/confirmations/hooks/useConfirmationRecipientInfo.ts b/ui/pages/confirmations/hooks/useConfirmationRecipientInfo.ts
@@ -11,7 +11,6 @@ function useConfirmationRecipientInfo() {
  const currentConfirmation = useSelector(
  currentConfirmationSelector,
  ) as Confirmation;
- const allAccounts = useSelector(accountsWithSendEtherInfoSelector);
 
  const allAccounts = useSelector(accountsWithSendEtherInfoSelector);