Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Free trial] Implement and show Trial Ended banner, Expensify DM GBR and custom Expensify DM chat item in the App after Free Trial ends #44483

Merged
merged 20 commits into from
Jul 11, 2024
Merged

[Free trial] Implement and show Trial Ended banner, Expensify DM GBR and custom Expensify DM chat item in the App after Free Trial ends #44483

merged 20 commits into from
Jul 11, 2024

Commits on Jun 26, 2024

  1. feat: add trial ended banner and update related UI

    @pac-guerreiro
    pac-guerreiro committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    1c35f4d View commit details
    Browse the repository at this point in the history

  2. refactor: remove unnecessary text wrapper

    @pac-guerreiro
    pac-guerreiro committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    d6e2f36 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Merge branch 'pac-guerreiro/feature/43672-implement-and-show-free-tri… 

    …al-banner-and-badges-after-free-trial-starts' into pac-guerreiro/feature/43671-trial-ended-banner-expensify-dm-gbr-and-custom-chat-item
    @pac-guerreiro
    pac-guerreiro committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    8fc1eba View commit details
    Browse the repository at this point in the history

  2. Merge branch 'pac-guerreiro/feature/43672-implement-and-show-free-tri… 

    …al-banner-and-badges-after-free-trial-starts' into pac-guerreiro/feature/43671-trial-ended-banner-expensify-dm-gbr-and-custom-chat-item
    @pac-guerreiro
    pac-guerreiro committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    ace1c18 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. Merge branch 'pac-guerreiro/feature/43672-implement-and-show-free-tri… 

    …al-banner-and-badges-after-free-trial-starts' into pac-guerreiro/feature/43671-trial-ended-banner-expensify-dm-gbr-and-custom-chat-item
    @pac-guerreiro
    pac-guerreiro committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    978af7e View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. Merge branch 'pac-guerreiro/feature/43672-implement-and-show-free-tri… 

    …al-banner-and-badges-after-free-trial-starts' into pac-guerreiro/feature/43671-trial-ended-banner-expensify-dm-gbr-and-custom-chat-item

# Conflicts:
#	src/libs/ReportActionsUtils.ts
    @pac-guerreiro
    pac-guerreiro committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    d3dc428 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. refactor: apply suggestions

    @pac-guerreiro
    pac-guerreiro committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    a2f0e84 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'pac-guerreiro/feature/43672-implement-and-show-free-tri… 

    …al-banner-and-badges-after-free-trial-starts' into pac-guerreiro/feature/43671-trial-ended-banner-expensify-dm-gbr-and-custom-chat-item

# Conflicts:
#	src/pages/settings/Subscription/CardSection/CardSection.tsx
    @pac-guerreiro
    pac-guerreiro committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    21554b9 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. Merge branch 'main' into pac-guerreiro/feature/43671-trial-ended-bann… 

    …er-expensify-dm-gbr-and-custom-chat-item
    @pac-guerreiro
    pac-guerreiro committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    5e8e967 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. Merge branch 'main' into pac-guerreiro/feature/43671-trial-ended-bann… 

    …er-expensify-dm-gbr-and-custom-chat-item
    @pac-guerreiro
    pac-guerreiro committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    222e524 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into pac-guerreiro/feature/43671-trial-ended-bann… 

    …er-expensify-dm-gbr-and-custom-chat-item
    @pac-guerreiro
    pac-guerreiro committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    a36a47c View commit details
    Browse the repository at this point in the history

  3. fix: free trial ended not showing as report last message in LHN

    @pac-guerreiro
    pac-guerreiro committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    bc13f9a View commit details
    Browse the repository at this point in the history

  4. fix: GBR not showing in concierge chat option in LHN

    @pac-guerreiro
    pac-guerreiro committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    38a11b6 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Merge branch 'main' into pac-guerreiro/feature/43671-trial-ended-bann… 

    …er-expensify-dm-gbr-and-custom-chat-item

# Conflicts:
#	src/libs/ReportActionsUtils.ts
#	src/types/onyx/OriginalMessage.ts
    @pac-guerreiro
    pac-guerreiro committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    174c48b View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Merge branch 'main' into pac-guerreiro/feature/43671-trial-ended-bann… 

    …er-expensify-dm-gbr-and-custom-chat-item

# Conflicts:
#	src/components/Icon/Illustrations.ts
    @pac-guerreiro
    pac-guerreiro committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    bc06a92 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. Merge branch 'main' into pac-guerreiro/feature/43671-trial-ended-bann… 

    …er-expensify-dm-gbr-and-custom-chat-item

# Conflicts:
#	src/libs/OptionsListUtils.ts
    @pac-guerreiro
    pac-guerreiro committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    3e1992a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into pac-guerreiro/feature/43671-trial-ended-bann… 

    …er-expensify-dm-gbr-and-custom-chat-item
    @pac-guerreiro
    pac-guerreiro committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    16dd7a2 View commit details
    Browse the repository at this point in the history

  3. refactor: add isConciergeChat property to OptionData and check for it

    @pac-guerreiro
    pac-guerreiro committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    79b3671 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into pac-guerreiro/feature/43671-trial-ended-bann… 

    …er-expensify-dm-gbr-and-custom-chat-item
    @pac-guerreiro
    pac-guerreiro committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    cfb59ee View commit details
    Browse the repository at this point in the history

  5. chore: fix linter issue

    @pac-guerreiro
    pac-guerreiro committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    531e0be View commit details
    Browse the repository at this point in the history