Merge branch 'main' of github.com:Expensify/App into feat/50911-reimb…

…ursement-account-page-refactor

.gitignore

@@ -46,6 +46,9 @@ android/app/src/main/java/com/expensify/chat/generated/
 # Vscode
 .vscode
 
+# Fleet
+.fleet
+
 # node.js
 #
 node_modules/

__mocks__/Illustrations.ts

@@ -0,0 +1,307 @@
+const Abracadabra = 'Abracadabra';
+const BankArrowPink = 'BankArrowPink';
+const BankMouseGreen = 'BankMouseGreen';
+const BankUserGreen = 'BankUserGreen';
+const BigRocket = 'BigRocket';
+const BrokenMagnifyingGlass = 'BrokenMagnifyingGlass';
+const ChatBubbles = 'ChatBubbles';
+const CoffeeMug = 'CoffeeMug';
+const ConciergeBlue = 'ConciergeBlue';
+const ConciergeExclamation = 'ConciergeExclamation';
+const CreditCardsBlue = 'CreditCardsBlue';
+const EmailAddress = 'EmailAddress';
+const EmptyCardState = 'EmptyCardState';
+const EmptyStateExpenses = 'EmptyStateExpenses';
+const EnvelopeReceipt = 'EnvelopeReceipt';
+const FolderOpen = 'FolderOpen';
+const HandCard = 'HandCard';
+const HotDogStand = 'HotDogStand';
+const InvoiceOrange = 'InvoiceOrange';
+const JewelBoxBlue = 'JewelBoxBlue';
+const JewelBoxGreen = 'JewelBoxGreen';
+const PaymentHands = 'PaymentHands';
+const JewelBoxPink = 'JewelBoxPink';
+const JewelBoxYellow = 'JewelBoxYellow';
+const MagicCode = 'MagicCode';
+const Mailbox = 'Mailbox';
+const MoneyEnvelopeBlue = 'MoneyEnvelopeBlue';
+const MoneyMousePink = 'MoneyMousePink';
+const MushroomTopHat = 'MushroomTopHat';
+const ReceiptsSearchYellow = 'ReceiptsSearchYellow';
+const ReceiptYellow = 'ReceiptYellow';
+const ReceiptWrangler = 'ReceiptWrangler';
+const RocketBlue = 'RocketBlue';
+const RocketOrange = 'RocketOrange';
+const SanFrancisco = 'SanFrancisco';
+const SafeBlue = 'SafeBlue';
+const SmallRocket = 'SmallRocket';
+const TadaYellow = 'TadaYellow';
+const TadaBlue = 'TadaBlue';
+const ToddBehindCloud = 'ToddBehindCloud';
+const ToddWithPhones = 'ToddWithPhones';
+const GpsTrackOrange = 'GpsTrackOrange';
+const ShieldYellow = 'ShieldYellow';
+const MoneyReceipts = 'MoneyReceipts';
+const PinkBill = 'PinkBill';
+const CreditCardsNew = 'CreditCardsNew';
+const CreditCardsNewGreen = 'CreditCardsNewGreen';
+const InvoiceBlue = 'InvoiceBlue';
+const LaptopwithSecondScreenandHourglass = 'LaptopwithSecondScreenandHourglass';
+const LockOpen = 'LockOpen';
+const Luggage = 'Luggage';
+const MoneyIntoWallet = 'MoneyIntoWallet';
+const MoneyWings = 'MoneyWings';
+const OpenSafe = 'OpenSafe';
+const TrackShoe = 'TrackShoe';
+const BankArrow = 'BankArrow';
+const ConciergeBubble = 'ConciergeBubble';
+const ConciergeNew = 'ConciergeNew';
+const MoneyBadge = 'MoneyBadge';
+const TreasureChest = 'TreasureChest';
+const ThumbsUpStars = 'ThumbsUpStars';
+const Hands = 'Hands';
+const HandEarth = 'HandEarth';
+const SmartScan = 'SmartScan';
+const Hourglass = 'Hourglass';
+const CommentBubbles = 'CommentBubbles';
+const CommentBubblesBlue = 'CommentBubblesBlue';
+const TrashCan = 'TrashCan';
+const TeleScope = 'TeleScope';
+const Profile = 'Profile';
+const Puzzle = 'Puzzle';
+const PalmTree = 'PalmTree';
+const LockClosed = 'LockClosed';
+const Gears = 'Gears';
+const QRCode = 'QRCode';
+const RealtimeReport = 'RealtimeReport';
+const HoldExpense = 'HoldExpense';
+const ReceiptEnvelope = 'ReceiptEnvelope';
+const Approval = 'Approval';
+const WalletAlt = 'WalletAlt';
+const Workflows = 'Workflows';
+const PendingBank = 'PendingBank';
+const ThreeLeggedLaptopWoman = 'ThreeLeggedLaptopWoman';
+const House = 'House';
+const Building = 'Building';
+const Buildings = 'Buildings';
+const Alert = 'Alert';
+const TeachersUnite = 'TeachersUnite';
+const Abacus = 'Abacus';
+const Binoculars = 'Binoculars';
+const CompanyCard = 'CompanyCard';
+const ReceiptUpload = 'ReceiptUpload';
+const ExpensifyCardIllustration = 'ExpensifyCardIllustration';
+const SplitBill = 'SplitBill';
+const PiggyBank = 'PiggyBank';
+const Pillow = 'Pillow';
+const Accounting = 'Accounting';
+const Car = 'Car';
+const Coins = 'Coins';
+const Pencil = 'Pencil';
+const Tag = 'Tag';
+const CarIce = 'CarIce';
+const ReceiptLocationMarker = 'ReceiptLocationMarker';
+const Lightbulb = 'Lightbulb';
+const EmptyStateTravel = 'EmptyStateTravel';
+const Stopwatch = 'Stopwatch';
+const SubscriptionAnnual = 'SubscriptionAnnual';
+const SubscriptionPPU = 'SubscriptionPPU';
+const ExpensifyApprovedLogo = 'ExpensifyApprovedLogo';
+const ExpensifyApprovedLogoLight = 'ExpensifyApprovedLogoLight';
+const SendMoney = 'SendMoney';
+const CheckmarkCircle = 'CheckmarkCircle';
+const CreditCardEyes = 'CreditCardEyes';
+const LockClosedOrange = 'LockClosedOrange';
+const EmptyState = 'EmptyState';
+const FolderWithPapers = 'FolderWithPapers';
+const VirtualCard = 'VirtualCard';
+const Tire = 'Tire';
+const BigVault = 'BigVault';
+const Filters = 'Filters';
+const MagnifyingGlassMoney = 'MagnifyingGlassMoney';
+const Rules = 'Rules';
+const CompanyCardsEmptyState = 'CompanyCardsEmptyState';
+const AmexCompanyCards = 'AmexCompanyCards';
+const MasterCardCompanyCards = 'MasterCardCompanyCards';
+const VisaCompanyCards = 'VisaCompanyCards';
+const CompanyCardsPendingState = 'CompanyCardsPendingState';
+const VisaCompanyCardDetail = 'VisaCompanyCardDetail';
+const MasterCardCompanyCardDetail = 'MasterCardCompanyCardDetail';
+const AmexCardCompanyCardDetail = 'AmexCardCompanyCardDetail';
+const TurtleInShell = 'TurtleInShell';
+const BankOfAmericaCompanyCardDetail = 'BankOfAmericaCompanyCardDetail';
+const BrexCompanyCardDetail = 'BrexCompanyCardDetail';
+const CapitalOneCompanyCardDetail = 'CapitalOneCompanyCardDetail';
+const ChaseCompanyCardDetail = 'ChaseCompanyCardDetail';
+const CitibankCompanyCardDetail = 'CitibankCompanyCardDetail';
+const StripeCompanyCardDetail = 'StripeCompanyCardDetail';
+const WellsFargoCompanyCardDetail = 'WellsFargoCompanyCardDetail';
+const PerDiem = 'PerDiem';
+const AmexCardCompanyCardDetailLarge = 'AmexCardCompanyCardDetailLarge';
+const BankOfAmericaCompanyCardDetailLarge = 'BankOfAmericaCompanyCardDetailLarge';
+const BrexCompanyCardDetailLarge = 'BrexCompanyCardDetailLarge';
+const CapitalOneCompanyCardDetailLarge = 'CapitalOneCompanyCardDetailLarge';
+const ChaseCompanyCardDetailLarge = 'ChaseCompanyCardDetailLarge';
+const CitibankCompanyCardDetailLarge = 'CitibankCompanyCardDetailLarge';
+const MasterCardCompanyCardDetailLarge = 'MasterCardCompanyCardDetailLarge';
+const StripeCompanyCardDetailLarge = 'StripeCompanyCardDetailLarge';
+const VisaCompanyCardDetailLarge = 'VisaCompanyCardDetailLarge';
+const WellsFargoCompanyCardDetailLarge = 'WellsFargoCompanyCardDetailLarge';
+const Flash = 'Flash';
+const ExpensifyMobileApp = 'ExpensifyMobileApp';
+const ReportReceipt = 'ReportReceipt';
+
+export {
+    Abracadabra,
+    BankArrowPink,
+    BankMouseGreen,
+    BankUserGreen,
+    BigRocket,
+    BrokenMagnifyingGlass,
+    ChatBubbles,
+    CoffeeMug,
+    ConciergeBlue,
+    ConciergeExclamation,
+    CreditCardsBlue,
+    EmailAddress,
+    EmptyCardState,
+    EmptyStateExpenses,
+    EnvelopeReceipt,
+    FolderOpen,
+    HandCard,
+    HotDogStand,
+    InvoiceOrange,
+    JewelBoxBlue,
+    JewelBoxGreen,
+    PaymentHands,
+    JewelBoxPink,
+    JewelBoxYellow,
+    MagicCode,
+    Mailbox,
+    MoneyEnvelopeBlue,
+    MoneyMousePink,
+    MushroomTopHat,
+    ReceiptsSearchYellow,
+    ReceiptYellow,
+    ReceiptWrangler,
+    RocketBlue,
+    RocketOrange,
+    SanFrancisco,
+    SafeBlue,
+    SmallRocket,
+    TadaYellow,
+    TadaBlue,
+    ToddBehindCloud,
+    ToddWithPhones,
+    GpsTrackOrange,
+    ShieldYellow,
+    MoneyReceipts,
+    PinkBill,
+    CreditCardsNew,
+    CreditCardsNewGreen,
+    InvoiceBlue,
+    LaptopwithSecondScreenandHourglass,
+    LockOpen,
+    Luggage,
+    MoneyIntoWallet,
+    MoneyWings,
+    OpenSafe,
+    TrackShoe,
+    BankArrow,
+    ConciergeBubble,
+    ConciergeNew,
+    MoneyBadge,
+    TreasureChest,
+    ThumbsUpStars,
+    Hands,
+    HandEarth,
+    SmartScan,
+    Hourglass,
+    CommentBubbles,
+    CommentBubblesBlue,
+    TrashCan,
+    TeleScope,
+    Profile,
+    Puzzle,
+    PalmTree,
+    LockClosed,
+    Gears,
+    QRCode,
+    RealtimeReport,
+    HoldExpense,
+    ReceiptEnvelope,
+    Approval,
+    WalletAlt,
+    Workflows,
+    PendingBank,
+    ThreeLeggedLaptopWoman,
+    House,
+    Building,
+    Buildings,
+    Alert,
+    TeachersUnite,
+    Abacus,
+    Binoculars,
+    CompanyCard,
+    ReceiptUpload,
+    ExpensifyCardIllustration,
+    SplitBill,
+    PiggyBank,
+    Pillow,
+    Accounting,
+    Car,
+    Coins,
+    Pencil,
+    Tag,
+    CarIce,
+    ReceiptLocationMarker,
+    Lightbulb,
+    EmptyStateTravel,
+    Stopwatch,
+    SubscriptionAnnual,
+    SubscriptionPPU,
+    ExpensifyApprovedLogo,
+    ExpensifyApprovedLogoLight,
+    SendMoney,
+    CheckmarkCircle,
+    CreditCardEyes,
+    LockClosedOrange,
+    EmptyState,
+    FolderWithPapers,
+    VirtualCard,
+    Tire,
+    BigVault,
+    Filters,
+    MagnifyingGlassMoney,
+    Rules,
+    CompanyCardsEmptyState,
+    AmexCompanyCards,
+    MasterCardCompanyCards,
+    VisaCompanyCards,
+    CompanyCardsPendingState,
+    VisaCompanyCardDetail,
+    MasterCardCompanyCardDetail,
+    AmexCardCompanyCardDetail,
+    TurtleInShell,
+    BankOfAmericaCompanyCardDetail,
+    BrexCompanyCardDetail,
+    CapitalOneCompanyCardDetail,
+    ChaseCompanyCardDetail,
+    CitibankCompanyCardDetail,
+    StripeCompanyCardDetail,
+    WellsFargoCompanyCardDetail,
+    PerDiem,
+    AmexCardCompanyCardDetailLarge,
+    BankOfAmericaCompanyCardDetailLarge,
+    BrexCompanyCardDetailLarge,
+    CapitalOneCompanyCardDetailLarge,
+    ChaseCompanyCardDetailLarge,
+    CitibankCompanyCardDetailLarge,
+    MasterCardCompanyCardDetailLarge,
+    StripeCompanyCardDetailLarge,
+    VisaCompanyCardDetailLarge,
+    WellsFargoCompanyCardDetailLarge,
+    Flash,
+    ExpensifyMobileApp,
+    ReportReceipt,
+};

android/app/build.gradle

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009010600
-        versionName "9.1.6-0"
+        versionCode 1009010700
+        versionName "9.1.7-0"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"