Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
eec7e83
feat: new welcome screen - let get started
ieow May 23, 2025
d3ece02
Merge branch 'feat/srp-onboarding-carousel-tnc' into feat/new-srp-wel…
chaitanyapotti May 27, 2025
996320c
fix: address comment
ieow May 27, 2025
6ce2a1e
fix: save tracking event prior optin screen
ieow May 27, 2025
e42821b
fix: revert deleted css
ieow May 27, 2025
23bf427
Merge branch 'feat/srp-onboarding-carousel-tnc' into feat/new-srp-wel…
chaitanyapotti May 28, 2025
988cbba
Fix: Onboarding Test Case Update
smgv May 28, 2025
b3dfb94
Fix: Navbar Test Case Updated
smgv May 28, 2025
2625861
Merge branch 'feat/srp-onboarding-carousel-tnc' into feat/new-srp-wel…
hieu-w May 29, 2025
c49992f
test: e2e quarantine "send eth test"
hieu-w May 29, 2025
d3db0a9
Merge branch 'feat/srp-onboarding-carousel-tnc' into feat/new-srp-wel…
hieu-w May 29, 2025
ea2c682
Merge branch 'feat/srp-onboarding-carousel-tnc' into feat/new-srp-wel…
hieu-w May 29, 2025
f38417f
test: use launchApp instead openURL w only support iOS
hieu-w May 28, 2025
eaff293
test: update Matcher for importSeedButton
hieu-w May 29, 2025
faf895b
test: handle case when MetricsOptin not shown
hieu-w May 29, 2025
baf9139
test: skip sync account srp test until implemented
hieu-w May 29, 2025
6eed8cc
feat: revert optin metric navigation.
ieow May 30, 2025
846295d
feat: revert SRP util to previous, will modify flow later
hieu-w May 30, 2025
3622495
test: revert skip test in account-syncing
hieu-w May 30, 2025
9be7048
Merge branch 'feat/srp-onboarding-carousel-tnc' into feat/new-srp-wel…
hieu-w May 30, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/animations/Searching_Fox.json

Large diffs are not rendered by default.

35 changes: 23 additions & 12 deletions app/components/UI/Navbar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -684,30 +684,40 @@ export function getOnboardingNavbarOptions(
* Function that returns a transparent navigation options for our onboarding screens.
*
* @returns {Object} - Corresponding navbar options containing headerTitle
* @param {Object} themeColors - The theme colors object
* @param {string} backgroundColor - The color to overwrite the background color
* @param {boolean} showLogo - Whether to show the logo
* @param {string} logoColor - The color to overwrite the logo color
*/
export function getTransparentOnboardingNavbarOptions(themeColors) {
export function getTransparentOnboardingNavbarOptions(
themeColors,
backgroundColor = undefined,
showLogo = true,
logoColor = undefined,
) {
const innerStyles = StyleSheet.create({
headerStyle: {
backgroundColor: themeColors.background.default,
backgroundColor: backgroundColor || themeColors.background.default,
shadowColor: importedColors.transparent,
elevation: 0,
},
metamaskName: {
width: 70,
height: 35,
tintColor: themeColors.text.default,
tintColor: logoColor || themeColors.text.default,
},
});
return {
headerTitle: () => (
<View style={styles.metamaskNameTransparentWrapper}>
<Image
source={metamask_name}
style={innerStyles.metamaskName}
resizeMethod={'auto'}
/>
</View>
),
headerTitle: () =>
showLogo ? (
<View style={styles.metamaskNameTransparentWrapper}>
<Image
source={metamask_name}
style={innerStyles.metamaskName}
resizeMethod={'auto'}
/>
</View>
) : null,
headerLeft: () => <View />,
headerRight: () => <View />,
headerStyle: innerStyles.headerStyle,
Expand Down Expand Up @@ -752,6 +762,7 @@ export function getOnboardingCarouselNavbarOptions(currentTabColor) {
* Function that returns a transparent navigation options for our onboarding screens.
*
* @returns {Object} - Corresponding navbar options containing headerTitle and a back button
* @param {Object} themeColors - The theme colors object
*/
export function getTransparentBackOnboardingNavbarOptions(themeColors) {
const innerStyles = StyleSheet.create({
Expand Down
12 changes: 12 additions & 0 deletions app/components/UI/Navbar/index.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
getDepositNavbarOptions,
getNetworkNavbarOptions,
getOnboardingCarouselNavbarOptions,
getTransparentOnboardingNavbarOptions,
} from '.';
import { mockTheme } from '../../../util/theme';
import Device from '../../../util/device';
Expand Down Expand Up @@ -107,4 +108,15 @@ describe('getDepositNavbarOptions', () => {
expect(options).toBeDefined();
expect(options.headerStyle.backgroundColor).toBe('red');
});

it('handles getTransparentOnboardingNavbarOptions', () => {
const options = getTransparentOnboardingNavbarOptions(
mockTheme,
'red',
true,
'blue',
);
expect(options).toBeDefined();
expect(options.headerStyle.backgroundColor).toBe('red');
});
});
Loading
Loading