Merge pull request #992 from gnosis/fix/trezor
Add fix for Trezor on Windows
This commit is contained in:
commit
4aabdc7140
|
@ -57,7 +57,7 @@ function getOpenedWindow(url,options) {
|
|||
height:700,
|
||||
x: width - 1300,
|
||||
parent:mainWindow,
|
||||
y: height - 200,
|
||||
y: height - (process.platform === 'win32' ? 750 : 200),
|
||||
webContents: options.webContents, // use existing webContents if provided
|
||||
fullscreen: false,
|
||||
show: false,
|
||||
|
@ -140,9 +140,7 @@ process.on('uncaughtException',function(error){
|
|||
log.error(error);
|
||||
});
|
||||
|
||||
app.userAgentFallback = process.platform ==='win32' ?
|
||||
'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.100 Safari/537.36' :
|
||||
'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) old-airport-include/1.0.0 Chrome Electron/7.1.7 Safari/537.36';
|
||||
app.userAgentFallback = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) old-airport-include/1.0.0 Chrome Electron/7.1.7 Safari/537.36';
|
||||
|
||||
app.commandLine.appendSwitch('ignore-certificate-errors');
|
||||
app.on("ready", () =>{
|
||||
|
|
|
@ -36,14 +36,14 @@ export const ContinueFooter = ({
|
|||
onContinue,
|
||||
}: {
|
||||
continueButtonDisabled: boolean
|
||||
onContinue: Function
|
||||
onContinue: () => void
|
||||
}) => (
|
||||
<Button color="primary" disabled={continueButtonDisabled} onClick={onContinue} variant="contained">
|
||||
Continue
|
||||
</Button>
|
||||
)
|
||||
|
||||
export const ErrorFooter = ({ onCancel, onRetry }: { onCancel: Function; onRetry: Function }) => (
|
||||
export const ErrorFooter = ({ onCancel, onRetry }: { onCancel: () => void; onRetry: () => void }) => (
|
||||
<>
|
||||
<ButtonWithMargin onClick={onCancel} variant="contained">
|
||||
Cancel
|
||||
|
|
|
@ -25,7 +25,7 @@ const useStyles = makeStyles(styles)
|
|||
export interface CreatedTx {
|
||||
contractAddress: string
|
||||
data: string
|
||||
selectedMethod: {}
|
||||
selectedMethod: any
|
||||
value: string | number
|
||||
}
|
||||
|
||||
|
|
|
@ -351,7 +351,7 @@ export function generateSafeTxHash(safeAddress: string, txArgs: TxArgs): string
|
|||
{ type: 'uint256', name: 'nonce' },
|
||||
],
|
||||
}
|
||||
const primaryType: 'SafeTx' = 'SafeTx'
|
||||
const primaryType = 'SafeTx' as const
|
||||
|
||||
const typedData = {
|
||||
types: messageTypes,
|
||||
|
|
Loading…
Reference in New Issue