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

Money request header scrollable #21918

Merged
merged 22 commits into from
Jul 10, 2023
Merged

Money request header scrollable #21918

merged 22 commits into from
Jul 10, 2023

Commits on Jun 12, 2023

  1. Make part of MoneyRequestHeader scrollable, the top of the header sta… 

    …ys fixed, the other part is moved as a footer of the InvertedFlatList which makes it a header

Signed-off-by: Pierre Michel <[email protected]>
    @ShogunFire
    ShogunFire committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    780477c View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. ListFooterComponentStyle was overwritten so the header was at the bottom 

    Signed-off-by: Pierre Michel <[email protected]>
    @ShogunFire
    ShogunFire committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    bc80a96 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into moneyRequestHeaderScr… 

    …ollable

Signed-off-by: Pierre Michel <[email protected]>

# Conflicts:
#	src/components/MoneyRequestHeader.js
#	src/pages/home/report/ReportActionsList.js
#	src/pages/home/report/ReportActionsView.js
    @ShogunFire
    ShogunFire committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    710dbd0 View commit details
    Browse the repository at this point in the history

  3. Merge was wrong, it looks like we use the Id now instead of the email 

    Signed-off-by: Pierre Michel <[email protected]>
    @ShogunFire
    ShogunFire committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    367261d View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. Another problem with the merge, we use the id now 

    Signed-off-by: Pierre Michel <[email protected]>
    @ShogunFire
    ShogunFire committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    7bab3f1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into moneyRequestHeaderScrollable 

    Signed-off-by: Pierre Michel <[email protected]>

# Conflicts:
#	src/pages/home/ReportScreen.js
#	src/pages/home/report/ReportActionsList.js
#	src/pages/home/report/ReportActionsView.js
    @ShogunFire
    ShogunFire committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    795295a View commit details
    Browse the repository at this point in the history

  3. Changing names of files 

    Signed-off-by: Pierre Michel <[email protected]>
    @ShogunFire
    ShogunFire committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    f60c83c View commit details
    Browse the repository at this point in the history

  4. Fix problem with merging 

    Signed-off-by: Pierre Michel <[email protected]>
    @ShogunFire
    ShogunFire committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    bce157a View commit details
    Browse the repository at this point in the history

  5. Fixing the merge again 

    Signed-off-by: Pierre Michel <[email protected]>
    @ShogunFire
    ShogunFire committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    89cedaf View commit details
    Browse the repository at this point in the history

  6. I changed that but I don't know why so I changed it back 

    Signed-off-by: Pierre Michel <[email protected]>
    @ShogunFire
    ShogunFire committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    1c0af6e View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. Correct one lint error 

    Signed-off-by: Pierre Michel <[email protected]>
    @ShogunFire
    ShogunFire committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    6b961a1 View commit details
    Browse the repository at this point in the history

  2. Correct Lint errors 

    Signed-off-by: Pierre Michel <[email protected]>
    @ShogunFire
    ShogunFire committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    fc5b73a View commit details
    Browse the repository at this point in the history

  3. just to fix lint errors, for the props validation 

    Signed-off-by: Pierre Michel <[email protected]>
    @ShogunFire
    ShogunFire committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    8e1432a View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/main' into moneyRequestHeaderScr… 

    …ollable
    @ShogunFire
    ShogunFire committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    57806b1 View commit details
    Browse the repository at this point in the history

  5. Try with former lint version because new one seem to bug 

    Signed-off-by: Pierre Michel <[email protected]>
    @ShogunFire
    ShogunFire committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    837f690 View commit details
    Browse the repository at this point in the history

  6. After run prettier 

    Signed-off-by: Pierre Michel <[email protected]>
    @ShogunFire
    ShogunFire committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    61985bc View commit details
    Browse the repository at this point in the history

  7. Revert "Try with former lint version because new one seem to bug" 

    This reverts commit 837f690.

Signed-off-by: Pierre Michel <[email protected]>
    @ShogunFire
    ShogunFire committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    54f6edd View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. Resolve the errors about prop type in the android console 

    Signed-off-by: Pierre Michel <[email protected]>
    @ShogunFire
    ShogunFire committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    86d2272 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into moneyRequestHeaderScr… 

    …ollable

Signed-off-by: Pierre Michel <[email protected]>

# Conflicts:
#	src/components/MoneyRequestHeader.js
    @ShogunFire
    ShogunFire committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    b211f98 View commit details
    Browse the repository at this point in the history

  3. Resolve lint errors and merging errors 

    Signed-off-by: Pierre Michel <[email protected]>
    @ShogunFire
    ShogunFire committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    8e10409 View commit details
    Browse the repository at this point in the history

  4. Reverting to the good prop type and fixing the console error on android 

    Signed-off-by: Pierre Michel <[email protected]>
    @ShogunFire
    ShogunFire committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    bd3ac02 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2023

  1. Merge branch 'main' into moneyRequestHeaderScrollable 

    Signed-off-by: Pierre Michel <[email protected]>

# Conflicts:
#	src/pages/home/report/ReportActionsView.js
    @ShogunFire
    ShogunFire committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    c24c9d7 View commit details
    Browse the repository at this point in the history