Merge branch 'main' into feat/musd-455-bring-back-claim-section-on-asset-details-screen

Author: Matt561

.agents/skills/component-view-test/SKILL.md

@@ -56,6 +56,7 @@ tests/component-view/
 ├── mocks.ts              ← Engine + native mocks (import this first, always)
 ├── render.tsx            ← renderComponentViewScreen, renderScreenWithRoutes
 ├── stateFixture.ts       ← StateFixtureBuilder (createStateFixture)
+├── platform.ts           ← describeForPlatforms, itForPlatforms (run per iOS/Android)
 ├── api-mocking/          ← HTTP API mocks (nock) — extensible, one file per feature
 ├── presets/              ← initialState<Feature>() builders — one file per feature area
 └── renderers/            ← render<Feature>View() functions — one file per feature area

.agents/skills/component-view-test/references/writing-tests.md

@@ -195,6 +195,38 @@ const defaultBridgeWithTokens = (overrides?: Record<string, unknown>) => {
 
 Then each test only specifies its delta from this baseline.
 
+### describe / it and platform (iOS + Android)
+
+Import from `tests/component-view/platform`. All helpers accept an optional **filter** (3rd arg): `'ios'` | `'android'` | `['ios','android']` | `{ only: 'ios' }` | `{ skip: ['android'] }`. Env: `TEST_OS=ios` or `TEST_OS=android` to run only one OS.
+
+| Helper                                                                  | Use                                                                                                           |
+| ----------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- |
+| `describeForPlatforms(name, define, filter?)`                           | One describe per OS. Inside, `define({ os })`; use `it()` or `itForPlatforms()` — each runs once per that OS. |
+| `itForPlatforms(name, (ctx) => {}, filter?)`                            | One `it` per OS. Callback receives `{ os }`.                                                                  |
+| `itOnlyForPlatforms(name, fn, filter?)`                                 | Same as `itForPlatforms` but registers `it.only`.                                                             |
+| `itEach(table)(name, (row) => {}, filter?)`                             | One `it` per table row × per OS. Use `$key` in name to interpolate row fields.                                |
+| `describeEach(table)(name, (row) => { it('...', () => {}); }, filter?)` | One describe per row × per OS. Use `$key` in name.                                                            |
+| `getTargetPlatforms(filter?)`                                           | Returns `['ios','android']` (or filtered list) for custom loops.                                              |
+
+Example — `itEach` (each case runs on iOS and Android):
+
+```typescript
+import { itEach } from '../../../../../../tests/component-view/platform';
+
+const cases = [
+  { name: 'renders empty', amount: '0' },
+  { name: 'displays fiat', amount: '1' },
+];
+itEach(cases)('$name', ({ amount }) => {
+  const { findByDisplayValue } = renderDefault({
+    bridge: { sourceAmount: amount },
+  });
+  expect(findByDisplayValue(amount)).toBeOnTheScreen();
+});
+```
+
+Jest modifiers (`it.only`, `it.skip`, `describe.only`, `describe.skip`) work as usual inside these blocks.
+
 ### Minimal template
 
 ```typescript

.github/workflows/nightly-build.yml

@@ -7,6 +7,11 @@ name: Nightly Build
 # [skip ci] commits (e.g. version bumps pushed via update-latest-build-version.yml)
 # are automatically skipped by GitHub Actions, so this workflow will NOT
 # double-trigger on those commits.
+#
+# Version strategy: exp and rc builds share the same bundle ID (MetaMask) so
+# TestFlight requires unique CFBundleVersion per upload. We call the external
+# version generator once (→ version N for exp), then locally increment to N+1
+# for the rc build. Both builds run in parallel after their respective bumps.
 
 on:
   push:
@@ -20,8 +25,8 @@ permissions:
   id-token: write
 
 jobs:
-  bump-version:
-    name: Bump build version
+  bump-version-exp:
+    name: Bump build version (exp)
     uses: ./.github/workflows/update-latest-build-version.yml
     permissions:
       contents: write
@@ -30,26 +35,59 @@ jobs:
       base-branch: ${{ github.ref_name }}
     secrets: inherit
 
+  bump-version-rc:
+    name: Bump build version (rc)
+    needs: [bump-version-exp]
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    outputs:
+      commit-hash: ${{ steps.bump.outputs.commit-hash }}
+      build-version: ${{ steps.bump.outputs.build-version }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.bump-version-exp.outputs.commit-hash }}
+          fetch-depth: 0
+          token: ${{ secrets.PR_TOKEN || github.token }}
+
+      - name: Increment version for RC build
+        id: bump
+        env:
+          EXP_VERSION: ${{ needs.bump-version-exp.outputs.build-version }}
+          HEAD_REF: ${{ github.ref_name }}
+        run: |
+          RC_VERSION=$((EXP_VERSION + 1))
+          echo "Exp version: $EXP_VERSION → RC version: $RC_VERSION"
+          ./scripts/set-build-version.sh "$RC_VERSION"
+          git config user.name metamaskbot
+          git config user.email metamaskbot@users.noreply.github.com
+          git add bitrise.yml package.json ios/MetaMask.xcodeproj/project.pbxproj android/app/build.gradle
+          git commit -m "[skip ci] Bump version number to ${RC_VERSION} (nightly rc)"
+          git push origin HEAD:"$HEAD_REF" --force-with-lease
+          echo "commit-hash=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
+          echo "build-version=$RC_VERSION" >> "$GITHUB_OUTPUT"
+
   build-exp:
     name: Nightly exp build (main-exp)
-    needs: [bump-version]
+    needs: [bump-version-exp]
     uses: ./.github/workflows/build.yml
     with:
       build_name: main-exp
       platform: both
       skip_version_bump: true
-      ref: ${{ needs.bump-version.outputs.commit-hash }}
+      ref: ${{ needs.bump-version-exp.outputs.commit-hash }}
     secrets: inherit
 
   build-rc:
     name: Nightly RC build (main-rc)
-    needs: [bump-version]
+    needs: [bump-version-rc]
     uses: ./.github/workflows/build.yml
     with:
       build_name: main-rc
       platform: both
       skip_version_bump: true
-      ref: ${{ needs.bump-version.outputs.commit-hash }}
+      ref: ${{ needs.bump-version-rc.outputs.commit-hash }}
     secrets: inherit
 
   upload-exp-testflight:

app/actions/onboarding/index.test.ts

@@ -46,16 +46,32 @@ describe('Onboarding actions', () => {
 
   describe('setAccountType', () => {
     it('creates an action to set accountType', () => {
-      expect(setAccountType(AccountType.Metamask)).toEqual({
+      const onboardingVersion = '7.0.0 (1234)';
+
+      expect(
+        setAccountType({
+          accountType: AccountType.Metamask,
+          onboardingVersion,
+        }),
+      ).toEqual({
         type: SET_ACCOUNT_TYPE,
         accountType: AccountType.Metamask,
+        onboardingVersion,
       });
     });
 
     it('creates an action with social login account type', () => {
-      expect(setAccountType(AccountType.MetamaskGoogle)).toEqual({
+      const onboardingVersion = '7.0.0 (1234)';
+
+      expect(
+        setAccountType({
+          accountType: AccountType.MetamaskGoogle,
+          onboardingVersion,
+        }),
+      ).toEqual({
         type: SET_ACCOUNT_TYPE,
         accountType: AccountType.MetamaskGoogle,
+        onboardingVersion,
       });
     });
   });

app/actions/onboarding/index.ts

@@ -24,6 +24,7 @@ export interface SetCompletedOnboardingAction {
 interface SetAccountTypeAction {
   type: typeof SET_ACCOUNT_TYPE;
   accountType: AccountType;
+  onboardingVersion: string;
 }
 
 interface ClearAccountTypeAction {
@@ -61,10 +62,14 @@ export function setCompletedOnboarding(
   };
 }
 
-export function setAccountType(accountType: AccountType): SetAccountTypeAction {
+export function setAccountType(params: {
+  accountType: AccountType;
+  onboardingVersion: string;
+}): SetAccountTypeAction {
   return {
     type: SET_ACCOUNT_TYPE,
-    accountType,
+    accountType: params.accountType,
+    onboardingVersion: params.onboardingVersion,
   };
 }