{"action":"closed","issue":{"url":"https://api.github.com/repos/swarmcity/SwarmCitySite/issues/26","repository_url":"https://api.github.com/repos/swarmcity/SwarmCitySite","labels_url":"https://api.github.com/repos/swarmcity/SwarmCitySite/issues/26/labels{/name}","comments_url":"https://api.github.com/repos/swarmcity/SwarmCitySite/issues/26/comments","events_url":"https://api.github.com/repos/swarmcity/SwarmCitySite/issues/26/events","html_url":"https://github.com/swarmcity/SwarmCitySite/issues/26","id":275302973,"number":26,"title":"Conflict-states in display-dealstate-mydetail","user":{"login":"kikipluche","id":9036081,"avatar_url":"https://avatars1.githubusercontent.com/u/9036081?v=4","gravatar_id":"","url":"https://api.github.com/users/kikipluche","html_url":"https://github.com/kikipluche","followers_url":"https://api.github.com/users/kikipluche/followers","following_url":"https://api.github.com/users/kikipluche/following{/other_user}","gists_url":"https://api.github.com/users/kikipluche/gists{/gist_id}","starred_url":"https://api.github.com/users/kikipluche/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kikipluche/subscriptions","organizations_url":"https://api.github.com/users/kikipluche/orgs","repos_url":"https://api.github.com/users/kikipluche/repos","events_url":"https://api.github.com/users/kikipluche/events{/privacy}","received_events_url":"https://api.github.com/users/kikipluche/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":{"login":"faffydee","id":24499354,"avatar_url":"https://avatars1.githubusercontent.com/u/24499354?v=4","gravatar_id":"","url":"https://api.github.com/users/faffydee","html_url":"https://github.com/faffydee","followers_url":"https://api.github.com/users/faffydee/followers","following_url":"https://api.github.com/users/faffydee/following{/other_user}","gists_url":"https://api.github.com/users/faffydee/gists{/gist_id}","starred_url":"https://api.github.com/users/faffydee/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/faffydee/subscriptions","organizations_url":"https://api.github.com/users/faffydee/orgs","repos_url":"https://api.github.com/users/faffydee/repos","events_url":"https://api.github.com/users/faffydee/events{/privacy}","received_events_url":"https://api.github.com/users/faffydee/received_events","type":"User","site_admin":false},"assignees":[{"login":"faffydee","id":24499354,"avatar_url":"https://avatars1.githubusercontent.com/u/24499354?v=4","gravatar_id":"","url":"https://api.github.com/users/faffydee","html_url":"https://github.com/faffydee","followers_url":"https://api.github.com/users/faffydee/followers","following_url":"https://api.github.com/users/faffydee/following{/other_user}","gists_url":"https://api.github.com/users/faffydee/gists{/gist_id}","starred_url":"https://api.github.com/users/faffydee/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/faffydee/subscriptions","organizations_url":"https://api.github.com/users/faffydee/orgs","repos_url":"https://api.github.com/users/faffydee/repos","events_url":"https://api.github.com/users/faffydee/events{/privacy}","received_events_url":"https://api.github.com/users/faffydee/received_events","type":"User","site_admin":false}],"milestone":null,"comments":1,"created_at":"2017-11-20T10:20:32Z","updated_at":"2017-11-21T13:11:29Z","closed_at":"2017-11-21T13:11:29Z","author_association":"NONE","body":"_From @faffydee on November 11, 2017 14:4_\n\nTo do the conflict-flow, the component [display-dealstate-mydetail](https://github.com/swarmcity/sc-boardwalk-production/wiki/Display-Dealstate-Mydetail) also needs a few new state.\r\n\r\nIn this component, a 5th, 6th and 7th question are added to determine the dealstate:\r\n5. Is this deal of which I am seeker in conflict?\r\n6. Did I resolve the deal by paying out?\r\n7. Is the deal resolved by the hashtagowner?\r\n\r\nThe states would be the following:\r\n\r\n////// \r\n### inconflict:\r\n\r\n![dealstate - inconflict - mobile](https://i.imgur.com/TBGBBb9.png)\r\n![dealstate - inconflict - desktop](https://i.imgur.com/SYjwqVw.png)\r\n\r\n1. yes | 2. yes | 3. yes | 4. no | 5. yes | 6. no | 7. no\r\n\r\n* **txt (body-bold, grey4):** \"This deal is ( > red ) in conflict ( < red ).\"\r\n* **txt (small-light, grey4):** \"The hashtagowner is added to your deal.\"\r\n* **hashtagowner-avatar (40x40px) + seeker-avatar (40x40px) + provider-avatar (40x40px):** > the order is important, also the overlapping.\r\n* **(CLICKABLE) txt (body-bold, blue):** > count of total chatmsgs > _Route:_ [Deal Chat](https://github.com/swarmcity/sc-boardwalk-production/wiki/deal-chat)\r\n* **(CLICKABLE)  chat-icon (blue, normal)** > _Route:_ [Deal Chat](https://github.com/swarmcity/sc-boardwalk-production/wiki/deal-chat)\r\n**grey2-area with (CLICKABLE)  Big btn (green):** \"payout\" > _Route:_ [Conflict Payout confirm](https://github.com/swarmcity/sc-boardwalk-production/wiki/conflict-payout-confirm)\r\n\r\n\r\n\r\n////// \r\n### conflictresolved:\r\n\r\n![dealstate - conflictresolved by hashtagowner - mobile](https://i.imgur.com/UDczgae.png)\r\n![dealstate - conflictresolved by hashtagowner - desktop](https://i.imgur.com/4PLCYDv.png)\r\n\r\n1. yes | 2. yes | 3. yes | 4. no | 5. yes | 6. yes | 7. no\r\n\r\n* **timestamp (small-light, grey4):** > when conflict was resolved\r\n* **txt (body-bold, grey4):** \"Conflict resolved.\"\r\n* **seeker-avatar (40x40px)**\r\n* **txt (body-default, grey4):** \"You resolved the conflict by paying out the deal. You received {{amount}} SWR on #pioneer.\"\r\n* **provider-avatar (40x40px)**\r\n* **txt (body-default, grey4):** \"{{provider}} was paid 1 SWT. {{provider}} gained 5 SWR on {{current hashtag}}.\"\r\n* **hashtagowner-avatar (40x40px)**\r\n* **txt (body-default, grey4): \"{{hashtagowner}} was involved, but the conflict was resolved by you.\"\r\n* **(CLICKABLE) link (blue):** \"see this on etherplorer\"\r\n\r\n\r\n////// \r\n### conflictresolved - by hashtagowner:\r\n\r\n![dealstate - conflictresolved - mobile](https://i.imgur.com/AQia9Az.png)\r\n![dealstate - conflictresolved - desktop](https://i.imgur.com/v2KM765.png)\r\n\r\n1. yes | 2. yes | 3. yes | 4. no | 5. yes | 6. no | 7. yes\r\n\r\n* **timestamp (small-light, grey4):** > when conflict was resolved\r\n* **txt (body-bold, grey4):** \"Conflict resolved.\"\r\n* **seeker-avatar (40x40px)**\r\n* **txt (body-default, grey4):** \"{{seeker}} was paid {{amount}} SWT. {{seeker}} gained 5 SWR on {{current hashtag}}.\"\r\n* **provider-avatar (40x40px)**\r\n* **txt (body-default, grey4):** \"{{provider}} was paid 1 SWT. {{provider}} gained 5 SWR on {{current hashtag}}.\"\r\n* **hashtagowner-avatar (40x40px)**\r\n* **txt (body-default, grey4): \"{{hashtagowner}} resolved this conflict yesterday, at {{timestamp}}\".\r\n* **(CLICKABLE) link (blue):** \"see this on etherplorer\"\r\n\n\n_Copied from original issue: swarmcity/sc-boardwalk-production#319_"}}
{"actor":{"display_login":"faffydee"}}