[Cashtab] Rename contacts
AbandonedPublic
Actions

Authored by emack on Apr 9 2022, 13:24.

Details

Reviewers

bytesofman

Group Reviewers

Restricted Project

Summary

Cascading diff based on D11266 Contact List MVP

The following 4 diffs will be landed in quick succession.

D11266 Contact list MVP
D11323 Rename contacts
D11324 Delete contacts
D11321 Export contacts

Depends on D11266

Test Plan

verify the rename icon is not rendered for empty contact lists
rename a contact and ensure the change persists even if the browser is restarted
rename a contact multiple times and ensure the latest change is persisted

Diff Detail

Repository

rABC Bitcoin ABC

Branch

renameContact

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 18763
Build 37317: Build Diff	cashtab-tests
Build 37316: arc lint + arc unit

Event Timeline

emack created this revision.Apr 9 2022, 13:24

Herald added a reviewer: Restricted Project. · View Herald TranscriptApr 9 2022, 13:24

emack requested review of this revision.Apr 9 2022, 13:24

emack edited the summary of this revision. (Show Details)Apr 9 2022, 13:25

Harbormaster completed remote builds in B18763: Diff 33131.Apr 9 2022, 13:26

emack mentioned this in D11324: [Cashtab] Delete contacts.Apr 9 2022, 13:58

emack edited the summary of this revision. (Show Details)Apr 9 2022, 13:58

emack edited the summary of this revision. (Show Details)

emack mentioned this in D11321: [Cashtab] Export contact list.Apr 9 2022, 14:01

emack mentioned this in D11266: [Cashtab] Contact List.Apr 9 2022, 14:09

Looks good but I'm not able to pull it down for review. Try adding the text "depends on d11266" in the summary of the diff

This revision now requires changes to proceed.Apr 11 2022, 15:32

emack edited the summary of this revision. (Show Details)Apr 11 2022, 23:42

emack added a parent revision: D11266: [Cashtab] Contact List.

Adding depends on helped (I'm able to run arc patch 11323) but now I get a conflict, git cherrypick failed error

 COMMITTED  Successfully committed patch.

 Cherry Pick Failed!
 Exception 
Command failed with error #1!
COMMAND
git cherry-pick -- arcpatch-D11266_1

STDOUT
Auto-merging web/cashtab/src/components/Home/__tests__/__snapshots__/Home.test.js.snap
CONFLICT (content): Merge conflict in web/cashtab/src/components/Home/__tests__/__snapshots__/Home.test.js.snap
Auto-merging web/cashtab/src/components/Receive/__tests__/__snapshots__/Receive.test.js.snap
CONFLICT (content): Merge conflict in web/cashtab/src/components/Receive/__tests__/__snapshots__/Receive.test.js.snap


STDERR
error: could not apply 36ba32bb8... [Cashtab] Contact List
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

(Run with `--trace` for a full exception trace.)

Looks like a merge conflict between snapshots on this diff vs the original. I'm not sure best approach to troubleshoot this through phab, may need to wait until rev 1 is landed and then rebase this.

Rebased to latest master which includes D11266 mvp

Harbormaster completed remote builds in B18801: Diff 33182.Apr 13 2022, 01:06

Unfortunately I still get the same merge error if I try to arc patch this, even after pulling the latest master. Please abandon and create a new diff.

This revision now requires changes to proceed.Apr 13 2022, 08:43

emack mentioned this in D11344: [Cashtab] Rename contacts.Apr 13 2022, 09:54

Superseded by D11344

emack mentioned this in rABC31a72674cb7b: [Cashtab] Rename contacts.Apr 13 2022, 12:14