Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
93ae2ab
Add floating RHP styles: inset, radius, border, shadow, gradient scri…
shawnborton Aug 20, 2026
94ec3a3
Merge remote-tracking branch 'origin/main' into shawn-modals
shawnborton Aug 20, 2026
43c3151
Merge remote-tracking branch 'origin/main' into shawn-modals
shawnborton Aug 26, 2026
42b7c41
Merge remote-tracking branch 'origin/main' into shawn-modals
shawnborton Aug 27, 2026
8c9baca
Refine mobile spacing and typography across Home, Spend, Workspaces, …
shawnborton Sep 2, 2026
7faae0c
Merge remote-tracking branch 'origin/main' into shawn-labels
shawnborton Sep 2, 2026
c55ddb4
Dock RHP report, expense, and skinny 12px from the right, fade them i…
shawnborton Sep 2, 2026
c4b0469
Add help popover menu, coin animation, and bottom tab bar shadow on Home
shawnborton Sep 2, 2026
dd93ec6
Border centered alert modals on wide, product200 scrim and L3 fade, h…
shawnborton Sep 2, 2026
1cca1a1
Keep the bottom tab bar shadow clear of the iOS safe area
shawnborton Sep 2, 2026
76d1802
Revert custom fade and RHP h2 titles, restore L3 slide, center and re…
shawnborton Sep 3, 2026
7b6ebce
Refine Home card titles, radii, header height, and the Concierge help…
shawnborton Sep 3, 2026
3a5af6f
Swap Concierge top-right icon and dismiss only L3 when tapping outsid…
shawnborton Sep 3, 2026
67f3c6f
Use 12px mobile page insets and shrink card illustrations to 80%
shawnborton Sep 3, 2026
9514727
Add drifting clouds behind the Concierge card and icons to the Inbox …
shawnborton Sep 4, 2026
28c433e
Make bottom-docked popovers a rounded inset floater, add layered sear…
shawnborton Sep 4, 2026
91caae4
Unify RHP modal entrance to subtle slide-and-fade across all levels
shawnborton Sep 5, 2026
fb04092
Set wide expense view right pane width to 460px
shawnborton Sep 7, 2026
02b2cee
Use hairline table separators on mobile
shawnborton Sep 8, 2026
5de2cbb
Merge remote-tracking branch 'origin/main' into shawn-labels
shawnborton Sep 8, 2026
b57ed65
Merge remote-tracking branch 'origin/shawn-modals' into shawn-labels
shawnborton Sep 8, 2026
59a1577
Reconcile the combined branch after merging main and the floating RHP…
shawnborton Sep 8, 2026
e68bc72
Merge remote-tracking branch 'origin/main' into shawn-labels
shawnborton Sep 8, 2026
dac0ceb
Soften the bottom tab bar shadow
shawnborton Sep 9, 2026
83c95f3
Float the mobile bottom tab bar with native background blur
shawnborton Sep 10, 2026
e389b4a
Merge remote-tracking branch 'origin/main' into shawn-labels
shawnborton Sep 10, 2026
e619a47
Hide the Home to-dos empty state on narrow layout
shawnborton Sep 10, 2026
2481dbe
Paint the floating tab bar tint above the blur so native matches the …
shawnborton Sep 10, 2026
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 assets/images/clouds.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/images/concierge.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 10 additions & 18 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ PODS:
- ExpoModulesCore
- ExpoAudio (57.0.3):
- ExpoModulesCore
- ExpoBlur (57.0.2):
- ExpoModulesCore
- ExpoDomWebView (57.0.1):
- ExpoModulesCore
- ExpoFont (57.0.1):
Expand Down Expand Up @@ -571,7 +573,6 @@ PODS:
- React-jsinspectorcdp
- React-jsitooling
- React-perflogger
- React-rendererconsistency
- React-runtimeexecutor
- React-runtimescheduler
- React-utils
Expand All @@ -597,7 +598,6 @@ PODS:
- React-jsinspectorcdp
- React-jsitooling
- React-perflogger
- React-rendererconsistency
- React-runtimeexecutor
- React-runtimescheduler
- React-utils
Expand All @@ -622,7 +622,6 @@ PODS:
- React-jsinspectorcdp
- React-jsitooling
- React-perflogger
- React-rendererconsistency
- React-runtimeexecutor
- React-runtimescheduler
- React-utils
Expand All @@ -649,7 +648,6 @@ PODS:
- React-jsinspectorcdp
- React-jsitooling
- React-perflogger
- React-rendererconsistency
- React-runtimeexecutor
- React-runtimescheduler
- React-utils
Expand All @@ -675,7 +673,6 @@ PODS:
- React-jsinspectorcdp
- React-jsitooling
- React-perflogger
- React-rendererconsistency
- React-runtimeexecutor
- React-runtimescheduler
- React-utils
Expand All @@ -701,7 +698,6 @@ PODS:
- React-jsinspectorcdp
- React-jsitooling
- React-perflogger
- React-rendererconsistency
- React-runtimeexecutor
- React-runtimescheduler
- React-utils
Expand All @@ -727,7 +723,6 @@ PODS:
- React-jsinspectorcdp
- React-jsitooling
- React-perflogger
- React-rendererconsistency
- React-runtimeexecutor
- React-runtimescheduler
- React-utils
Expand All @@ -753,7 +748,6 @@ PODS:
- React-jsinspectorcdp
- React-jsitooling
- React-perflogger
- React-rendererconsistency
- React-runtimeexecutor
- React-runtimescheduler
- React-utils
Expand All @@ -779,7 +773,6 @@ PODS:
- React-jsinspectorcdp
- React-jsitooling
- React-perflogger
- React-rendererconsistency
- React-runtimeexecutor
- React-runtimescheduler
- React-utils
Expand All @@ -805,7 +798,6 @@ PODS:
- React-jsinspectorcdp
- React-jsitooling
- React-perflogger
- React-rendererconsistency
- React-runtimeexecutor
- React-runtimescheduler
- React-utils
Expand All @@ -831,7 +823,6 @@ PODS:
- React-jsinspectorcdp
- React-jsitooling
- React-perflogger
- React-rendererconsistency
- React-runtimeexecutor
- React-runtimescheduler
- React-utils
Expand All @@ -857,7 +848,6 @@ PODS:
- React-jsinspectorcdp
- React-jsitooling
- React-perflogger
- React-rendererconsistency
- React-runtimeexecutor
- React-runtimescheduler
- React-utils
Expand All @@ -883,7 +873,6 @@ PODS:
- React-jsinspectorcdp
- React-jsitooling
- React-perflogger
- React-rendererconsistency
- React-runtimeexecutor
- React-runtimescheduler
- React-utils
Expand All @@ -909,7 +898,6 @@ PODS:
- React-jsinspectorcdp
- React-jsitooling
- React-perflogger
- React-rendererconsistency
- React-runtimeexecutor
- React-runtimescheduler
- React-utils
Expand Down Expand Up @@ -4459,6 +4447,7 @@ DEPENDENCIES:
- Expo (from `../node_modules/expo`)
- ExpoAsset (from `../node_modules/expo-asset/ios`)
- ExpoAudio (from `../node_modules/expo-audio/ios`)
- ExpoBlur (from `../node_modules/expo-blur/ios`)
- "ExpoDomWebView (from `../node_modules/@expo/dom-webview/ios`)"
- ExpoFont (from `../node_modules/expo-font/ios`)
- ExpoImage (from `../node_modules/expo-image/ios`)
Expand Down Expand Up @@ -4671,6 +4660,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/expo-asset/ios"
ExpoAudio:
:path: "../node_modules/expo-audio/ios"
ExpoBlur:
:path: "../node_modules/expo-blur/ios"
ExpoDomWebView:
:path: "../node_modules/@expo/dom-webview/ios"
ExpoFont:
Expand Down Expand Up @@ -4979,6 +4970,7 @@ SPEC CHECKSUMS:
Expo: 1db1ece522ad03f3a2bad1604f0e4460194ebb91
ExpoAsset: 98143758ff37e14c9ff2a4e7673097db00473011
ExpoAudio: b69f36525132edba8d87a715b3a20c678ef78b30
ExpoBlur: 69e67b4fbfed6f7325377af2aefa8aa4f00cd2af
ExpoDomWebView: beaec034e51bd028428b98bb1f2633ab79c6d095
ExpoFont: 59e1faf66ba9bcd232ae1e2ce58d202a48b6f65e
ExpoImage: 4c1e7634db6033185a98959fb028d8d4b1c89695
Expand Down Expand Up @@ -5011,7 +5003,7 @@ SPEC CHECKSUMS:
GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de
GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
GzipSwift: 893f3e48e597a1a4f62fafcb6514220fcf8287fa
hermes-engine: 8992dac2fb037a77b783469d993f59f96167417e
hermes-engine: ba81017f2c3f0165a5e3cbe128f029bd4b0d7289
libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
libdav1d: 23581a4d8ec811ff171ed5e2e05cd27bad64c39f
libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
Expand Down Expand Up @@ -5040,7 +5032,7 @@ SPEC CHECKSUMS:
RCTTypeSafety: 922be6f90a3addd48f57f2066dd90aacec4768b6
React: 2574546f2d017abd14d0c9b48cf2b6a0547c2591
React-callinvoker: b997d4d109c92cae4bc7f1edb08dc6a7c11a1ca2
React-Core: ee317fb557001c3972bcf4fe15996197e65ae54d
React-Core: 5c7a37fd611353c8bf1c12ef24cfdec81ff46549
React-CoreModules: 2ae392df55453fca5602e9bb5bc16a72f36dd961
React-cxxreact: 9a58282eb607fb19d775cfaa8ff9da7be8fc99c5
React-debug: 307f174c04c2e1f51b31c31efcc3e635b1e56453
Expand Down Expand Up @@ -5092,7 +5084,7 @@ SPEC CHECKSUMS:
React-NativeModulesApple: e477c7b5f198235d9de93702ef6b495b87b625bc
React-networking: b90039a00fd63e75a78358ee5fc2ea4b4cbad736
React-oscompat: e3c95718adca6d0e7ca9e5b01a04d057f4aa8f72
React-perflogger: 8712c3310a467e036fceac437dc7f2a4be69e634
React-perflogger: 327334823748e1ecac8cb76e3aa1c072d99146af
React-performancecdpmetrics: 992de932ea38bfc3e49f7b4eba19f6c1aca021bb
React-performancetimeline: a0626b87f948b534b3fb90b696ad11863af94dd8
React-RCTActionSheet: cbe921221b0ca00d2ea586efbaa494bc990260c1
Expand All @@ -5108,7 +5100,7 @@ SPEC CHECKSUMS:
React-RCTSettings: b478cd2ee4091e33bb847edef83c19aa87bf1c45
React-RCTText: 6bae9a5e52ebc012d7bc499542c42285f73d1e1d
React-RCTVibration: 3ddd10141590a1800a1890248b47337d9004b7f4
React-rendererconsistency: d1e82296151f814802c06be35952c9fda99973b1
React-rendererconsistency: 8759d621ba9d2a3139c266d3462bf2e38ccc4b01
React-renderercss: 7b56e138a3d800fa9e17e61cdb3b293d6b8622c6
React-rendererdebug: cf7d7ca70a0b7263df1d49c87970ae6cfe7ce5d0
React-RuntimeApple: 39be405060d5dc5d1f9e4ee4e24ad09cd079a5db
Expand Down
12 changes: 12 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
"expo": "57.0.8",
"expo-asset": "57.0.7",
"expo-audio": "57.0.3",
"expo-blur": "~57.0.2",
"expo-font": "57.0.1",
"expo-image": "57.0.1",
"expo-image-manipulator": "57.0.6",
Expand Down
1 change: 1 addition & 0 deletions src/CONST/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2145,6 +2145,7 @@ const CONST = {
CENTERED_UNSWIPEABLE: 'centered_unswipeable',
CENTERED_SMALL: 'centered_small',
BOTTOM_DOCKED: 'bottom_docked',
BOTTOM_DOCKED_INSET: 'bottom_docked_inset',
POPOVER: 'popover',
RIGHT_DOCKED: 'right_docked',
FULLSCREEN: 'fullscreen',
Expand Down
37 changes: 29 additions & 8 deletions src/components/AccountSwitcher.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -260,41 +260,62 @@ function AccountSwitcher({isScreenFocused}: AccountSwitcherProps) {
clearDelegatorErrors({delegatedAccess: account?.delegatedAccess});
};

// On mobile the account header stacks vertically and centers, mirroring a user's Details view.
const displayNameStyle = shouldUseNarrowLayout ? [styles.textHeadlineH1, styles.textAlignCenter] : [styles.textBold, styles.textLarge, styles.flexShrink1, styles.lineHeightXLarge];

return (
<>
<View style={[styles.flexRow, styles.gap3, styles.alignItemsCenter, styles.flexGrow1, styles.flex1, styles.mnw0]}>
<View style={[styles.flexRow, styles.gap3, styles.alignItemsCenter, styles.flex1, styles.flexShrink1, styles.mnw0, styles.justifyContentCenter]}>
<View
style={
shouldUseNarrowLayout
? [styles.alignItemsCenter, styles.gap4, styles.w100]
: [styles.flexRow, styles.gap3, styles.alignItemsCenter, styles.flexGrow1, styles.flex1, styles.mnw0]
}
>
<View
style={
shouldUseNarrowLayout
? [styles.alignItemsCenter, styles.gap3, styles.w100]
: [styles.flexRow, styles.gap3, styles.alignItemsCenter, styles.flex1, styles.flexShrink1, styles.mnw0, styles.justifyContentCenter]
}
>
<UserAvatar
size={CONST.AVATAR_SIZE.DEFAULT}
size={shouldUseNarrowLayout ? CONST.AVATAR_SIZE.XXXX_LARGE : CONST.AVATAR_SIZE.DEFAULT}
accountID={currentUserPersonalDetails.accountID}
source={currentUserPersonalDetails.avatar}
fallbackIcon={currentUserPersonalDetails.fallbackIcon}
/>
<View style={[styles.flex1, styles.flexShrink1, styles.flexBasis0, styles.justifyContentCenter, styles.gap1]}>
<View
style={
shouldUseNarrowLayout
? [styles.alignItemsCenter, styles.gap1, styles.w100]
: [styles.flex1, styles.flexShrink1, styles.flexBasis0, styles.justifyContentCenter, styles.gap1]
}
>
{doesDisplayNameContainEmojis ? (
<Text numberOfLines={1}>
<TextWithEmojiFragment
message={displayName}
style={[styles.textBold, styles.textLarge, styles.flexShrink1, styles.lineHeightXLarge]}
style={displayNameStyle}
/>
</Text>
) : (
<Text
numberOfLines={1}
style={[styles.textBold, styles.textLarge, styles.flexShrink1, styles.lineHeightXLarge]}
style={displayNameStyle}
>
{formatPhoneNumber(displayName)}
</Text>
)}
<Text
numberOfLines={1}
style={[styles.colorMuted, styles.fontSizeLabel]}
style={[styles.colorMuted, styles.fontSizeLabel, shouldUseNarrowLayout && styles.textAlignCenter]}
>
{Str.removeSMSDomain(currentUserPersonalDetails.login ?? '')}
</Text>
{!!isDebugModeEnabled && (
<Text
style={[styles.textLabelSupporting, styles.mt1, styles.w100]}
style={[styles.textLabelSupporting, styles.mt1, styles.w100, shouldUseNarrowLayout && styles.textAlignCenter]}
numberOfLines={1}
>
AccountID: {accountID}
Expand Down
3 changes: 3 additions & 0 deletions src/components/Avatar/primitives/AvatarImage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ function AvatarImage({avatarSource, size, shape, imageStyles, imageContainerAddi
<View style={[imageContainerStyle, StyleUtils.getAvatarBorderStyle(size, shape), imageContainerAdditionalStyles]}>
{/* eslint-disable-next-line react-native-a11y/has-valid-accessibility-ignores-invert-colors -- Custom Image wrapper does not support this prop. */}
<Image
// Image is memoized on `source` alone, so a style-only change (a responsive avatar resizing) never
// reaches it. Keying by size remounts it instead, which the memory-disk cache makes cheap.
key={size}
source={{uri: avatarSource}}
style={imageStyle}
onError={onImageError}
Expand Down
Loading
Loading