Tooltip not displayed in Workspace name

[isagoico]

If you haven’t already, check out our contributing guidelines for onboarding and email contributors@expensify.com to request to join our Slack channel!

---

Issue is failing PR #5812

Action Performed:

1. Navigate to workspace settings
2. Hover over the workspace name

Expected Result:

Tooltip should appear with the full workspace name

Actual Result:

Tooltip does not appear.

Workaround:

None needed, visual issue.

Platform:

Where is this issue occurring?

• Web
• Desktop App

Version Number: 1.1.8-0

Reproducible in staging?: Yes
Reproducible in production?: Yes (but should be fixed in PR #5812)

Logs: https://stackoverflow.com/c/expensify/questions/4856

Notes/Photos/Videos: Any additional supporting documentation

Expensify/Expensify Issue URL:

Issue reported by: Applause
Slack conversation:

View all open jobs on GitHub

[MelvinBot]

Triggered auto assignment to @tgolen (Engineering), see https://stackoverflow.com/c/expensify/questions/4319 for more details.

[OSBotify]

👋 Friendly reminder that deploy blockers are time-sensitive ⏱ issues! Check out the open StagingDeployCash deploy checklist to see the list of PRs included in this release, then work quickly to do one of the following:

1. Identify the pull request that introduced this issue and revert it.
2. Find someone who can quickly fix the issue.
3. Fix the issue yourself.

[akshayasalvi]

It is working fine in the main branch.

I can find the Tooltip import but not the Tooltip usage part in the deployed tag 1.1.7-25

Is it not deployed or got removed in some merge conflict?

[tgolen]

I agree that it looks like the code wasn't deployed properly. I don't think this should be a deploy blocker so I am demoting the issue and my suggestion is to re-evaluate this after the next deploy to staging. If it's still not there, then we'll need to figure out how to fix it properly for staging.

[Beamanator]

From this blame in staging, it looks like the commit adding the Tooltip (A) was made before a more recent merge commit (B), so it got overwritten

And looking at that same file's blame in main, you can see that the commit "Added tooltip for workspace name" does completely exist there:

[tgolen]

Ah, nice investigation, Alex. So, it looks like we just need to get it added back into the code then?

[Beamanator]

The part that baffles me is that the commit "Added tooltip for workspace name" actually does seem to exist in staging (see screenshot) but only the tooltip import line!:

[Beamanator]

Clicking "View at this point in history" on the "Added tooltip for workspace name" commit on this page of historical commits, you can see the entire commit exists (importing Tooltip & using the Tooltip).

There's only one more commit on that file in the history (see link above), which is 9295307#diff-f4168366e38bc17178db9db7be5a28974510a61b5b657dcfe9cc86ddc2b51677, a "merge commit" -> So I think that one mucked up somehow - as seen below

[Beamanator]

cc @roryabraham @AndrewGable - have you gents seen this before?

[roryabraham]

I don't think so ... but great investigation so far! My guess is that someone had to manually resolve conflicts when a PR was CP'd to staging, and accidentally got rid of the tooltip.

[roryabraham]

Found it (https://github.com/Expensify/App/pull/5735/files#diff-f4168366e38bc17178db9db7be5a28974510a61b5b657dcfe9cc86ddc2b51677L141-L151) and it was indeed just a bad merge

[Beamanator]

Good find! Let me know how I can help fixing it, if you want help :D

[roryabraham]

Sounds good! I'll submit a PR right now and we'll CP it (this is causing other deploys to fail)

[roryabraham]

Wait a minute ... how can I submit a PR if the code's already on main? 🙃 Need a new plan 😆

[Beamanator]

Yeahhh exactly 😅 🙃

[Beamanator]

What if we have a commit remove it on main, then another commit adds it back, all in 1 PR?

[roryabraham]

Okay, I think just going to manually CP https://github.com/Expensify/App/pull/5812/files and that should fix it.

[roryabraham]

CPing here: https://github.com/Expensify/App/actions/runs/1356467770

[roryabraham]

Confirmed this is fixed on staging web, going to close this out.

[Beamanator]

Awesome, thanks @roryabraham

[tgolen]

woohoo! Thanks, Rory.

…

On Mon, Oct 18, 2021 at 3:16 PM Alex Beaman ***@***.***> wrote: Awesome, thanks @roryabraham <https://github.com/roryabraham> — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#5907 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAJMABYXWYUWQCBOTU3CQDDUHSFCVANCNFSM5GC75UZQ> .