Cancel tx JS #4958

CraigglesO · 2017-03-18T19:55:49Z

Javascript updates from #4949

updated jsonrpc->parity
updated api->rpc->parity
spelling/grammar fixes

jacogr · 2017-03-19T07:57:55Z

npm-debug.log

@@ -0,0 +1,24 @@
+0 info it worked if it ends with ok


Please remove.

jacogr · 2017-03-19T07:59:38Z

Small sanitasion grumbles - Remove npm-debug.log (should probably be added to .gitignore), update with latest master (to pull in the changes from @tomusdrw , currently they still show in this PR)

Will play a bit, excited to have this in.

CraigglesO · 2017-03-19T08:27:04Z

FIXED! Good eye! I added to .gitignore for the future.

I'll definitely refactor the code when the edit button comes in.

jacogr · 2017-03-19T08:27:39Z

js/src/ui/TxList/TxRow/txRow.js

+
+    if (canceled) {
+      return (
+        <div className={ styles.pending }>CANCELED</div>


FormattedMessage?

jacogr · 2017-03-19T08:27:49Z

js/src/ui/TxList/TxRow/txRow.js

+    if (!isCancelOpen) {
+      return (
+        <div className={ styles.pending }>
+          <div>SCHEDULED</div>


FormattedMessage?

jacogr · 2017-03-19T08:28:47Z

js/src/ui/TxList/TxRow/txRow.js

+          <div>SCHEDULED</div>
+          <a
+            className={ styles.cancel }
+            onClick={ () => this.setState({ isCancelOpen: true }) }


Would prefer not using in-line closures, aligning with the codebase. (I actually thought we had a linting rule that warns about these, weird that it wasn't picked up)

jacogr · 2017-03-19T08:29:15Z

js/src/ui/TxList/TxRow/txRow.js

+        <a onClick={ () => this.cancelTransaction(parity, hash) }>Cancel</a>
+        <span> | </span>
+        <a onClick={ () => this.setState({ isCancelOpen: false }) }>Nevermind</a>
+      </div>


FormattedMessage & inline closures.

jacogr · 2017-03-19T08:31:02Z

js/src/ui/TxList/txList.css

      line-height: 1.5em;
-      opacity: 0.5;
+      color: grey;


Not 100% sure we use this anywhere, would prefer to keep it where it was to keep consistent (We really need to externalise all colours and just pull in CSS variables - no duplication, consistency is maintained)

The problem is, if opacity is dropped, the "cancel" button will also be 50% opacity LOL. Also, all font is either black or white, 0.5 opacity for both black and white revert to grey anyways.

rphmeier · 2017-03-19T19:49:52Z

js/src/jsonrpc/interfaces/parity.js

+    ],
+    returns: {
+      type: Boolean,
+      desc: 'returns `true` if the upgrade to the new release was successfully executed, `false` if not.',


Description needs updating

rphmeier · 2017-03-19T19:51:08Z

js/src/views/Signer/containers/RequestsPage/requestsPage.js

@@ -100,7 +100,7 @@ class RequestsPage extends Component {
          <div className={ styles.noRequestsMsg }>
            <FormattedMessage
              id='signer.requestsPage.noPending'
-              defaultMessage='There are no requests requiring your confirmation.'
+              defaultMessage='There are no transactions or requests requiring your confirmation.'


Not sure if I 100% agree with this, although getting heavily into bikeshed territory :)
Transaction signing requests are still signer requests. "transactions or requests" implies that they aren't.

tomusdrw

Tiny typo in removeHash function causing the blocks to leak, but otherwise looks good.

CraigglesO · 2017-04-10T14:46:50Z

This should do it. 👍

jacogr · 2017-04-19T09:08:21Z

js/src/ui/TxList/TxRow/txRow.js

+      block = blockNumber.minus(block);
+      return (block.toNumber() < 0)
+        ? block.abs().toFormat(0) + ' blocks left'
+        : 'submitting';


Just make the strings here translatable. (Also line 247 is still, as part of the value for which, non-translatable)

jacogr · 2017-04-19T09:10:33Z

Couple of last i18n issues, but apart from that looking good.

CraigglesO · 2017-04-21T16:22:30Z

Let me know 💃

jacogr · 2017-04-22T11:21:52Z

One last conflict.

CraigglesO · 2017-04-23T00:59:32Z

DONE.

5chdn · 2017-05-18T10:07:15Z

Can we have this backported to beta? It's causing a support nightmare :)

* Remove transaction RPC * Bumping multihash and libc * Updating nanomsg * bump nanomsg * cancel tx * cancel-tx-js * cancel-tx-js * cancel-tx-js * cancel-tx-hs * cancel-tx-js * cancel-tx-js * cancel-tx-js * small fixes * edit & time till submit * edit & time till submit * updates * updates * udpates * udpates * grumbles * step 1 * Wonderful updates * ready * small refact * small refact * grumbles 1 * ffx2 * good ol' fashioned updates * latest and greatest * removeHash * removeHash * spec * fix 1 * fix 1 * fix 2 * fix 2 * ff * ff * ff * updates

* option to disable persistent txqueue (#5544) * option to disable persistent txqueue * New option goes with kin * Remove transaction RPC (#4949) * Cancel tx JS (#4958) * Remove transaction RPC * Bumping multihash and libc * Updating nanomsg * bump nanomsg * cancel tx * cancel-tx-js * cancel-tx-js * cancel-tx-js * cancel-tx-hs * cancel-tx-js * cancel-tx-js * cancel-tx-js * small fixes * edit & time till submit * edit & time till submit * updates * updates * udpates * udpates * grumbles * step 1 * Wonderful updates * ready * small refact * small refact * grumbles 1 * ffx2 * good ol' fashioned updates * latest and greatest * removeHash * removeHash * spec * fix 1 * fix 1 * fix 2 * fix 2 * ff * ff * ff * updates * Updating documentation for RPCs (#5392) * Removing minBlocks occurrencies * Docs for new RPCs. * Fixing linting issues, updating *withToken documentatiojn. * Adding missing RPCs. Fixing tests. * Fixing lint issues.

tomusdrw and others added 12 commits March 17, 2017 14:25

Remove transaction RPC

49ed3d8

Bumping multihash and libc

a9ae42c

Updating nanomsg

eb8fe28

bump nanomsg

3d31031

cancel tx

eb3e79c

cancel-tx-js

45d1641

cancel-tx-js

f871389

cancel-tx-js

aa47572

cancel-tx-hs

35d959e

cancel-tx-js

2235923

cancel-tx-js

65c6390

cancel-tx-js

14dd162

CraigglesO added A0-pleasereview 🤓 Pull request needs code review. M7-signer 🔏 Trusted signer. labels Mar 18, 2017

jacogr reviewed Mar 19, 2017

View reviewed changes

npm-debug.log Outdated

@@ -0,0 +1,24 @@

0 info it worked if it ends with ok

Copy link

Contributor

jacogr Mar 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove.

jacogr added A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. and removed A0-pleasereview 🤓 Pull request needs code review. labels Mar 19, 2017

CraigglesO added 2 commits March 19, 2017 04:08

small fixes

9766508

Merge remote-tracking branch 'origin/master' into cancel-tx-js

b57aecd

jacogr added A0-pleasereview 🤓 Pull request needs code review. and removed A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. labels Mar 19, 2017

jacogr reviewed Mar 19, 2017

View reviewed changes

rphmeier reviewed Mar 19, 2017

View reviewed changes

tomusdrw reviewed Apr 10, 2017

View reviewed changes

CraigglesO added 8 commits April 10, 2017 10:01

fix 1

2d03df7

fix 1

c9535bf

fix 2

8d01b28

fix 2

666f59f

ff

10eda45

ff

ca73bc8

ff

bd05a8c

ff

0f4f40d

jacogr reviewed Apr 19, 2017

View reviewed changes

jacogr added A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. and removed A0-pleasereview 🤓 Pull request needs code review. labels Apr 19, 2017

updates

3bf3972

CraigglesO added A0-pleasereview 🤓 Pull request needs code review. and removed A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. labels Apr 21, 2017

jacogr added A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. and removed A0-pleasereview 🤓 Pull request needs code review. labels Apr 22, 2017

lol

fb72ab4

jacogr merged commit f7d5d6c into master Apr 25, 2017

jacogr deleted the cancel-tx-js branch April 25, 2017 08:08

5chdn mentioned this pull request May 10, 2017

Force-cancel transaction #4519

Closed

5chdn added the B0-patch label May 18, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cancel tx JS #4958

Cancel tx JS #4958

CraigglesO commented Mar 18, 2017

jacogr Mar 19, 2017

jacogr commented Mar 19, 2017 •

edited

Loading

CraigglesO commented Mar 19, 2017

jacogr Mar 19, 2017

jacogr Mar 19, 2017

jacogr Mar 19, 2017

jacogr Mar 19, 2017

jacogr Mar 19, 2017

CraigglesO Mar 19, 2017

rphmeier Mar 19, 2017

rphmeier Mar 19, 2017

tomusdrw left a comment

CraigglesO commented Apr 10, 2017

jacogr Apr 19, 2017

jacogr commented Apr 19, 2017

CraigglesO commented Apr 21, 2017

jacogr commented Apr 22, 2017

CraigglesO commented Apr 23, 2017

5chdn commented May 18, 2017

Cancel tx JS #4958

Cancel tx JS #4958

Conversation

CraigglesO commented Mar 18, 2017

Choose a reason for hiding this comment

jacogr commented Mar 19, 2017 • edited Loading

CraigglesO commented Mar 19, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tomusdrw left a comment

Choose a reason for hiding this comment

CraigglesO commented Apr 10, 2017

Choose a reason for hiding this comment

jacogr commented Apr 19, 2017

CraigglesO commented Apr 21, 2017

jacogr commented Apr 22, 2017

CraigglesO commented Apr 23, 2017

5chdn commented May 18, 2017

jacogr commented Mar 19, 2017 •

edited

Loading