Code

Merge Xero freeze branch #2#42340

Code

Merged

lakchote merged 194 commits intomainExpensify/App:mainfrom xero-merge-freezeExpensify/App:xero-merge-freezeCopy head branch name to clipboardMay 30, 2024

+670-431

Commits

Commits on May 3, 2024

• add routes

  rushatgabhane

  committed
  a73a507

• add screen map

  rushatgabhane

  committed
  e266c3e

• add navigation map

  rushatgabhane

  committed
  102d949

• link to bill status page and add default page

  rushatgabhane

  committed
  37df48a

• add selection screen

  rushatgabhane

  committed
  7562b7f

• Add sync functionality in Xero connection

  ShridharGoel

  committed
  189c4f4

• add selection screen

  rushatgabhane

  committed
  fe9b69b

• Update

  ShridharGoel

  committed
  a362c38

• Update PolicyAccountingPage.tsx

  ShridharGoel

  authored
  d7fc0c3

• Update PolicyAccountingPage.tsx

  ShridharGoel

  authored
  ff31b53

Commits on May 8, 2024

• Add new command and JSdoc

  ShridharGoel

  committed
  1ddad04

• Merge branch '41320' of https://github.com/ShridharGoel/ExpensifyApp into 41320

  ShridharGoel

  committed
  e04f688

Commits on May 9, 2024

• Merge branch 'xero-merge-freeze' of https://github.com/Expensify/App into 41320

  ShridharGoel

  committed
  a73430f

• Update

  ShridharGoel

  committed
  b6fa193

Commits on May 10, 2024

• fix merge

  rushatgabhane

  committed
  b0032de

• unlink from advanced

  rushatgabhane

  committed
  6614242

• link export page

  rushatgabhane

  committed
  fcd7545

• fix merge

  rushatgabhane

  committed
  dfe0452

• update route to export

  rushatgabhane

  committed
  6ad88e3

• add lang

  rushatgabhane

  committed
  db7f63e

• fix nav

  rushatgabhane

  committed
  c4fcf6d

• use updated routes and lang

  rushatgabhane

  committed
  d75c756

• update status name

  rushatgabhane

  committed
  6de73ea

• change order

  rushatgabhane

  committed
  19b1c8c

• change order

  rushatgabhane

  committed
  c7eb413

• handle undefined

  rushatgabhane

  committed
  2380eb7

• Merge branch 'Expensify:main' into bill-status

  rushatgabhane

  authored
  87bae9f

• Update src/pages/workspace/accounting/xero/export/XeroPurchaseBillStatusSelectorPage.tsx

  Show description for 4d1a0e0
  

  rushatgabhane

  and

  mananjadhav

  authored
  4d1a0e0

• Update src/SCREENS.ts

  Show description for bf670dc
  

  rushatgabhane

  and

  mananjadhav

  authored
  bf670dc

• add offline support for XeroOrganizationConfiguration

  SzymczakJ

  committed
  1fce4d0

Commits on May 13, 2024

• Merge branch 'main' into @szymczak/handle-offline-state-xero-organization

  SzymczakJ

  committed
  6df24b4

• fix PR comments

  SzymczakJ

  committed
  1cf8b94

• fix XeroOrganization bug

  SzymczakJ

  committed
  0cea6dd

• use ConnectionLayout in XeroOrganizationConfigurationPage

  SzymczakJ

  committed
  e0b49d7

Commits on May 14, 2024

• Merge branch 'main' into @szymczak/handle-offline-state-xero-organization

  SzymczakJ

  committed
  5f9585d

• Merge branch 'main' of github.com:rushatgabhane/exfy into bill-status

  rushatgabhane

  committed
  7d8a0d1

• fix padding on XeroOrganizationList

  SzymczakJ

  committed
  8e391e0

• fix safe area insets

  SzymczakJ

  committed
  77f0cff

• Update

  ShridharGoel

  committed
  f19f3ed

• Updates

  ShridharGoel

  committed
  1a4bb31

Commits on May 15, 2024

• Merge branch 'main' into @szymczak/handle-offline-state-xero-organization

  SzymczakJ

  committed
  2dbef02

• fix typescript errors

  SzymczakJ

  committed
  b5e0200

• make taxes read only

  SzymczakJ

  committed
  ef91552

• Update src/languages/es.ts

  Show description for 191b805
  

  rushatgabhane

  and

  pecanoro

  authored
  191b805

• Update src/languages/es.ts

  Show description for 95b787f
  

  rushatgabhane

  and

  pecanoro

  authored
  95b787f

• Update src/languages/es.ts

  Show description for 2c7c80f
  

  rushatgabhane

  and

  pecanoro

  authored
  2c7c80f

Commits on May 16, 2024

• add error message in case of sync failure

  SzymczakJ

  committed
  68b7551

• Merge branch 'main' into 41320

  ShridharGoel

  authored
  33aeffc

• Fix lint

  ShridharGoel

  committed
  e2f0a62

• fix: remove slash from url

  mananjadhav

  committed
  c010b12

Commits on May 17, 2024

• fix: route path

  mananjadhav

  committed
  1cc1056

• Merge pull request #41562 from ShridharGoel/41320

  Show description for c88c564
  lakchote

  authored
  c88c564

• Merge pull request #41983 from software-mansion-labs/@szymczak/handle-offline-state-xero-organization

  Show description for 55b0597
  lakchote

  authored
  55b0597

• Merge pull request #42324 from mananjadhav/fix-xero-customers-console-error

  Show description for fb31f37
  lakchote

  authored
  fb31f37

• Merge pull request #41559 from rushatgabhane/bill-status

  Show description for 36ac388
  lakchote

  authored
  36ac388

• fix: change selected text

  mananjadhav

  committed
  6d71b0e

• fix: added padding

  mananjadhav

  committed
  4115f7e

• fix: default selection

  mananjadhav

  committed
  73524a9

• hide policy guides as exporters

  rushatgabhane

  committed
  636cbf1

• Merge branch 'xero-merge-freeze' of https://github.com/Expensify/App into xero-tracking-categories-fixes

  mananjadhav

  committed
  f74e05f

• fix: select first item in list

  mananjadhav

  committed
  acbeb1b

• fix: default select first item

  mananjadhav

  committed
  89a68ba

• fix: default select first item

  mananjadhav

  committed
  77cedd2

Commits on May 20, 2024

• Console error shows up when opening Preferred exporter

  tienifr

  committed
  70e1945

• Merge pull request #42347 from mananjadhav/xero-tracking-categories-fixes

  Show description for f521fa5
  lakchote

  authored
  f521fa5

• Merge branch 'main' into @szymczak/error-message-sync-failure

  SzymczakJ

  committed
  08b321a

• add translations

  SzymczakJ

  committed
  ecdeaf4

• delete unrelated changes

  SzymczakJ

  committed
  e87d711

• Merge branch 'main' into @szymczak/make-taxes-read-only-when-connected

  SzymczakJ

  committed
  3dfd53b

• fix PR comments

  SzymczakJ

  committed
  27972bf

• Merge remote-tracking branch 'expensify-real/xero-merge-freeze' into @szymczak/error-message-sync-failure

  SzymczakJ

  committed
  de93763

• Merge remote-tracking branch 'expensify-real/xero-merge-freeze' into @szymczak/make-taxes-read-only-when-connected

  SzymczakJ

  committed
  811e35f

• Fix: QBO briefly shows when syncing Xero

  hungvu193

  committed
  9665c0f

• fix prettier

  hungvu193

  committed
  1dde849

• update Spanish translation

  hungvu193

  committed
  c444695

• Merge pull request #42346 from rushatgabhane/xero-exporter

  Show description for ed18ae8
  lakchote

  authored
  ed18ae8

• Merge pull request #42372 from tienifr/fix/42195

  Show description for ade85e0
  lakchote

  authored
  ade85e0

• fix connections lastSync unsafe access

  SzymczakJ

  committed
  ef5d777

• Merge branch 'xero-merge-freeze' of https://github.com/Expensify/App into xero-default-select-options

  mananjadhav

  committed
  1f71c18

Commits on May 21, 2024

• Merge pull request #42192 from software-mansion-labs/@szymczak/make-taxes-read-only-when-connected

  Show description for 4059db3
  lakchote

  authored
  4059db3

• Merge pull request #42383 from hungvu193/fix-42376

  Show description for 9d57ceb
  lakchote

  authored
  9d57ceb

• Merge branch 'xero-merge-freeze' of https://github.com/Expensify/App into xero-default-select-options

  mananjadhav

  committed
  a8ee9fe

• refactor: move bank selection to utils

  mananjadhav

  committed
  f3cbb21

• refactor: replace with utils

  mananjadhav

  committed
  e143cfb

• refactor: replace with utils

  mananjadhav

  committed
  92cd9c6

• refactor: lint fixes

  mananjadhav

  committed
  a66f8cb

• Merge pull request #42360 from mananjadhav/xero-default-select-options

  Show description for 1342b73
  lakchote

  authored
  1342b73

Commits on May 22, 2024

• fix taxes not blocking on more features page

  SzymczakJ

  committed
  c960fa3

• Update category integration name

  hungvu193

  committed
  bff08c2

• disable taxes if previously enabled on disconnect

  lakchote

  committed
  b40eaae

• rm header overflow menu

  rushatgabhane

  committed
  a5322ab

• rm header overflow menu

  rushatgabhane

  committed
  0b3ecb1

• hide 3dot

  rushatgabhane

  committed
  f47f063

• hide 3dot

  rushatgabhane

  committed
  96b58cb

• undo all beta

  rushatgabhane

  committed
  a3e4f70

• Merge pull request #42462 from hungvu193/fix-42458

  Show description for 082b792
  lakchote

  authored
  082b792

• change logic

  lakchote

  committed
  aff888d

• remove taxes in lhn when connecting to QBO

  lakchote

  committed
  83c3a6c

• fix: replace connection name

  mananjadhav

  committed
  539c063

• feat: added content for taxes page

  mananjadhav

  committed
  0dea1e1

• fix: update translate path

  mananjadhav

  committed
  d46d6f6

• feat: footer text for more features

  mananjadhav

  committed
  3cb3179

• feat: added content for more features

  mananjadhav

  committed
  3bf7309

• fix: add margin

  mananjadhav

  committed
  9cb30ef

• refactor: prettier fix

  mananjadhav

  committed
  83f4c84

• fix: update styling

  mananjadhav

  committed
  6204f36

Commits on May 23, 2024

• fix PR comments

  SzymczakJ

  committed
  78da569

• Merge pull request #42461 from software-mansion-labs/@szymczak/fix-taxes-not-blocked-with-integration

  Show description for 4543955
  lakchote

  authored
  4543955

• Merge pull request #42468 from rushatgabhane/xero-rm-3-dot

  Show description for 351ccdc
  lakchote

  authored
  351ccdc

• Merge pull request #42467 from Expensify/lucien/xero-fix-disconnect-taxes

  Show description for b222597
  techievivek

  authored
  b222597

• change translations

  SzymczakJ

  committed
  5979a35

• Merge pull request #42315 from Expensify/hayata-call-api-for-multi-level-tags

  Show description for 95f1ed9
  

  arosiclair

  authored and

  lakchote

  committed
  95f1ed9

• Merge pull request #42149 from s77rt/multi-level-tags-fix-not-found

  Show description for 1ebaeed
  

  Hayata Suenaga

  authored and

  lakchote

  committed
  1ebaeed

Commits on May 24, 2024

• make translations dynamic for xero tracking categories

  lakchote

  committed
  86bbf4b

• use only one route for tracking category mapping

  lakchote

  committed
  ff704d1

• use one screen for the tracking category mapping

  lakchote

  committed
  9e860f3

• handle navigation for the new page for tracking category

  lakchote

  committed
  1b8901a

• add new types for tracking category mapping

  lakchote

  committed
  c837440

• map the tracking category page to rhp

  lakchote

  committed
  2256423

• create function to get tracking categories

  lakchote

  committed
  bb8c24e

• modify component for dynamic translations

  lakchote

  committed
  5b797b6

• make the handling of tracking categories dynamic

  lakchote

  committed
  ed4c53f

• fix style

  lakchote

  committed
  0371ac1

• delete specific tracking categories pages

  lakchote

  committed
  c48295c

• make the handling of tracking categories dynamic

  lakchote

  committed
  be80134

• Merge branch 'main' into xero-merge-freeze

  lakchote

  committed
  7b816a8

• Merge branch 'xero-merge-freeze' of https://github.com/Expensify/App into xero-educational-messages

  mananjadhav

  committed
  14d6550

• fix: revert in-line text

  mananjadhav

  committed
  5d82268

• fix: revert in-line text

  mananjadhav

  committed
  42bfc1b

Commits on May 25, 2024

• fix: added period in all content

  mananjadhav

  committed
  72dbd0a

• chore: resolve merge issues

  mananjadhav

  committed
  3f7b21b

• chore: resolve merge issues

  mananjadhav

  committed
  bbb7ea2

• fix: use var

  mananjadhav

  committed
  d211850

• chore: resolve merge issues

  mananjadhav

  committed
  11d853a

• style: lint fixes

  mananjadhav

  committed
  57727ac

• feat: added shouldBeBlocked to ConnectionLayout

  mananjadhav

  committed
  26680ab

• fix: added checks for connection import pages

  mananjadhav

  committed
  1782985

Commits on May 26, 2024

• fix: added block check for xero pages

  mananjadhav

  committed
  cd23f1c

• style: lint fixes

  mananjadhav

  committed
  bfcba51

Commits on May 27, 2024

• fix lint

  lakchote

  committed
  e3e42b7

• refactor: added connection name

  mananjadhav

  committed
  bc3c185

• refactor: use connection name

  mananjadhav

  committed
  a786d30

• refactor: use connection name

  mananjadhav

  committed
  c77d660

• refactor: use connection layout for import page

  mananjadhav

  committed
  3430cea

• style: lint fixes

  mananjadhav

  committed
  11923a4

• fix: added connection name to pending pages

  mananjadhav

  committed
  7ba4125

• Merge pull request #42619 from mananjadhav/xero-access-block

  Show description for 063d8d1
  lakchote

  authored
  063d8d1

• Merge branch 'xero-merge-freeze' into lucien/fix-xero-tracking-categories

  lakchote

  committed
  5a8efbf

• fix lint

  lakchote

  committed
  72ce91a

• fix typo

  lakchote

  committed
  e0bb804

• Merge branch 'xero-merge-freeze' into @szymczak/error-message-sync-failure

  SzymczakJ

  committed
  52216fb

• encode category name

  lakchote

  committed
  4df274a

• decode category name

  lakchote

  committed
  0b94f59

• fix style

  SzymczakJ

  committed
  25db9b7

• fix styles

  SzymczakJ

  committed
  b779dff

• fix isSelected

  lakchote

  committed
  3d30445

• use already decoded category name

  lakchote

  committed
  7a559df

• fix lint

  lakchote

  committed
  a8e48c9

• fix lint errors

  SzymczakJ

  committed
  86f509f

• fix type error

  SzymczakJ

  committed
  adddbcd

• feat: add lock icon for switch

  mananjadhav

  committed
  a082fc4

• feat: state modal

  mananjadhav

  committed
  e68aba9

• feat: added features modal

  mananjadhav

  committed
  1e6dc10

• refactor: modal state

  mananjadhav

  committed
  4ed381b

• refactor: language format

  mananjadhav

  committed
  8033a8c

• refactor: language and connection name

  mananjadhav

  committed
  9dab55a

• style: prettier fixes

  mananjadhav

  committed
  b4f8164

Commits on May 28, 2024

• Merge pull request #42593 from Expensify/lucien/fix-xero-tracking-categories

  Show description for 1427992
  lakchote

  authored
  1427992

• fix PR comments

  SzymczakJ

  committed
  4ce01d2

• Merge branch 'xero-merge-freeze' of https://github.com/Expensify/App into xero-more-features-text

  mananjadhav

  committed
  c857d39

• feat: added es translations

  mananjadhav

  committed
  9ebe047

• refactor: remove title

  mananjadhav

  committed
  835e953

• fix: added dependency

  mananjadhav

  committed
  369f92e

• style: lint fixes

  mananjadhav

  committed
  90f0c0f

• fix: update copy

  mananjadhav

  committed
  a38c2ee

• refactor: remove unused var

  mananjadhav

  committed
  c2c741b

• fix: spanish copy

  mananjadhav

  committed
  0c0b5d1

• style: lint fixes

  mananjadhav

  committed
  59770a4

• fix: spanish copy

  mananjadhav

  committed
  a2ffb3b

• fix: captilize

  mananjadhav

  committed
  e610704

• Merge pull request #42662 from mananjadhav/xero-more-features-text

  Show description for 17e6948
  lakchote

  authored
  17e6948

• Merge pull request #42307 from software-mansion-labs/@szymczak/error-message-sync-failure

  Show description for 6604b8f
  lakchote

  authored
  6604b8f

Commits on May 29, 2024

• Merge branch 'main' into xero-merge-freeze

  lakchote

  committed
  1330fe2

• fix lint

  lakchote

  committed
  a938513

• fix: remove unused translations

  mananjadhav

  committed
  4e353e3

• fix: header for smallscreen width

  mananjadhav

  committed
  36f728a

• fix: show text in empty state

  mananjadhav

  committed
  7151030

• fix: boolean check

  mananjadhav

  committed
  ab8563b

• refactor: simplify condition

  mananjadhav

  committed
  ed9b9a9

Commits on May 30, 2024

• Merge pull request #42487 from mananjadhav/xero-educational-messages

  Show description for 27b69f0
  lakchote

  authored
  27b69f0

• Merge branch 'main' into xero-merge-freeze

  lakchote

  committed
  6f5d219

• fix lint

  lakchote

  committed
  a96752c

• fix backtick

  lakchote

  committed
  990ab4f

• Merge branch 'main' into xero-merge-freeze

  lakchote

  committed
  ef55d3a