You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Workspace - Fields appear twice in invite people page #4060
👋 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:
Identify the pull request that introduced this issue and revert it.
OK, I'm trying to debug this locally, but I am not able to create a workspace for some reason. I keep getting the error Your session has expired. Please sign in again. from the API and having trouble getting this working.
I'm working with @roryabraham to see if we can determine what went wrong. You can see in this PR #4083 the difference between main and staging, when there should be no difference.
@tgolen I just checked the code for the page. It seems the merge Conflict was not resolved correctly. Both old and new changes are merged into the code which is causing duplicates. It could be me as well.
No update other than that this diff has the same weirdness we observed before. Unless other PRs have been merged since the lock label was added, there should be no diff between main and the latest tag.
Well, there has been another deploy from main to staging, but for some reason it's still not registering the diff we expect. This is the code that updates staging from main. If we look at the logs for the latest run, we can see that, when main is merged into the temporary copy of staging, WorkspaceInvitePage is not included in the list of changed files. The pull request that was created for this run is right here, and I would've expected it to include the changes in WorkspaceInvitePage from main.
Because I'm unsure why this happened and we've never seen it happen before, let's open a PR directly from main to staging and merge that. It won't cause a staging deploy, so we'll have to unlock and relock the StagingDeployCash in order to trigger another staging deploy.
Maybe we can modify the invite page and it will be included and there is an pr #4068 here.
Well, I can't explain why the existing diff from the WorkspaceInvitePage is not being included in the PR that's supposed to update main from staging, so I'm not sure that merging more changes to main will solve the problem. It might, but I don't know.
Instead, I think we should just merge #4113 and then unlock and relock the StagingDeployCash.
Activity
OSBotify commentedon Jul 15, 2021
👋 Friendly reminder that deploy blockers are time-sensitive ⏱ issues! Check out the open
StagingDeployCashdeploy checklist to see the list of PRs included in this release, then work quickly to do one of the following:MelvinBot commentedon Jul 15, 2021
Triggered auto assignment to @tgolen (
Engineering), see https://stackoverflow.com/c/expensify/questions/4319 for more details.tgolen commentedon Jul 15, 2021
Hm, that's pretty weird, but I verified it happens! Must be rendered twice or something. Gonna try to look into this
tgolen commentedon Jul 15, 2021
OK, I'm trying to debug this locally, but I am not able to create a workspace for some reason. I keep getting the error
Your session has expired. Please sign in again.from the API and having trouble getting this working.tgolen commentedon Jul 15, 2021
All right, signing out of e.cash and signing back in seemed to have fixed it.
The problem is, I can't reproduce the problem locally:
I'll try checking out staging to see if I can reproduce it with that code
tgolen commentedon Jul 15, 2021
OK, so if I check out the staging branch locally, I can reproduce the bug.
However, if I apply the changes from #3988 to the staging branch, then the bug is fixed.
What's odd is that the PR says it's on staging, but that doesn't seem possible.
tgolen commentedon Jul 15, 2021
I'm working with @roryabraham to see if we can determine what went wrong. You can see in this PR #4083 the difference between main and staging, when there should be no difference.
tgolen commentedon Jul 15, 2021
Not really an update, but we are waiting to do a full deploy from
maintostagingto see if it fixes this.isagoico commentedon Jul 16, 2021
@tgolen We retested this on latest build (1.0.79-0) and it's still reproducible 😟
tgolen commentedon Jul 16, 2021
@roryabraham Do you have any update for this?
parasharrajat commentedon Jul 16, 2021
@tgolen I just checked the code for the page. It seems the merge Conflict was not resolved correctly. Both old and new changes are merged into the code which is causing duplicates. It could be me as well.
Lol. I think it's me. https://github.com/Expensify/Expensify.cash/blame/staging/src/pages/workspace/WorkspaceInvitePage.jsBut it is very strange to see that main does not have this duplicate code.
Edit:
Not me I checked my local.
roryabraham commentedon Jul 16, 2021
No update other than that this diff has the same weirdness we observed before. Unless other PRs have been merged since the lock label was added, there should be no diff between main and the latest tag.
tgolen commentedon Jul 16, 2021
OK, I'm going to set this back to
dailysince we're just waiting on another deploy frommaintostagingto see if it clears up.roryabraham commentedon Jul 16, 2021
Well, there has been another deploy from
maintostaging, but for some reason it's still not registering the diff we expect. This is the code that updatesstagingfrommain. If we look at the logs for the latest run, we can see that, whenmainis merged into the temporary copy ofstaging,WorkspaceInvitePageis not included in the list of changed files. The pull request that was created for this run is right here, and I would've expected it to include the changes inWorkspaceInvitePagefrommain.Because I'm unsure why this happened and we've never seen it happen before, let's open a PR directly from
maintostagingand merge that. It won't cause a staging deploy, so we'll have to unlock and relock theStagingDeployCashin order to trigger another staging deploy.parasharrajat commentedon Jul 16, 2021
Maybe we can modify the invite page and it will be included and there is an pr #4068 here.
roryabraham commentedon Jul 16, 2021
Well, I can't explain why the existing diff from the
WorkspaceInvitePageis not being included in the PR that's supposed to updatemainfromstaging, so I'm not sure that merging more changes tomainwill solve the problem. It might, but I don't know.Instead, I think we should just merge #4113 and then unlock and relock the
StagingDeployCash.tgolen commentedon Jul 16, 2021
Not fixed! That PR merged staging into main... so main is broken again. I'll submit a PR to fix main and we can CP it