Skip to content

Commit 1efae44

Browse files
amandaye0hamandaye0h
authored
Merge branch 'main' into toast/polish-money
2 parents e98cd07 + 27e9062 commit 1efae44

310 files changed

Lines changed: 21767 additions & 3569 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.depcheckrc.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,10 @@ ignores:
140140
- 'react-native-worklets'
141141
# Activated via /** @jest-environment jsdom */ docblock pragma in test files, not imported directly
142142
- 'jest-environment-jsdom'
143+
# Used as the Jest `transform` in jest.config.js, but referenced via the
144+
# array form (['babel-jest', { configFile: ... }]) which depcheck's Jest
145+
# special-parser doesn't recognize (it only detects the plain string form).
146+
- 'babel-jest'
143147

144148
# Used in Yarn plugin for preview builds
145149
- '@yarnpkg/core'

‎.github/workflows/run-appium-smoke-tests-android.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,3 +149,49 @@ jobs:
149149
metamask_environment: ${{ inputs.metamask_environment }}
150150
runner_provider: ${{ inputs.runner_provider }}
151151
secrets: inherit
152+
153+
appium-network-abstractions-android-smoke:
154+
if: >-
155+
${{
156+
!cancelled() &&
157+
(contains(fromJson(inputs.selected_tags), 'ALL') ||
158+
contains(fromJson(inputs.selected_tags), 'SmokeNetworkAbstractions'))
159+
}}
160+
strategy:
161+
matrix:
162+
split: [1]
163+
fail-fast: false
164+
uses: ./.github/workflows/run-appium-e2e-workflow.yml
165+
with:
166+
test-suite-name: appium-network-abstractions-android-smoke
167+
platform: android
168+
test_suite_tag: SmokeNetworkAbstractions
169+
split_number: ${{ matrix.split }}
170+
total_splits: 1
171+
build_type: ${{ inputs.build_type }}
172+
metamask_environment: ${{ inputs.metamask_environment }}
173+
runner_provider: ${{ inputs.runner_provider }}
174+
secrets: inherit
175+
176+
appium-wallet-platform-android-smoke:
177+
if: >-
178+
${{
179+
!cancelled() &&
180+
(contains(fromJson(inputs.selected_tags), 'ALL') ||
181+
contains(fromJson(inputs.selected_tags), 'SmokeWalletPlatform'))
182+
}}
183+
strategy:
184+
matrix:
185+
split: [1]
186+
fail-fast: false
187+
uses: ./.github/workflows/run-appium-e2e-workflow.yml
188+
with:
189+
test-suite-name: appium-wallet-platform-android-smoke
190+
platform: android
191+
test_suite_tag: SmokeWalletPlatform
192+
split_number: ${{ matrix.split }}
193+
total_splits: 1
194+
build_type: ${{ inputs.build_type }}
195+
metamask_environment: ${{ inputs.metamask_environment }}
196+
runner_provider: ${{ inputs.runner_provider }}
197+
secrets: inherit

‎.github/workflows/run-appium-smoke-tests-ios.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,3 +128,49 @@ jobs:
128128
metamask_environment: ${{ inputs.metamask_environment || 'e2e' }}
129129
runner_provider: ${{ inputs.runner_provider || 'current' }}
130130
secrets: inherit
131+
132+
appium-network-abstractions-ios-smoke:
133+
if: >-
134+
${{
135+
!cancelled() &&
136+
(contains(fromJson(inputs.selected_tags || '["ALL"]'), 'ALL') ||
137+
contains(fromJson(inputs.selected_tags || '["ALL"]'), 'SmokeNetworkAbstractions'))
138+
}}
139+
strategy:
140+
matrix:
141+
split: [1]
142+
fail-fast: false
143+
uses: ./.github/workflows/run-appium-e2e-workflow.yml
144+
with:
145+
test-suite-name: appium-network-abstractions-ios-smoke
146+
platform: ios
147+
test_suite_tag: SmokeNetworkAbstractions
148+
split_number: ${{ matrix.split }}
149+
total_splits: 1
150+
build_type: ${{ inputs.build_type || 'main' }}
151+
metamask_environment: ${{ inputs.metamask_environment || 'e2e' }}
152+
runner_provider: ${{ inputs.runner_provider || 'current' }}
153+
secrets: inherit
154+
155+
appium-wallet-platform-ios-smoke:
156+
if: >-
157+
${{
158+
!cancelled() &&
159+
(contains(fromJson(inputs.selected_tags || '["ALL"]'), 'ALL') ||
160+
contains(fromJson(inputs.selected_tags || '["ALL"]'), 'SmokeWalletPlatform'))
161+
}}
162+
strategy:
163+
matrix:
164+
split: [1]
165+
fail-fast: false
166+
uses: ./.github/workflows/run-appium-e2e-workflow.yml
167+
with:
168+
test-suite-name: appium-wallet-platform-ios-smoke
169+
platform: ios
170+
test_suite_tag: SmokeWalletPlatform
171+
split_number: ${{ matrix.split }}
172+
total_splits: 1
173+
build_type: ${{ inputs.build_type || 'main' }}
174+
metamask_environment: ${{ inputs.metamask_environment || 'e2e' }}
175+
runner_provider: ${{ inputs.runner_provider || 'current' }}
176+
secrets: inherit

‎.storybook/storybook.requires.js‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/__mocks__/rive-react-native.tsx‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ const RiveMock = forwardRef<RiveRef, MockRiveProps>(
8181
// eslint-disable-next-line react-hooks/exhaustive-deps
8282
}, []);
8383

84-
return <View testID={testID} {...viewProps} />;
84+
return (
85+
<View testID={testID} {...({ onPlay } as ViewProps)} {...viewProps} />
86+
);
8587
},
8688
);
8789

@@ -95,6 +97,21 @@ const Alignment = {
9597
Center: 'center',
9698
} as const;
9799

100+
/** Mirrors `RNRiveErrorType` from rive-react-native for module-level error classification. */
101+
export const RNRiveErrorType = {
102+
FileNotFound: 'FileNotFound',
103+
UnsupportedRuntimeVersion: 'UnsupportedRuntimeVersion',
104+
IncorrectRiveFileUrl: 'IncorrectRiveFileUrl',
105+
IncorrectAnimationName: 'IncorrectAnimationName',
106+
MalformedFile: 'MalformedFile',
107+
IncorrectArtboardName: 'IncorrectArtboardName',
108+
IncorrectStateMachineName: 'IncorrectStateMachineName',
109+
IncorrectStateMachineInput: 'IncorrectStateMachineInput',
110+
TextRunNotFoundError: 'TextRunNotFoundError',
111+
DataBindingError: 'DataBindingError',
112+
UnusedReferencedAssetError: 'UnusedReferencedAssetError',
113+
} as const;
114+
98115
export const __getLastMockedMethods = (): RiveRef | undefined =>
99116
lastMockedMethods;
100117

‎app/animations/onboarding_nux_v6.riv‎

880 KB
Binary file not shown.

‎app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.styles.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ const styleSheet = (params: {
4949
},
5050
container: Object.assign(
5151
{
52-
backgroundColor: theme.colors.background.default,
5352
flexDirection: 'row',
5453
alignItems: 'center',
5554
opacity: isDisabled ? 0.5 : 1,

‎app/component-library/components/Pickers/PickerNetwork/PickerNetwork.styles.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const styleSheet = (params: {
3131
paddingHorizontal: 8,
3232
flexDirection: 'row',
3333
alignItems: 'center',
34-
backgroundColor: colors.background.alternative,
34+
backgroundColor: colors.background.muted,
3535
alignSelf: 'center',
3636
} as ViewStyle,
3737
style,

‎app/components/Nav/Main/MainNavigator.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,10 @@ import {
151151
} from '../../UI/MarketInsights';
152152
import { selectMarketInsightsPerpsEnabled } from '../../../selectors/featureFlagController/marketInsights';
153153
import {
154-
TopTradersView,
154+
SocialTradersView,
155155
TraderProfileView,
156156
TraderPositionView,
157+
SocialLeaderboardOnboarding,
157158
TradingSignalsSetupBottomSheet,
158159
} from '../../Views/SocialLeaderboard';
159160
import { selectSocialLeaderboardEnabled } from '../../../selectors/featureFlagController/socialLeaderboard';
@@ -1382,7 +1383,7 @@ const MainNavigator = () => {
13821383
{isSocialLeaderboardEnabled && (
13831384
<NativeStack.Screen
13841385
name={Routes.SOCIAL_LEADERBOARD.VIEW}
1385-
component={TopTradersView}
1386+
component={SocialTradersView}
13861387
options={{ headerShown: false, ...slideFromRightNativeOptions }}
13871388
/>
13881389
)}
@@ -1400,6 +1401,13 @@ const MainNavigator = () => {
14001401
options={{ headerShown: false, ...slideFromRightNativeOptions }}
14011402
/>
14021403
)}
1404+
{isSocialLeaderboardEnabled && (
1405+
<NativeStack.Screen
1406+
name={Routes.SOCIAL_LEADERBOARD.ONBOARDING}
1407+
component={SocialLeaderboardOnboarding}
1408+
options={{ headerShown: false, ...slideFromRightNativeOptions }}
1409+
/>
1410+
)}
14031411
{isSocialLeaderboardEnabled && (
14041412
<NativeStack.Screen
14051413
name={Routes.SOCIAL_LEADERBOARD.TRADING_SIGNALS_SETUP}

‎app/components/Nav/Main/MainNavigator.test.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,7 @@ describe('MainNavigator', () => {
11951195
});
11961196
});
11971197

1198-
it('includes TopTradersView screen when Social Leaderboard remote flag is enabled', () => {
1198+
it('includes SocialTradersView screen when Social Leaderboard remote flag is enabled', () => {
11991199
const stateWithSocialLeaderboard = {
12001200
...initialRootState,
12011201
engine: {
@@ -1244,7 +1244,7 @@ describe('MainNavigator', () => {
12441244
);
12451245

12461246
expect(topTradersScreen).toBeDefined();
1247-
expect(topTradersScreen?.component.name).toBe('TopTradersView');
1247+
expect(topTradersScreen?.component.name).toBe('SocialTradersView');
12481248
});
12491249

12501250
describe('Inner navigator component rendering', () => {

0 commit comments

Comments
 (0)