Skip to content

Commit

Permalink
Merge branch 'main' into fix-nft-multiple-images-issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Prithpal-Sooriya authored Feb 24, 2025
2 parents d8c7ebb + 3d1e941 commit aef6d7a
Show file tree
Hide file tree
Showing 43 changed files with 227 additions and 339 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/create-release-pr-v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,18 @@ jobs:

create-release-pr:
needs: generate-build-version
uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@4f594ca7d90378da66b7efce987eff379934524b
uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@e79e0af6dc5d258222f6122eaa2ef41154058e41
with:
platform: mobile
base-branch: ${{ inputs.base-branch }}
semver-version: ${{ inputs.semver-version }}
previous-version-tag: ${{ inputs.previous-version-tag }}
mobile-build-version: ${{ needs.generate-build-version.outputs.build-version }}

secrets:
# This token needs read permissions to metamask-planning & write permissions to metamask-mobile
github-token: ${{ secrets.PR_TOKEN }}
google-application-creds-base64: ${{ secrets.GCP_RLS_SHEET_ACCOUNT_BASE64 }}
permissions:
contents: write
pull-requests: write
21 changes: 21 additions & 0 deletions .github/workflows/publish-slack-release-testing-status.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Trigger Publish Slack Release Testing Status

on:
schedule:
- cron: '0 15 * * 1-5' #M-F at 15:00 UTC
workflow_dispatch: # Allows manual triggering

jobs:
call-publish-slack-release-testing-status:
permissions:
contents: write
pull-requests: write
uses: MetaMask/github-tools/.github/workflows/publish-slack-release-testing-status.yml@e79e0af6dc5d258222f6122eaa2ef41154058e41
with:
platform: 'mobile'
google-document-id: '1tsoodlAlyvEUpkkcNcbZ4PM9HuC9cEM80RZeoVv5OCQ' # Release Testing Document
test-only: 'true'
secrets:
slack-api-key: ${{ secrets.SLACKBOT_RLS_TOKEN }}
github-token: ${{ secrets.PR_TOKEN }}
google-application-creds-base64: ${{ secrets.GCP_RLS_SHEET_ACCOUNT_BASE64 }}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified ios/MetaMask/Images.xcassets/AppIcon.appiconset/1024.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified ios/MetaMask/Images.xcassets/AppIcon.appiconset/114.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ios/MetaMask/Images.xcassets/AppIcon.appiconset/120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified ios/MetaMask/Images.xcassets/AppIcon.appiconset/152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified ios/MetaMask/Images.xcassets/AppIcon.appiconset/167.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified ios/MetaMask/Images.xcassets/AppIcon.appiconset/180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified ios/MetaMask/Images.xcassets/AppIcon.appiconset/40.png
Diff not rendered.
Binary file modified ios/MetaMask/Images.xcassets/AppIcon.appiconset/58.png
Diff not rendered.
Binary file modified ios/MetaMask/Images.xcassets/AppIcon.appiconset/60.png
Diff not rendered.
Binary file modified ios/MetaMask/Images.xcassets/AppIcon.appiconset/76.png
Diff not rendered.
Binary file modified ios/MetaMask/Images.xcassets/AppIcon.appiconset/80.png
Diff not rendered.
Binary file modified ios/MetaMask/Images.xcassets/AppIcon.appiconset/87.png
Loading

0 comments on commit aef6d7a

Please sign in to comment.