Fixes ledger address display bug

CityOfZion · Sep 13, 2021 · 4573c35 · 4573c35
1 parent b810cc6
commit 4573c35
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/__tests__/components/__snapshots__/Settings.test.js.snap b/__tests__/components/__snapshots__/Settings.test.js.snap
@@ -920,7 +920,7 @@ exports[`Settings renders without crashing 1`] = `
                                                                                         Manage your neon wallet
                                                                                       </FormattedMessage>
                                                                                        - v
-                                                                                      2.9.0
+                                                                                      2.9.1
                                                                                     </div>
                                                                                     <div
                                                                                       className="settingsPanelHeaderItem"

diff --git a/app/components/Modals/LedgerMigrationConfirm/LedgerMigrationConfirm.jsx b/app/components/Modals/LedgerMigrationConfirm/LedgerMigrationConfirm.jsx
@@ -52,7 +52,7 @@ class LedgerMigrationConfirm extends React.Component<Props, State> {
         style={{
           content: {
             width,
-            height: '650px',
+            height,
           },
         }}
       >

diff --git a/app/containers/Home/Home.jsx b/app/containers/Home/Home.jsx
@@ -71,6 +71,7 @@ const shouldRenderReleaseNotes = version => {
     '2.7.4',
     '2.8.0',
     '2.9.0',
+    '2.9.1',
   ]
   if (
     displayWhitelist.includes(version) &&

diff --git a/app/containers/Send/Send.jsx b/app/containers/Send/Send.jsx
@@ -433,7 +433,9 @@ export default class Send extends React.Component<Props, State> {
       ? this.props.showModal(MODAL_TYPES.LEDGER_MIGRATION_CONFIRM, {
           title: 'Confirm Migration',
           shouldRenderHeader: false,
-          height: '524px',
+          height: feeIsRequired(sendEntries[0].symbol, sendEntries[0].amount)
+            ? '650px'
+            : '580px',
           renderBody: () => (
             <div className={styles.confirmMigration}>
               <h2> Confirmation </h2>
@@ -450,7 +452,7 @@ export default class Send extends React.Component<Props, State> {
 
               <div>
                 To (Neo N3): <br />
-                <code> {TO_ACCOUNT.address}</code>
+                <code> {this.props.migrationAddress}</code>
               </div>
               <br />
               {feeIsRequired(sendEntries[0].symbol, sendEntries[0].amount) && (

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Neon",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "main": "./main.js",
   "description": "Light wallet for NEO blockchain",
   "homepage": "https://github.com/CityOfZion/neon-wallet",
-Original file line number
+Diff line change
@@ Expand Up / @@ -920,7 +920,7 @@ exports[`Settings renders without crashing 1`] = ` @@
                                                                                             Manage your neon wallet
                                                                                           </FormattedMessage>
                                                                                            - v
-.9.0
+.9.1
                                                                                         </div>
                                                                                         <div
                                                                                           className="settingsPanelHeaderItem"
@@ Expand Down @@