From 379fd4cb6f584707c875f6ce96912385c39d7b90 Mon Sep 17 00:00:00 2001
From: Jordan Muir <jordan@frame.sh>
Date: Mon, 6 Dec 2021 11:04:50 -0500
Subject: [PATCH] Update build for mac, relabel gas settings (#661)

* Build for x64 and arm64 on mac
* Priority fee copy
---
 .../TxOverlay/TxFeeOverlay/index.js           |  4 +--
 app/App/Panel/Notify/AddChain/index.js        | 20 +++++------
 .../Panel/Notify/AddChain/style/index.styl    |  4 +--
 .../Panel/Notify/AddToken/style/index.styl    |  7 ++--
 app/App/Panel/Notify/CustomTokens/index.js    |  2 +-
 .../Notify/CustomTokens/style/index.styl      |  9 ++---
 app/App/Panel/Notify/index.js                 | 36 +++++++++++++++++++
 dash/App/Add/style/index.styl                 |  7 ++--
 dash/index.styl                               |  7 ++--
 package.json                                  |  7 ++++
 10 files changed, 75 insertions(+), 28 deletions(-)

diff --git a/app/App/Panel/Main/Account/Requests/TransactionRequest/TxOverlay/TxFeeOverlay/index.js b/app/App/Panel/Main/Account/Requests/TransactionRequest/TxOverlay/TxFeeOverlay/index.js
index 3346e2bd6..62ebd1e16 100644
--- a/app/App/Panel/Main/Account/Requests/TransactionRequest/TxOverlay/TxFeeOverlay/index.js
+++ b/app/App/Panel/Main/Account/Requests/TransactionRequest/TxOverlay/TxFeeOverlay/index.js
@@ -232,7 +232,7 @@ class TxFeeOverlay extends React.Component {
             }}
           />
         </div>
-        <div className='txFeeOverlayLabel'>Max Base Fee (GWEI)</div>
+        <div className='txFeeOverlayLabel'>Base Fee (GWEI)</div>
       </div>
     )
   }
@@ -269,7 +269,7 @@ class TxFeeOverlay extends React.Component {
             }}
           />
         </div>
-        <div className='txFeeOverlayLabel'>Priority Fee (GWEI) </div>
+        <div className='txFeeOverlayLabel'>Max Priority Fee (GWEI) </div>
       </div>
     )
   }
diff --git a/app/App/Panel/Notify/AddChain/index.js b/app/App/Panel/Notify/AddChain/index.js
index 4f47312c6..4a2c18809 100644
--- a/app/App/Panel/Notify/AddChain/index.js
+++ b/app/App/Panel/Notify/AddChain/index.js
@@ -63,7 +63,7 @@ class AddChain extends React.Component {
               <div className='chainName'>
                 <div className='chainInputLabel'>Chain Name</div>
                 <input
-                  className='chainInput chainInputLarge'
+                  className={this.state.newNetworkName === this.newNetworkNameDefault ? 'chainInput chainInputDim' : 'chainInput'}
                   value={this.state.newNetworkName} spellCheck='false'
                   onChange={(e) => {
                     this.setState({ newNetworkName: e.target.value })
@@ -82,7 +82,7 @@ class AddChain extends React.Component {
               <div className='chainId'>
                 <div className='chainInputLabel'>Chain ID</div>
                 <input
-                  className='chainInput'
+                  className={this.state.newNetworkId === this.newNetworkIdDefault ? 'chainInput chainInputDim' : 'chainInput'}
                   value={this.state.newNetworkId} spellCheck='false'
                   onChange={(e) => {
                     if (Number(parseInt(e.target.value)) || e.target.value === '') {
@@ -101,7 +101,7 @@ class AddChain extends React.Component {
               <div className='chainSymbol'>
                 <div className='chainInputLabel'>Native Symbol</div>
                 <input
-                  className='chainInput'
+                  className={this.state.newNetworkSymbol === this.newNetworkSymbolDefault ? 'chainInput chainInputDim' : 'chainInput'}
                   value={this.state.newNetworkSymbol} spellCheck='false'
                   onChange={(e) => {
                     if (e.target.value.length > 8) return e.preventDefault()
@@ -121,7 +121,7 @@ class AddChain extends React.Component {
               <div className='chainExplorer'>
                 <div className='chainInputLabel'>Block Explorer</div>
                 <input
-                  className='chainInput'
+                  className={this.state.newNetworkExplorer === this.newNetworkExplorerDefault ? 'chainInput chainInputDim' : 'chainInput'}
                   value={this.state.newNetworkExplorer} spellCheck='false'
                   onChange={(e) => {
                     this.setState({ newNetworkExplorer: e.target.value })
@@ -140,7 +140,7 @@ class AddChain extends React.Component {
               <div className='chainExplorer'>
                 <div className='chainInputLabel'>Primary RPC</div>
                 <input
-                  className='chainInput'
+                  className={this.state.newNetworkRPCPrimary === this.newNetworkRPCPrimary ? 'chainInput chainInputDim' : 'chainInput'}
                   value={this.state.newNetworkRPCPrimary} spellCheck='false'
                   onChange={(e) => {
                     this.setState({ newNetworkRPCPrimary: e.target.value })
@@ -159,7 +159,7 @@ class AddChain extends React.Component {
               <div className='chainExplorer'>
                 <div className='chainInputLabel'>Secondary RPC</div>
                 <input
-                  className='chainInput'
+                  className={this.state.newNetworkRPCSecondary === this.newNetworkRPCSecondary ? 'chainInput chainInputDim' : 'chainInput'}
                   value={this.state.newNetworkRPCSecondary} spellCheck='false'
                   onChange={(e) => {
                     this.setState({ newNetworkRPCSecondary: e.target.value })
@@ -241,7 +241,7 @@ class AddChain extends React.Component {
             <div className='chainRow'>
               {changedNewNetwork && newNetworkReady ? (
                 <div 
-                  className='addChainSubmit addChainSubmitEnabled' 
+                  className='addTokenSubmit addTokenSubmitEnabled' 
                   onMouseDown={() => {
                     const net = {
                       id: this.state.newNetworkId,
@@ -259,13 +259,13 @@ class AddChain extends React.Component {
                     }, 400)
                   }}
                 >
-                  {svg.octicon('plus', { height: 17 })} Add Chain
+                  Add Chain
                 </div>
               ) : (
                 <div 
-                  className='addChainSubmit' 
+                  className='addTokenSubmit' 
                 >
-                  {svg.octicon('plus', { height: 17 })} Fill in Chain
+                  Fill in Chain
                 </div>
               )}
             </div>
diff --git a/app/App/Panel/Notify/AddChain/style/index.styl b/app/App/Panel/Notify/AddChain/style/index.styl
index 4721e8318..a68c95b39 100644
--- a/app/App/Panel/Notify/AddChain/style/index.styl
+++ b/app/App/Panel/Notify/AddChain/style/index.styl
@@ -52,8 +52,8 @@
   font-weight 300
   color var(--outerspace)
 
-.chainInputLarge
-  font-size 24px
+.chainInputDim
+  color var(--outerspace03)
 
 .chainInputLabel
   font-size 11px
diff --git a/app/App/Panel/Notify/AddToken/style/index.styl b/app/App/Panel/Notify/AddToken/style/index.styl
index 69d154fc1..bbc5f08b2 100644
--- a/app/App/Panel/Notify/AddToken/style/index.styl
+++ b/app/App/Panel/Notify/AddToken/style/index.styl
@@ -56,7 +56,7 @@
   width 100%
   background var(--ghostZ)
   border-radius 8px
-  font-family OpenSans, sans-serif
+  font-family FiraCode, monospace
   padding 10px
   font-weight 300
   color var(--outerspace)
@@ -68,10 +68,7 @@
   font-family 'Fira Code', monospace
   font-weight 500
   font-size 12px
-
-.tokenInputLarge
-  font-size 16px
-
+  
 .tokenInputLabel
   font-size 11px
   text-transform uppercase
diff --git a/app/App/Panel/Notify/CustomTokens/index.js b/app/App/Panel/Notify/CustomTokens/index.js
index 22289e5cc..4d5141a7e 100644
--- a/app/App/Panel/Notify/CustomTokens/index.js
+++ b/app/App/Panel/Notify/CustomTokens/index.js
@@ -87,7 +87,7 @@ class CustomTokens extends React.Component {
                 )
               }) : (
                 <div className='customTokensListNoTokens'>
-                  {'No Custom Tokens Added'}
+                  {'No Custom Tokens'}
                 </div>
               )}
             </div>
diff --git a/app/App/Panel/Notify/CustomTokens/style/index.styl b/app/App/Panel/Notify/CustomTokens/style/index.styl
index 774a65a7d..80cf0aa50 100644
--- a/app/App/Panel/Notify/CustomTokens/style/index.styl
+++ b/app/App/Panel/Notify/CustomTokens/style/index.styl
@@ -21,9 +21,10 @@
       display flex
       justify-content center
       align-items center
-      font-size 13px
+      font-size 11px
       padding 0px 12px
-      font-weight 400
+      letter-spacing 1px
+      font-weight 600
       text-transform uppercase
       cursor pointer
       *
@@ -59,10 +60,10 @@
     top 0px
     left 5px
     right 5px
-    height 160px
+    bottom 0px
     display flex
     font-size 20px
-    font-weight 100
+    font-weight 500
     justify-content center
     align-items center
     text-transform uppercase
diff --git a/app/App/Panel/Notify/index.js b/app/App/Panel/Notify/index.js
index 155f5ca20..55d20d168 100644
--- a/app/App/Panel/Notify/index.js
+++ b/app/App/Panel/Notify/index.js
@@ -520,6 +520,9 @@ class Notify extends React.Component {
     if (notify === 'mainnet') {
       return (
         <div className='notify cardShow' onMouseDown={() => this.store.notify()}>
+          <div className='notifyCloseButton' onMouseDown={() => this.store.notify()}>
+            {svg.octicon('x', { height: 17 })}
+          </div>
           {this.mainnet()}
         </div>
       )
@@ -532,66 +535,99 @@ class Notify extends React.Component {
     } else if (notify === 'nonceWarning') {
       return (
         <div className='notify cardShow' onMouseDown={() => this.store.notify()}>
+          <div className='notifyCloseButton' onMouseDown={() => this.store.notify()}>
+            {svg.octicon('x', { height: 17 })}
+          </div>
           {this.nonceWarning()}
         </div>
       )
     } else if (notify === 'gasFeeWarning') {
       return (
         <div className='notify cardShow' onMouseDown={() => this.store.notify()}>
+          <div className='notifyCloseButton' onMouseDown={() => this.store.notify()}>
+            {svg.octicon('x', { height: 17 })}
+          </div>
           {this.gasFeeWarning(this.store('view.notifyData'))}
         </div>
       )
     } else if (notify === 'noSignerWarning') {
       return (
         <div className='notify cardShow' onMouseDown={() => this.store.notify()}>
+          <div className='notifyCloseButton' onMouseDown={() => this.store.notify()}>
+            {svg.octicon('x', { height: 17 })}
+          </div>
           {this.noSignerWarning(this.store('view.notifyData'))}
         </div>
       )
     } else if (notify === 'signerLockedWarning') {
       return (
         <div className='notify cardShow' onMouseDown={() => this.store.notify()}>
+          <div className='notifyCloseButton' onMouseDown={() => this.store.notify()}>
+            {svg.octicon('x', { height: 17 })}
+          </div>
           {this.signerLockedWarning(this.store('view.notifyData'))}
         </div>
       )
     } else if (notify === 'signerCompatibilityWarning') {
       return (
         <div className='notify cardShow' onMouseDown={() => this.store.notify()}>
+          <div className='notifyCloseButton' onMouseDown={() => this.store.notify()}>
+            {svg.octicon('x', { height: 17 })}
+          </div>
           {this.signerCompatibilityWarning(this.store('view.notifyData'))}
         </div>
       )
     } else if (notify === 'contractData') {
       return (
         <div className='notify cardShow' onMouseDown={() => this.store.notify()}>
+          <div className='notifyCloseButton' onMouseDown={() => this.store.notify()}>
+            {svg.octicon('x', { height: 17 })}
+          </div>
           {this.contractData()}
         </div>
       )
     } else if (notify === 'hotAccountWarning') {
       return (
         <div className='notify cardShow' onMouseDown={() => this.store.notify()}>
+          <div className='notifyCloseButton' onMouseDown={() => this.store.notify()}>
+            {svg.octicon('x', { height: 17 })}
+          </div>
           {this.hotAccountWarning()}
         </div>
       )
     } else if (notify === 'hotSignerMismatch') {
       return (
         <div className='notify cardShow' onMouseDown={() => this.store.notify()}>
+          <div className='notifyCloseButton' onMouseDown={() => this.store.notify()}>
+            {svg.octicon('x', { height: 17 })}
+          </div>
           {this.hotSignerMismatch()}
         </div>
       )
     } else if (notify === 'openExternal') {
       return (
         <div className='notify cardShow' onMouseDown={() => this.store.notify()}>
+          <div className='notifyCloseButton' onMouseDown={() => this.store.notify()}>
+            {svg.octicon('x', { height: 17 })}
+          </div>
           {this.openExternal(this.store('view.notifyData'))}
         </div>
       )
     } else if (notify === 'openExplorer') {
       return (
         <div className='notify cardShow' onMouseDown={() => this.store.notify()}>
+          <div className='notifyCloseButton' onMouseDown={() => this.store.notify()}>
+            {svg.octicon('x', { height: 17 })}
+          </div>
           {this.openExplorer(this.store('view.notifyData'))}
         </div>
       )
     } else if (notify === 'addChain') {
       return (
         <div className='notify cardShow' onMouseDown={() => this.store.notify()}>
+          <div className='notifyCloseButton' onMouseDown={() => this.store.notify()}>
+            {svg.octicon('x', { height: 17 })}
+          </div>
           <AddChain req={this.store('view.notifyData')} />
         </div>
       )
diff --git a/dash/App/Add/style/index.styl b/dash/App/Add/style/index.styl
index 0e63ebffa..8e99c9b53 100644
--- a/dash/App/Add/style/index.styl
+++ b/dash/App/Add/style/index.styl
@@ -223,8 +223,11 @@
     display flex
     justify-content center
     align-items center
-    font-weight 400
-    font-size 13px
+    font-size 11px
+    letter-spacing 1px
+    font-weight 600
+    padding-bottom 1px
+    padding-left 1px
     text-transform uppercase
 
     *
diff --git a/dash/index.styl b/dash/index.styl
index 1a59560f9..77f0f60b1 100644
--- a/dash/index.styl
+++ b/dash/index.styl
@@ -59,9 +59,12 @@ div
         display flex
         justify-content center
         align-items center
-        font-weight 400
-        font-size 13px
         text-transform uppercase
+        font-size 11px
+        letter-spacing 1px
+        font-weight 600
+        padding-bottom 1px
+        padding-left 1px
 
         *
           pointer-events none
diff --git a/package.json b/package.json
index 6168f6604..69bb51e36 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,13 @@
       ]
     },
     "mac": {
+      "target": {
+        "target": "default",
+        "arch": [
+          "x64",
+          "arm64"
+        ]
+      },
       "hardenedRuntime": true,
       "gatekeeperAssess": false,
       "entitlements": "build/entitlements.mac.plist"