Merge branch 'main' into feat/add-notifications-ui-components

MetaMask · Jul 24, 2024 · bec53e0 · bec53e0
2 parents 64af80f + ad806d6
commit bec53e0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/update-attributions.yml b/.github/workflows/update-attributions.yml
@@ -113,7 +113,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           # Use PAT to ensure that the commit later can trigger status check workflows
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.ACTIONS_WRITE_TOKEN }}
       - name: Checkout pull request
         run: gh pr checkout "${PR_NUMBER}"
         env:
@@ -144,8 +144,6 @@ jobs:
           git config --global user.email 'metamaskbot@users.noreply.github.com'
           git commit -am "Update Attributions"
           git push
-        env:
-          GITHUB_TOKEN: ${{ secrets.ACTIONS_WRITE_TOKEN }}
       - name: Post comment
         run: |
           if [[ $HAS_CHANGES == 'true' ]]

diff --git a/app/components/Views/Settings/AppInformation/index.js b/app/components/Views/Settings/AppInformation/index.js
@@ -100,6 +100,7 @@ export default class AppInformation extends PureComponent {
 
   state = {
     appInfo: '',
+    appVersion: '',
   };
 
   updateNavBar = () => {
@@ -120,7 +121,10 @@ export default class AppInformation extends PureComponent {
     const appName = await getApplicationName();
     const appVersion = await getVersion();
     const buildNumber = await getBuildNumber();
-    this.setState({ appInfo: `${appName} v${appVersion} (${buildNumber})` });
+    this.setState({
+      appInfo: `${appName} v${appVersion} (${buildNumber})`,
+      appVersion,
+    });
   };
 
   componentDidUpdate = () => {
@@ -150,8 +154,7 @@ export default class AppInformation extends PureComponent {
   };
 
   onAttributions = () => {
-    const url =
-      'https://raw.githubusercontent.com/MetaMask/metamask-mobile/main/attribution.txt';
+    const url = `https://raw.githubusercontent.com/MetaMask/metamask-mobile/v${this.state.appVersion}/attribution.txt`;
     this.goTo(url, strings('app_information.attributions'));
   };