Skip to content

Commit 129a490

Browse files
authored
Merge branch 'Expensify:main' into feat/82794
2 parents 0614866 + ef87510 commit 129a490

192 files changed

Lines changed: 3030 additions & 2128 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.

Mobile-Expensify

__mocks__/Illustrations.ts

Lines changed: 0 additions & 241 deletions
This file was deleted.

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ android {
111111
minSdkVersion rootProject.ext.minSdkVersion
112112
targetSdkVersion rootProject.ext.targetSdkVersion
113113
multiDexEnabled rootProject.ext.multiDexEnabled
114-
versionCode 1009034902
115-
versionName "9.3.49-2"
114+
versionCode 1009035002
115+
versionName "9.3.50-2"
116116
// Supported language variants must be declared here to avoid from being removed during the compilation.
117117
// This also helps us to not include unnecessary language variants in the APK.
118118
resConfigs "en", "es"

assets/images/product-illustrations/topiary-dollar-sign.svg

Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

config/webpack/webpack.common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
9999
mode: isDevelopment ? 'development' : 'production',
100100
devtool: 'source-map',
101101
entry: {
102-
main: ['babel-polyfill', './index.js'],
102+
main: './index.js',
103103
},
104104
output: {
105105
// Use simple filenames in development to prevent memory leaks from contenthash changes

contributingGuides/LAZY_ICONS_AND_ILLUSTRATIONS.md

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -173,89 +173,3 @@ Check `src/components/Icon/chunks/expensify-icons.chunk.ts` for the complete lis
173173
MyNewIcon,
174174
};
175175
```
176-
177-
## Migration Guide
178-
179-
### Migrating Existing Code
180-
181-
If you're migrating existing code from direct loading to lazy loading:
182-
183-
#### Step-by-Step Migration Process
184-
185-
1. **Identify Direct Imports**
186-
- Search for imports from `@components/Icon/Illustrations` or `@components/Icon/Expensicons`
187-
- Run `npm run check-lazy-loading` to automatically detect all files that need migration
188-
189-
190-
2. **Replace with Lazy Loading**
191-
192-
**Before (Direct):**
193-
```tsx
194-
import {Building} from '@components/Icon/Illustrations';
195-
196-
function Component() {
197-
return <Icon src={Building} />;
198-
}
199-
```
200-
201-
**After (Lazy - Single Asset):**
202-
```tsx
203-
import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
204-
205-
function Component() {
206-
const illustrations = useMemoizedLazyIllustrations(['Building']);
207-
return <Icon src={illustrations.Building} />;
208-
}
209-
```
210-
211-
**Before (Multiple Direct Imports):**
212-
```tsx
213-
import {Building, Tag, Coins} from '@components/Icon/Illustrations';
214-
215-
function Component() {
216-
return (
217-
<View>
218-
<Icon src={Building} />
219-
<Icon src={Tag} />
220-
<Icon src={Coins} />
221-
</View>
222-
);
223-
}
224-
```
225-
226-
**After (Lazy - Multiple Assets):**
227-
```tsx
228-
import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
229-
230-
function Component() {
231-
const illustrations = useMemoizedLazyIllustrations(['Building', 'Tag', 'Coins']);
232-
return (
233-
<View>
234-
<Icon src={illustrations.Building} />
235-
<Icon src={illustrations.Tag} />
236-
<Icon src={illustrations.Coins} />
237-
</View>
238-
);
239-
}
240-
```
241-
242-
3. **Handle Namespace Imports**
243-
244-
**Before (Namespace Import):**
245-
```tsx
246-
import * as Expensicons from '@components/Icon/Expensicons';
247-
248-
function Component() {
249-
return <Icon src={Expensicons.Home} />;
250-
}
251-
```
252-
253-
**After (Lazy):**
254-
```tsx
255-
import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
256-
257-
function Component() {
258-
const icons = useMemoizedLazyExpensifyIcons(['Home']);
259-
return <Icon src={icons.Home} />;
260-
}
261-
```

contributingGuides/OBSERVABILITY.md

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,7 @@ The difference is that the latter adds a `canceled` attribute to the span indica
6464

6565
### Debugging Spans
6666

67-
Sentry is disabled in development by default. To enable it, add `ENABLE_SENTRY_ON_DEV=true` to your `.env` file. This activates an internal debug transport that logs span data locally instead of sending it to Sentry.
68-
69-
To view spans in the DevConsole, go to **Account → Troubleshoot → Log Sentry requests to console**.
70-
71-
In rare cases where you need to inspect spans directly in the Sentry dashboard, comment out the `transport` line in [`src/setup/telemetry/index.ts`](../src/setup/telemetry/index.ts):
72-
73-
```typescript
74-
Sentry.init({
75-
dsn: CONFIG.SENTRY_DSN,
76-
// transport: isDevelopment() ? makeDebugTransport : undefined,
77-
...
78-
});
79-
```
80-
81-
This sends spans to the real Sentry project instead of the local console.
67+
In development, Sentry is always initialized but does not send data by default. To start sending data to the Sentry dashboard, go to **Account → Troubleshoot** and toggle **Send data to Sentry** ON. To view spans in the DevConsole, toggle **Log Sentry to console** ON.
8268

8369
### Constants
8470

@@ -219,4 +205,4 @@ span.status:ok !has:canceled has:tags[finished_manually,number]
219205
|--------|---------|
220206
| `span.status:ok` | Only show spans that completed without errors |
221207
| `!has:canceled` | Exclude spans abandoned mid-flight (e.g. user navigated away) |
222-
| `has:finished_manually` | Only show spans finished by our instrumentation, not auto-collected ones |
208+
| `has:finished_manually` | Only show spans finished by our instrumentation, not auto-collected ones |

0 commit comments

Comments
 (0)