Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update build for mac, relabel gas settings #661

Merged
merged 4 commits into from
Dec 6, 2021
Merged

Update build for mac, relabel gas settings #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4cadcfb
Build for x64 and arm64 on mac
floating Dec 4, 2021
9ff220a
Polish
floating Dec 6, 2021
4355fbb
Priority fee copy
floating Dec 6, 2021
2989272
Merge branch 'beta.9' into ux-polish
floating Dec 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/App/Panel/Main/Account/Requests/TransactionRequest/TxOverlay/TxFeeOverlay/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
)
}
Expand Down Expand Up @@ -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>
)
}
Expand Down
20 changes: 10 additions & 10 deletions app/App/Panel/Notify/AddChain/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 })
Expand All @@ -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 === '') {
Expand All @@ -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()
Expand All @@ -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 })
Expand All @@ -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 })
Expand All @@ -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 })
Expand Down Expand Up @@ -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,
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions app/App/Panel/Notify/AddChain/style/index.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
font-weight 300
color var(--outerspace)

.chainInputLarge
font-size 24px
.chainInputDim
color var(--outerspace03)

.chainInputLabel
font-size 11px
Expand Down
7 changes: 2 additions & 5 deletions app/App/Panel/Notify/AddToken/style/index.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/App/Panel/Notify/CustomTokens/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class CustomTokens extends React.Component {
)
}) : (
<div className='customTokensListNoTokens'>
{'No Custom Tokens Added'}
{'No Custom Tokens'}
</div>
)}
</div>
Expand Down
9 changes: 5 additions & 4 deletions app/App/Panel/Notify/CustomTokens/style/index.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -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
Expand Down
36 changes: 36 additions & 0 deletions app/App/Panel/Notify/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
)
Expand All @@ -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>
)
Expand Down
7 changes: 5 additions & 2 deletions dash/App/Add/style/index.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

*
Expand Down
7 changes: 5 additions & 2 deletions dash/index.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@
]
},
"mac": {
"target": {
"target": "default",
"arch": [
"x64",
"arm64"
]
},
"hardenedRuntime": true,
"gatekeeperAssess": false,
"entitlements": "build/entitlements.mac.plist"
Expand Down