From 0e6bc2d70bec14471240319f554dbda2f7bd275a Mon Sep 17 00:00:00 2001
From: Aaron Cox <aaron@greymass.com>
Date: Mon, 19 Sep 2022 16:27:08 -0400
Subject: [PATCH] Adding more details to keycert import to trace errors.

---
 app/modules/main/actions/account.js           | 10 +++++-
 .../Setup/Elements/Recover/EncryptionWords.js | 34 +++++++++++++++----
 package.json                                  |  2 +-
 yarn.lock                                     |  8 ++---
 4 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/app/modules/main/actions/account.js b/app/modules/main/actions/account.js
index 31be46a86d..a841848eef 100644
--- a/app/modules/main/actions/account.js
+++ b/app/modules/main/actions/account.js
@@ -285,7 +285,15 @@ export function returnKeyCertificateDecrypted(cert) {
       }
       return dispatch({
         type: types.ACCOUNT_KEY_CERTIFICATE_DECRYPTED_MISMATCH,
-        payload: 'The key certificate does not match the account specified.'
+        payload: {
+          account: cert.account,
+          auth,
+          blockchain: cert.blockchain.chainId,
+          data: result.data.permissions,
+          message: 'The key certificate does not match the account specified.',
+          publicKey: cert.publicKey,
+          server: cert.blockchain.node,
+        }
       });
     }
     return dispatch({
diff --git a/app/modules/main/containers/Sections/Home/Setup/Elements/Recover/EncryptionWords.js b/app/modules/main/containers/Sections/Home/Setup/Elements/Recover/EncryptionWords.js
index 9d46f1abfc..6f3fe573f8 100644
--- a/app/modules/main/containers/Sections/Home/Setup/Elements/Recover/EncryptionWords.js
+++ b/app/modules/main/containers/Sections/Home/Setup/Elements/Recover/EncryptionWords.js
@@ -6,7 +6,7 @@ import { connect } from 'react-redux';
 import { withRouter } from 'react-router-dom';
 import compose from 'lodash/fp/compose';
 
-import { Button, Divider, Header, Message, Segment } from 'semantic-ui-react';
+import { Accordion, Button, Divider, Header, Icon, Message, Segment } from 'semantic-ui-react';
 
 import AccountSetupElementsWordsList from '../Words/List';
 import GlobalFormFieldWords from '../../../../../../../../shared/components/Global/Form/Field/Words';
@@ -14,7 +14,8 @@ import GlobalFormFieldWords from '../../../../../../../../shared/components/Glob
 class AccountSetupRecoverEncryptionWords extends Component<Props> {
   state = {
     // Encryption Keys (6 words)
-    encryption: [],
+    encryption: ['shine', 'aware', 'copper', 'turkey', 'sting', 'logic'],
+    expandedError: false,
   }
   addEncryptionWord = (value) => {
     this.setState({
@@ -35,9 +36,13 @@ class AccountSetupRecoverEncryptionWords extends Component<Props> {
     this.props.setEncryptionWords(this.state.encryption);
     this.props.onClick();
   }
+  expandError = () => {
+    this.setState({ expandedError: !this.state.expandedError })
+  }
   render() {
     const {
       encryption,
+      expandedError,
     } = this.state;
     const {
       error
@@ -79,11 +84,26 @@ class AccountSetupRecoverEncryptionWords extends Component<Props> {
         }
         {(error)
           ? (
-            <Message
-              error
-              header={error.message}
-              content={`Check that the encryption words above match. If they do, go back and ensure the network, account name, and mnemonic words also match. (Error: ${JSON.stringify(error)})`}
-            />
+            <div>
+              <Message
+                error
+                header={error.message}
+                content={`Check that the encryption words above match. If they do, go back and ensure the network, account name, and mnemonic words also match.`}
+              />
+              <Accordion>
+                <Accordion.Title
+                  active={expandedError}
+                  index={0}
+                  onClick={this.expandError}
+                >
+                  <Icon name='dropdown' />
+                  Expand error details for troubleshooting
+                </Accordion.Title>
+                <Accordion.Content active={expandedError}>
+<pre>{JSON.stringify(error, null, '\t')}</pre>
+                </Accordion.Content>
+              </Accordion>
+            </div>
           )
           : (
             <Button
diff --git a/package.json b/package.json
index 0c721e968a..addf38fa61 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "@babel/preset-typescript": "^7.14.5",
     "@greymass/account-creation": "^0.0.1",
     "@greymass/anchor-link-session-manager": "0.3.1",
-    "@greymass/eosio": "0.6.1",
+    "@greymass/eosio": "^0.6.4",
     "@greymass/eosio-resources": "0.7.0",
     "@greymass/keycert": "^1.4.0",
     "@greymass/keycert-pdf": "^1.2.0",
diff --git a/yarn.lock b/yarn.lock
index 364c394288..60649dd536 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1492,10 +1492,10 @@
     bn.js "^4.11.9"
     tslib "^2.1.0"
 
-"@greymass/eosio@0.6.1":
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/@greymass/eosio/-/eosio-0.6.1.tgz#2af601b6f38a37cb3c78b62d80fd293b80814f62"
-  integrity sha512-K9VmejZmXHczuLBdQzEQayzISEG/s1PQ9awNf3nMeiVOnmjC5jnw/qNatY1PDpVhXsu+FcW59EAoCEWpuKnrfA==
+"@greymass/eosio@0.6.4", "@greymass/eosio@^0.6.4":
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/@greymass/eosio/-/eosio-0.6.4.tgz#9baf8aadacad69d61be20a53e235a9b4cbd97ffa"
+  integrity sha512-Wxr46tgh4J5Nm5tdTx5btJ/MZu36bZfxxCXfWRDAMfOn6FFFwgcZpY/sEv5eH9L2rCvxVrZtd2R8vPGsF/amQQ==
   dependencies:
     bn.js "^4.11.9"
     brorand "^1.1.0"