Skip to content

Commit e040571

Browse files
committed
Merge branch 'main' into fix/71209-chat-report-is-displayed-when-starting-new-chat
2 parents 19f8716 + 2643aa8 commit e040571

199 files changed

Lines changed: 5217 additions & 2053 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 & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,22 @@
11
const Abracadabra = 'Abracadabra';
2-
const BankArrowPink = 'BankArrowPink';
3-
const BankMouseGreen = 'BankMouseGreen';
4-
const BankUserGreen = 'BankUserGreen';
5-
const BigRocket = 'BigRocket';
62
const BrokenMagnifyingGlass = 'BrokenMagnifyingGlass';
73
const ChatBubbles = 'ChatBubbles';
8-
const CoffeeMug = 'CoffeeMug';
9-
const ConciergeBlue = 'ConciergeBlue';
10-
const ConciergeExclamation = 'ConciergeExclamation';
11-
const CreditCardsBlue = 'CreditCardsBlue';
124
const EmailAddress = 'EmailAddress';
135
const EmptyCardState = 'EmptyCardState';
146
const EmptyStateExpenses = 'EmptyStateExpenses';
157
const EnvelopeReceipt = 'EnvelopeReceipt';
168
const FolderOpen = 'FolderOpen';
179
const HandCard = 'HandCard';
18-
const HotDogStand = 'HotDogStand';
19-
const InvoiceOrange = 'InvoiceOrange';
20-
const JewelBoxBlue = 'JewelBoxBlue';
21-
const JewelBoxGreen = 'JewelBoxGreen';
2210
const PaymentHands = 'PaymentHands';
23-
const JewelBoxPink = 'JewelBoxPink';
24-
const JewelBoxYellow = 'JewelBoxYellow';
2511
const MagicCode = 'MagicCode';
2612
const Mailbox = 'Mailbox';
27-
const MoneyEnvelopeBlue = 'MoneyEnvelopeBlue';
28-
const MoneyMousePink = 'MoneyMousePink';
2913
const MushroomTopHat = 'MushroomTopHat';
30-
const ReceiptsSearchYellow = 'ReceiptsSearchYellow';
31-
const ReceiptYellow = 'ReceiptYellow';
3214
const ReceiptWrangler = 'ReceiptWrangler';
3315
const RocketBlue = 'RocketBlue';
34-
const RocketOrange = 'RocketOrange';
35-
const SanFrancisco = 'SanFrancisco';
36-
const SafeBlue = 'SafeBlue';
37-
const SmallRocket = 'SmallRocket';
38-
const TadaYellow = 'TadaYellow';
39-
const TadaBlue = 'TadaBlue';
4016
const ToddBehindCloud = 'ToddBehindCloud';
4117
const ToddWithPhones = 'ToddWithPhones';
42-
const GpsTrackOrange = 'GpsTrackOrange';
4318
const ShieldYellow = 'ShieldYellow';
4419
const MoneyReceipts = 'MoneyReceipts';
45-
const PinkBill = 'PinkBill';
4620
const CreditCardsNew = 'CreditCardsNew';
4721
const CreditCardsNewGreen = 'CreditCardsNewGreen';
4822
const InvoiceBlue = 'InvoiceBlue';
@@ -51,20 +25,13 @@ const LockOpen = 'LockOpen';
5125
const Luggage = 'Luggage';
5226
const MoneyIntoWallet = 'MoneyIntoWallet';
5327
const MoneyWings = 'MoneyWings';
54-
const OpenSafe = 'OpenSafe';
55-
const TrackShoe = 'TrackShoe';
56-
const BankArrow = 'BankArrow';
5728
const ConciergeBubble = 'ConciergeBubble';
58-
const ConciergeNew = 'ConciergeNew';
59-
const MoneyBadge = 'MoneyBadge';
6029
const TreasureChest = 'TreasureChest';
6130
const ThumbsUpStars = 'ThumbsUpStars';
6231
const Hands = 'Hands';
63-
const HandEarth = 'HandEarth';
6432
const SmartScan = 'SmartScan';
6533
const Hourglass = 'Hourglass';
6634
const CommentBubbles = 'CommentBubbles';
67-
const CommentBubblesBlue = 'CommentBubblesBlue';
6835
const TrashCan = 'TrashCan';
6936
const TeleScope = 'TeleScope';
7037
const Profile = 'Profile';
@@ -75,9 +42,7 @@ const Gears = 'Gears';
7542
const QRCode = 'QRCode';
7643
const RealtimeReport = 'RealtimeReport';
7744
const HoldExpense = 'HoldExpense';
78-
const ReceiptEnvelope = 'ReceiptEnvelope';
7945
const Approval = 'Approval';
80-
const WalletAlt = 'WalletAlt';
8146
const Workflows = 'Workflows';
8247
const PendingBank = 'PendingBank';
8348
const ThreeLeggedLaptopWoman = 'ThreeLeggedLaptopWoman';
@@ -102,12 +67,10 @@ const Tag = 'Tag';
10267
const CarIce = 'CarIce';
10368
const ReceiptLocationMarker = 'ReceiptLocationMarker';
10469
const Lightbulb = 'Lightbulb';
105-
const EmptyStateTravel = 'EmptyStateTravel';
10670
const Stopwatch = 'Stopwatch';
10771
const SubscriptionAnnual = 'SubscriptionAnnual';
10872
const SubscriptionPPU = 'SubscriptionPPU';
10973
const ExpensifyApprovedLogo = 'ExpensifyApprovedLogo';
110-
const ExpensifyApprovedLogoLight = 'ExpensifyApprovedLogoLight';
11174
const SendMoney = 'SendMoney';
11275
const CheckmarkCircle = 'CheckmarkCircle';
11376
const CreditCardEyes = 'CreditCardEyes';
@@ -116,14 +79,10 @@ const EmptyState = 'EmptyState';
11679
const FolderWithPapers = 'FolderWithPapers';
11780
const VirtualCard = 'VirtualCard';
11881
const Tire = 'Tire';
119-
const BigVault = 'BigVault';
12082
const Filters = 'Filters';
12183
const MagnifyingGlassMoney = 'MagnifyingGlassMoney';
12284
const Rules = 'Rules';
12385
const CompanyCardsEmptyState = 'CompanyCardsEmptyState';
124-
const AmexCompanyCards = 'AmexCompanyCards';
125-
const MasterCardCompanyCards = 'MasterCardCompanyCards';
126-
const VisaCompanyCards = 'VisaCompanyCards';
12786
const CompanyCardsPendingState = 'CompanyCardsPendingState';
12887
const VisaCompanyCardDetail = 'VisaCompanyCardDetail';
12988
const MasterCardCompanyCardDetail = 'MasterCardCompanyCardDetail';
@@ -153,50 +112,24 @@ const ReportReceipt = 'ReportReceipt';
153112

154113
export {
155114
Abracadabra,
156-
BankArrowPink,
157-
BankMouseGreen,
158-
BankUserGreen,
159-
BigRocket,
160115
BrokenMagnifyingGlass,
161116
ChatBubbles,
162-
CoffeeMug,
163-
ConciergeBlue,
164-
ConciergeExclamation,
165-
CreditCardsBlue,
166117
EmailAddress,
167118
EmptyCardState,
168119
EmptyStateExpenses,
169120
EnvelopeReceipt,
170121
FolderOpen,
171122
HandCard,
172-
HotDogStand,
173-
InvoiceOrange,
174-
JewelBoxBlue,
175-
JewelBoxGreen,
176123
PaymentHands,
177-
JewelBoxPink,
178-
JewelBoxYellow,
179124
MagicCode,
180125
Mailbox,
181-
MoneyEnvelopeBlue,
182-
MoneyMousePink,
183126
MushroomTopHat,
184-
ReceiptsSearchYellow,
185-
ReceiptYellow,
186127
ReceiptWrangler,
187128
RocketBlue,
188-
RocketOrange,
189-
SanFrancisco,
190-
SafeBlue,
191-
SmallRocket,
192-
TadaYellow,
193-
TadaBlue,
194129
ToddBehindCloud,
195130
ToddWithPhones,
196-
GpsTrackOrange,
197131
ShieldYellow,
198132
MoneyReceipts,
199-
PinkBill,
200133
CreditCardsNew,
201134
CreditCardsNewGreen,
202135
InvoiceBlue,
@@ -205,20 +138,13 @@ export {
205138
Luggage,
206139
MoneyIntoWallet,
207140
MoneyWings,
208-
OpenSafe,
209-
TrackShoe,
210-
BankArrow,
211141
ConciergeBubble,
212-
ConciergeNew,
213-
MoneyBadge,
214142
TreasureChest,
215143
ThumbsUpStars,
216144
Hands,
217-
HandEarth,
218145
SmartScan,
219146
Hourglass,
220147
CommentBubbles,
221-
CommentBubblesBlue,
222148
TrashCan,
223149
TeleScope,
224150
Profile,
@@ -229,9 +155,7 @@ export {
229155
QRCode,
230156
RealtimeReport,
231157
HoldExpense,
232-
ReceiptEnvelope,
233158
Approval,
234-
WalletAlt,
235159
Workflows,
236160
PendingBank,
237161
ThreeLeggedLaptopWoman,
@@ -256,12 +180,10 @@ export {
256180
CarIce,
257181
ReceiptLocationMarker,
258182
Lightbulb,
259-
EmptyStateTravel,
260183
Stopwatch,
261184
SubscriptionAnnual,
262185
SubscriptionPPU,
263186
ExpensifyApprovedLogo,
264-
ExpensifyApprovedLogoLight,
265187
SendMoney,
266188
CheckmarkCircle,
267189
CreditCardEyes,
@@ -270,14 +192,10 @@ export {
270192
FolderWithPapers,
271193
VirtualCard,
272194
Tire,
273-
BigVault,
274195
Filters,
275196
MagnifyingGlassMoney,
276197
Rules,
277198
CompanyCardsEmptyState,
278-
AmexCompanyCards,
279-
MasterCardCompanyCards,
280-
VisaCompanyCards,
281199
CompanyCardsPendingState,
282200
VisaCompanyCardDetail,
283201
MasterCardCompanyCardDetail,

assets/images/arrows-updown.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

assets/images/bellSlash.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

assets/images/briefcase.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

assets/images/chair.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

assets/images/chatbubble-add.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

assets/images/chatbubble-slash.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

assets/images/document-plus.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

assets/images/document-slash.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)