Revert "chore: merge main into 7.16.0 - resolve conflicts (#8679)"

This reverts commit 54e4f98.
MetaMask · Feb 22, 2024 · 80e5302 · 80e5302
1 parent 54e4f98
commit 80e5302
Show file tree

Hide file tree

Showing 587 changed files with 7,083 additions and 14,228 deletions.
diff --git a/.github/workflows/create-cherry-pick-pr.yml b/.github/workflows/create-cherry-pick-pr.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       branch_name:
-        description: 'Target branch name to merge the cherry-picked branch into'
+        description: 'Branch name you want the cherry-pick branch to be based from'     
         required: true
       commit_hash:
         description: 'Commit Hash'     

diff --git a/.github/workflows/security-code-scanner.yml b/.github/workflows/security-code-scanner.yml
diff --git a/.js.env.example b/.js.env.example
@@ -53,10 +53,4 @@ export WATCHER_PORT=8081
 export METAMASK_ENVIRONMENT=""
 
 # Build type: "main" or "flask"
-export METAMASK_BUILD_TYPE=""
-
-# Segment SDK proxy endpoint and write key
-export SEGMENT_WRITE_KEY=""
-export SEGMENT_PROXY_URL=""
-export SEGMENT_DELETE_API_SOURCE_ID=""
-export SEGMENT_REGULATIONS_ENDPOINT=""
+export METAMASK_BUILD_TYPE=""