Skip to content

Commit

Permalink
Merge pull request #790 from hubiinetwork/feature/1.2.9
Browse files Browse the repository at this point in the history
1.2.9
  • Loading branch information
katat committed Oct 25, 2019
2 parents c665a1c + c809283 commit d6ce2fa
Show file tree
Hide file tree
Showing 5 changed files with 752 additions and 498 deletions.
29 changes: 29 additions & 0 deletions internals/scripts/notarize.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#!/usr/bin/env node
const fs = require('fs');
const path = require('path');
const electronNotarize = require('electron-notarize');

(async () => {
// Same appId in electron-builder.
const appId = process.env.npm_package_build_appId;

const appPath = path.join(process.cwd(), 'dist/mac', `${process.env.npm_package_name}.app`);
if (!fs.existsSync(appPath)) {
throw new Error(`Cannot find application at: ${appPath}`);
}

console.log(`Notarizing ${appId} found at ${appPath}`);

try {
await electronNotarize.notarize({
appBundleId: appId,
appPath,
appleId: process.env.APPLE_ID,
appleIdPassword: process.env.APPLE_ID_PASSWORD,
});
} catch (error) {
console.error(error);
}

console.log(`Done notarizing ${appId}`);
})();
8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hubii-core",
"version": "1.2.8",
"version": "1.2.9",
"author": {
"name": "hubii",
"email": "info@hubii.com",
Expand Down Expand Up @@ -30,10 +30,11 @@
},
"scripts": {
"release": "electron-builder -lwm -p always",
"notarize": "./internals/scripts/notarize.js",
"electron-dev": "concurrently --kill-others \"cross-env NODE_ENV=development yarn electron-compile --watch\" \"cross-env BROWSER=none TARGET=electron yarn start-web\" \"wait-on http://localhost:3000 && yarn electron --ignore-certificate-errors\"",
"preelectron-dev": "electron-rebuild --force --module_dir . -w node-hid",
"electron": "electron .",
"electron-build": "cross-env TARGET=electron npm run build && cross-env DEBUG=electron-builder electron-builder --publish never",
"electron-build": "cross-env TARGET=electron npm run build && cross-env DEBUG=electron-builder electron-builder --publish never -lwm",
"preelectron-build": "electron-rebuild --force --module_dir . -w node-hid",
"electron-pack": "cross-env TARGET=electron npm run build && cross-env DEBUG=electron-builder electron-builder --dir",
"electron-compile": "webpack --config internals/webpack/webpack.electron.babel.js",
Expand Down Expand Up @@ -292,6 +293,7 @@
"electron-is-dev": "0.3.0",
"electron-localshortcut": "^3.1.0",
"electron-log": "^2.2.17",
"electron-notarize": "^0.1.1",
"electron-reload": "^1.2.5",
"electron-remote": "^1.3.0",
"electron-updater": "^3.0.1",
Expand Down Expand Up @@ -376,7 +378,7 @@
"electron": "2.0.10",
"electron-builder": "20.20.4",
"electron-devtools-installer": "2.2.4",
"electron-rebuild": "1.7.3",
"electron-rebuild": "1.8.6",
"enzyme": "3.3.0",
"enzyme-adapter-react-16": "1.1.1",
"eslint": "4.18.2",
Expand Down
2 changes: 1 addition & 1 deletion src/containers/NahmiiDeposit/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export class NahmiiDeposit extends React.Component { // eslint-disable-line reac
assetToDepositMaxDecimals,
amountToDepositInputRegex,
gasPriceGwei: new BigNumber('10'),
gasLimit: 600000,
gasLimit: 800000,
addContactModalVisibility: false,
};
this.onFocusNumberInput = this.onFocusNumberInput.bind(this);
Expand Down
Loading

0 comments on commit d6ce2fa

Please sign in to comment.