Skip to content

Commit 8ebc045

Browse files
authored
Merge pull request #400 from ganeshrvel/release/3.2.26
Release 3.2.26
2 parents efcddb0 + 71a165b commit 8ebc045

File tree

6 files changed

+79
-2
lines changed

6 files changed

+79
-2
lines changed

README.md

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,53 @@ $ set UPGRADE_EXTENSIONS=1 && npm run dev
296296

297297
### Troubleshooting
298298

299-
#### Your device is not recognized
299+
#### Error while building the app - `No module named 'distutils'`
300+
301+
To resolve this issue, install Python setuptools:
302+
303+
```shell
304+
brew install python-setuptools
305+
```
306+
307+
#### Error: npm version issue due to node-gyp bug
308+
309+
If you encounter an error message like:
310+
311+
```txt
312+
Error: This project requires npm version >=6.x <=8.16.0. You have version 10.24.0.
313+
Please downgrade your npm, this is due to a bug in node-gyp.
314+
GitHub issue: https://github.com/ganeshrvel/openmtp/issues/367.
315+
command: npm install -g [email protected]
316+
```
317+
318+
Follow these steps:
319+
320+
1. If you use `nvm`, switch to Node.js version `16.19.0`:
321+
322+
```shell
323+
nvm install 16.19.0
324+
nvm use 16.19.0
325+
```
326+
327+
2. Then, install the compatible npm version:
328+
329+
```shell
330+
npm install -g [email protected]
331+
```
332+
333+
#### For non-nvm users
334+
335+
If you don't use `nvm`, you can directly install Node.js version `16.19.0` from the [official website](https://nodejs.org/en/download/releases/), or you can use a package manager like `brew` to install the correct version:
336+
337+
```shell
338+
brew install node@16
339+
```
340+
341+
After installation, ensure npm is downgraded to the required version:
342+
343+
```shell
344+
npm install -g [email protected]
345+
```
300346

301347
#### **node-mac-permissions** throws `Speech framework is not compatible with macOS < 10.15`
302348

app/constants/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,5 @@ export const DELETE_KEIS_SMARTSWITCH_URL = `https://farazfazli.medium.com/how-i-
5656
export const USB_HOTPLUG_MAX_ATTEMPTS = 6;
5757

5858
export const USB_HOTPLUG_MAX_ATTEMPTS_TIMEOUT = 15000; // in ms
59+
60+
export const GANESHR_PORTFOLIO_URL = 'https://www.ganeshrvel.com/?c=openmtp'; // in ms

app/containers/HomePage/components/FileExplorer.jsx

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ import {
6767
import {
6868
BUY_ME_A_COFFEE_URL,
6969
DEVICES_LABEL,
70+
GANESHR_PORTFOLIO_URL,
7071
SUPPORT_PAYPAL_URL,
7172
USB_HOTPLUG_MAX_ATTEMPTS,
7273
USB_HOTPLUG_MAX_ATTEMPTS_TIMEOUT,
@@ -1985,6 +1986,11 @@ class FileExplorer extends Component {
19851986
});
19861987
};
19871988

1989+
_handlePortfolioUrlTap = () => {
1990+
analyticsService.sendEvent(EVENT_TYPE.GANESHR_PORTFOLIO_URL, {});
1991+
openExternalUrl(GANESHR_PORTFOLIO_URL);
1992+
};
1993+
19881994
render() {
19891995
const {
19901996
classes: styles,
@@ -2061,6 +2067,17 @@ class FileExplorer extends Component {
20612067
maxWidthDialog="sm"
20622068
helpText="If the progress bar freezes while transferring the files, restart the app and reconnect the device. This is a known Android MTP bug."
20632069
>
2070+
<Typography className={styles.buildProduct}>
2071+
{`Are you building a product and looking for expert tech talent to drive it forward? `}
2072+
<span
2073+
onClick={this._handlePortfolioUrlTap}
2074+
className={classnames(styles.connectPortfolioUrl)}
2075+
>
2076+
Let’s connect
2077+
</span>
2078+
!
2079+
</Typography>
2080+
20642081
<div className={styles.socialMediaShareContainer}>
20652082
<Typography className={styles.supportBtnsTitle}>
20662083
{`I've invested a significant amount of my time and energy into developing and maintaining this OpenSource application.`}

app/containers/HomePage/styles/FileExplorer.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ export const styles = (theme) => ({
1313
supportBtnsBoldText: {
1414
fontWeight: 'bold',
1515
},
16+
buildProduct: {
17+
marginTop: 10,
18+
fontSize: 13,
19+
fontWeight: 500,
20+
},
21+
connectPortfolioUrl: {
22+
cursor: `pointer`,
23+
color: theme.palette.secondary.main,
24+
},
1625
socialMediaShareTitle: {
1726
marginTop: 10,
1827
fontSize: 11,

app/enums/events.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,4 +151,7 @@ export const EVENT_TYPE = {
151151
// actions
152152
EXTERNAL_DRAG_FILES_DROPPED: 'EXTERNAL_DRAG_FILES_DROPPED',
153153
EXTERNAL_DRAG_FILES_CANCELLED: 'EXTERNAL_DRAG_FILES_CANCELLED',
154+
155+
// actions
156+
GANESHR_PORTFOLIO_URL: 'GANESHR_PORTFOLIO_URL',
154157
};

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "openmtp",
33
"productName": "OpenMTP",
4-
"version": "3.2.25",
4+
"version": "3.2.26",
55
"description": "OpenMTP | Android File Transfer for macOS",
66
"scripts": {
77
"build": "yarn lint && concurrently \"yarn build-main\" \"yarn build-renderer\"",

0 commit comments

Comments
 (0)