status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #992 from gnosis/fix/trezor 

Add fix for Trezor on Windows
This commit is contained in:
Mati Dastugue 2020-06-08 13:50:26 -03:00 committed by GitHub
parent 2b02f06db3 f7faf3e29c
commit 4aabdc7140
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/electron.js
View File

@ -57,7 +57,7 @@ function getOpenedWindow(url,options) {
height:700, height:700,
x: width - 1300, x: width - 1300,
parent:mainWindow, parent:mainWindow,
y: height - 200, y: height - (process.platform === 'win32' ? 750 : 200),
webContents: options.webContents, // use existing webContents if provided webContents: options.webContents, // use existing webContents if provided
fullscreen: false, fullscreen: false,
show: false, show: false,
@ -140,9 +140,7 @@ process.on('uncaughtException',function(error){
log.error(error); log.error(error);
}); });
app.userAgentFallback = process.platform ==='win32' ? 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';
'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.commandLine.appendSwitch('ignore-certificate-errors'); app.commandLine.appendSwitch('ignore-certificate-errors');
app.on("ready", () =>{ app.on("ready", () =>{

4
src/routes/opening/components/Footer.tsx
View File

@ -36,14 +36,14 @@ export const ContinueFooter = ({
onContinue, onContinue,
}: { }: {
continueButtonDisabled: boolean continueButtonDisabled: boolean
onContinue: Function onContinue: () => void
}) => ( }) => (
<Button color="primary" disabled={continueButtonDisabled} onClick={onContinue} variant="contained"> <Button color="primary" disabled={continueButtonDisabled} onClick={onContinue} variant="contained">
Continue Continue
</Button> </Button>
) )
export const ErrorFooter = ({ onCancel, onRetry }: { onCancel: Function; onRetry: Function }) => ( export const ErrorFooter = ({ onCancel, onRetry }: { onCancel: () => void; onRetry: () => void }) => (
<> <>
<ButtonWithMargin onClick={onCancel} variant="contained"> <ButtonWithMargin onClick={onCancel} variant="contained">
Cancel Cancel

2
src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/index.tsx
View File

@ -25,7 +25,7 @@ const useStyles = makeStyles(styles)
export interface CreatedTx { export interface CreatedTx {
contractAddress: string contractAddress: string
data: string data: string
selectedMethod: {} selectedMethod: any
value: string | number value: string | number
} }

2
src/routes/safe/store/actions/transactions/utils/transactionHelpers.ts
View File

@ -351,7 +351,7 @@ export function generateSafeTxHash(safeAddress: string, txArgs: TxArgs): string
{ type: 'uint256', name: 'nonce' }, { type: 'uint256', name: 'nonce' },
], ],
} }
const primaryType: 'SafeTx' = 'SafeTx' const primaryType = 'SafeTx' as const
const typedData = { const typedData = {
types: messageTypes, types: messageTypes,