temp+fix: delay for 5s after submitting Base approval cp-7.56.0 (#20190)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Patches these changes into the bridge-status-controller:
MetaMask/core#6674

The change adds a 5s delay after the approval submission to reduce
bridge transaction failures on Base

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

## **Changelog**

<!--
If this PR is not End-User-Facing and should not show up in the
CHANGELOG, you can choose to either:
1. Write `CHANGELOG entry: null`
2. Label with `no-changelog`

If this PR is End-User-Facing, please write a short User-Facing
description in the past tense like:
`CHANGELOG entry: Added a new tab for users to see their NFTs`
`CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker`

(This helps the Release Engineer do their job more quickly and
accurately)
-->

CHANGELOG entry: fix: delay for 5s after submitting Base approval for
swap

## **Related issues**

Fixes: #20193

## **Manual testing steps**

```gherkin
Feature: my feature name

  Scenario: user [verb for user action]
    Given [describe expected initial app state]

    When user [verb for user action]
    Then [describe expected outcome]
```

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->
N/A

### **After**

<!-- [screenshots/recordings] -->

No visual changes, but there should be a 5s delay between the approval
tx's submission and the trade tx on Base

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **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.

---------

Co-authored-by: SteP-n-s <[email protected]>

Author: runway-github[bot]

.github/CODEOWNERS

@@ -83,9 +83,9 @@ app/core/Engine/controllers/accounts-controller             @MetaMask/accounts-e
 app/core/Engine/messengers/accounts-controller-messenger    @MetaMask/accounts-engineers
 app/core/SnapKeyring                                        @MetaMask/accounts-engineers
 
-# Co-owned by accounts and mobile-core-ux
-app/components/Views/AccountSelector                        @MetaMask/accounts-engineers @MetaMask/mobile-core-ux
-app/components/UI/EvmAccountSelectorList                    @MetaMask/accounts-engineers @MetaMask/mobile-core-ux
+# Co-owned by accounts and wallet-ux
+app/components/Views/AccountSelector                        @MetaMask/accounts-engineers @MetaMask/wallet-ux
+app/components/UI/EvmAccountSelectorList                    @MetaMask/accounts-engineers @MetaMask/wallet-ux
 
 # Multichain Accounts
 **/multichain-accounts/**                                   @MetaMask/accounts-engineers
@@ -186,25 +186,25 @@ app/core/Engine/messengers/defi-positions-controller-messenger @MetaMask/metamas
 app/selectors/assets @MetaMask/metamask-assets
 
 # UX Team
-app/components/Views/AccountActions @MetaMask/mobile-core-ux
-app/components/Views/AccountSelector @MetaMask/mobile-core-ux
-app/components/Views/AddressQRCode @MetaMask/mobile-core-ux
-app/components/Views/EditAccountName @MetaMask/mobile-core-ux
-app/components/Views/LockScreen @MetaMask/mobile-core-ux
-app/components/Views/Login @MetaMask/mobile-core-ux
-app/components/Views/NetworkConnect @MetaMask/mobile-core-ux
-app/components/Views/NetworkSelector @MetaMask/mobile-core-ux
-app/components/Views/OnboardingCarousel @MetaMask/mobile-core-ux
-app/components/Views/OnboardingSuccess @MetaMask/mobile-core-ux
-app/components/Views/QRAccountDisplay @MetaMask/mobile-core-ux
-app/components/Views/QRScanner @MetaMask/mobile-core-ux
-app/components/Views/Settings @MetaMask/mobile-core-ux
-app/components/Views/TermsAndConditions @MetaMask/mobile-core-ux
-app/reducers/experimentalSettings @MetaMask/mobile-core-ux
-app/reducers/modals @MetaMask/mobile-core-ux
-app/reducers/navigation @MetaMask/mobile-core-ux
-app/reducers/privacy @MetaMask/mobile-core-ux
-app/reducers/settings @MetaMask/mobile-core-ux
+app/components/Views/AccountActions @MetaMask/wallet-ux
+app/components/Views/AccountSelector @MetaMask/wallet-ux
+app/components/Views/AddressQRCode @MetaMask/wallet-ux
+app/components/Views/EditAccountName @MetaMask/wallet-ux
+app/components/Views/LockScreen @MetaMask/wallet-ux
+app/components/Views/Login @MetaMask/wallet-ux
+app/components/Views/NetworkConnect @MetaMask/wallet-ux
+app/components/Views/NetworkSelector @MetaMask/wallet-ux
+app/components/Views/OnboardingCarousel @MetaMask/wallet-ux
+app/components/Views/OnboardingSuccess @MetaMask/wallet-ux
+app/components/Views/QRAccountDisplay @MetaMask/wallet-ux
+app/components/Views/QRScanner @MetaMask/wallet-ux
+app/components/Views/Settings @MetaMask/wallet-ux
+app/components/Views/TermsAndConditions @MetaMask/wallet-ux
+app/reducers/experimentalSettings @MetaMask/wallet-ux
+app/reducers/modals @MetaMask/wallet-ux
+app/reducers/navigation @MetaMask/wallet-ux
+app/reducers/privacy @MetaMask/wallet-ux
+app/reducers/settings @MetaMask/wallet-ux
 
 # Transactions Team
 app/components/Views/transactions @MetaMask/transactions
@@ -216,9 +216,6 @@ app/core/OAuthService                                       @MetaMask/web3auth
 app/components/Views/Onboarding                             @MetaMask/web3auth
 app/reducers/onboarding                                     @MetaMask/web3auth
 
-# Delegation team
-app/core/Engine/controllers/gator-permissions-controller    @MetaMask/delegation
-app/core/Engine/messengers/gator-permissions-controller-messenger      @MetaMask/delegation
 # QA Team - E2E Framework
 e2e/api-mocking/                             @MetaMask/qa
 e2e/fixtures/                                @MetaMask/qa

.github/actionlint.yaml

@@ -4,8 +4,6 @@ self-hosted-runner:
     - "gha-mmsdk-scale-set-ubuntu-22.04-amd64-xl"
     - "gha-mmsdk-scale-set-ubuntu-22.04-amd64-large"
     - "gha-mm-scale-set-ubuntu-22.04-amd64-large"
-    - "gha-mm-scale-set-ubuntu-22.04-amd64-small"
-    - "gha-mm-scale-set-ubuntu-22.04-amd64-med"
     - "macos-15"
     - "ghcr.io/cirruslabs/macos-runner:sequoia"
     - "ghcr.io/cirruslabs/macos-runner:sequoia-xl"

.github/scripts/extract-semver.sh

@@ -9,16 +9,101 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       semver: ${{ steps.out.outputs.semver }}
+      previous_ref: ${{ steps.out.outputs.previous_ref }}
+      proceed: ${{ steps.out.outputs.proceed }}
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
       - id: out
         shell: bash
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
         run: |
-          .github/scripts/extract-semver.sh
+          set -euo pipefail
+
+          semver="${GITHUB_REF#refs/heads/release/}"
+          echo "semver=${semver}" >> "$GITHUB_OUTPUT"
+
+          # Validate semver format X.Y.Z where X, Y, Z are numbers
+          if ! [[ "$semver" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "Error: Branch name must be release/X.Y.Z where X, Y, Z are numbers. Got: ${GITHUB_REF}" >&2
+            exit 1
+          fi
+
+          # Check if release X.Y.Z is hotfix: if patch (aka Z) > 0, skip
+          patch="${semver##*.}"
+          if [ "$patch" -gt 0 ]; then
+            echo "Hotfix detected (patch $patch > 0), skipping auto-create-release-pr."
+            echo "proceed=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+          echo "Not a hotfix (patch=0), proceeding."
+
+          # Function to paginate and collect refs for a prefix
+          fetch_matching_refs() {
+            local prefix="$1"
+            local temp_file
+            temp_file="$(mktemp)"
+            local page=1
+            echo "Fetching branches matching $prefix* (paginated)..." >&2
+            while :; do
+              echo "Fetching page $page for $prefix..." >&2
+              resp="$(mktemp)"
+              url="https://api.github.com/repos/${GITHUB_REPOSITORY}/git/matching-refs/heads/${prefix}?per_page=100&page=${page}"
+              curl -sS -H "Authorization: token $GITHUB_TOKEN" -H "Accept: application/vnd.github.v3+json" "$url" -o "$resp"
+
+              cat "$resp" >> "$temp_file"
+
+              count=$(jq length "$resp")
+              if [ "$count" -lt 100 ]; then
+                break
+              fi
+              page=$((page + 1))
+            done
+            echo "$temp_file"
+          }
+
+          # Fetch only for release/ prefix
+          release_file=$(fetch_matching_refs "release/")
+
+          # Combine and process: extract {name, semver} for matches, sort desc by semver
+          jq -s 'add | [ .[] | .ref | ltrimstr("refs/heads/") as $name | select($name | test("^release/[0-9]+\\.[0-9]+\\.[0-9]+$")) | {name: $name, semver: $name | ltrimstr("release/") } ] | sort_by( .semver | split(".") | map(tonumber) ) | reverse' "$release_file" > all_versions.json
+
+          # Print all found versions (sorted desc)
+          echo "All found versions (sorted desc): $(jq '[ .[].semver ]' all_versions.json)"
+
+          # Print all found matching branches (sorted by semver desc)
+          echo "All found matching branches:"
+          jq -r '.[].name' all_versions.json || echo "No matching branches found."
+
+          # Filter to those with semver strictly lower than current
+          jq --arg semver "$semver" '[ .[] | select( .semver as $v | $semver | split(".") as $c | $v | split(".") as $p | ($p[0] | tonumber) < ($c[0] | tonumber) or (($p[0] | tonumber) == ($c[0] | tonumber) and (($p[1] | tonumber) < ($c[1] | tonumber) or (($p[1] | tonumber) == ($c[1] | tonumber) and ($p[2] | tonumber) < ($c[2] | tonumber)))) ) ]' all_versions.json > filtered_versions.json
+
+          # Print filtered versions (< $semver, sorted desc)
+          echo "Filtered versions (< $semver, sorted desc): $(jq '[ .[].semver ]' filtered_versions.json)"
+
+          # Select the highest lower: first in filtered list
+          if [ "$(jq length filtered_versions.json)" -eq 0 ]; then
+            echo "Error: No versions lower than $semver found. Cannot determine previous-version-ref." >&2
+            exit 1
+          else
+            highest_lower="$(jq -r '.[0].semver' filtered_versions.json)"
+            previous_ref="$(jq -r '.[0].name' filtered_versions.json)"
+            echo "Selected highest version lower than $semver: ${highest_lower}"
+            echo "Selected branch: ${previous_ref}"
+            echo "Passing to previous-version-ref: ${previous_ref}"
+          fi
+          echo "previous_ref=${previous_ref}" >> "$GITHUB_OUTPUT"
+
+          # Print values passed to call-create-release-pr
+          echo "Inputs to call-create-release-pr:"
+          echo "  checkout-base-branch: main"
+          echo "  release-pr-base-branch: stable"
+          echo "  semver-version: ${semver}"
+          echo "  previous-version-ref: ${previous_ref}"
+
+          echo "proceed=true" >> "$GITHUB_OUTPUT"
 
   call-create-release-pr:
+    if: ${{ github.ref_type == 'branch' && startsWith(github.ref, 'refs/heads/release/') && needs.extract.outputs.proceed == 'true' }}
     needs: extract
     permissions:
       contents: write
@@ -28,4 +113,7 @@ jobs:
       github-token: ${{ secrets.PR_TOKEN }}
       google-application-creds-base64: ${{ secrets.GCP_RLS_SHEET_ACCOUNT_BASE64 }}
     with:
+      checkout-base-branch: main
+      release-pr-base-branch: stable
       semver-version: ${{ needs.extract.outputs.semver }}
+      previous-version-ref: ${{ needs.extract.outputs.previous_ref }}

.github/scripts/resolve-previous-ref.sh

@@ -32,7 +32,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Android Build Environment
-        uses: MetaMask/github-tools/.github/actions/setup-e2e-env@f932aba72712f44367f89f6e259ea0c8cfedcf68
+        uses: MetaMask/github-tools/.github/actions/setup-e2e-env@self-hosted-runners-config
         with:
           platform: android
           setup-simulator: false