Updated appicons.icns

[ismhdez]

Modified OSX icons to the new Icon Type (Big Sur) -- It's better integrated in the actual versions of MacOS.

New Icon	Old Icon

Dock:

Launchpad:

[selsta]

Could you take a look at https://github.com/monero-project/monero-gui/pull/3560 ? Which one do you prefer?

[ismhdez]

Could you take a look at #3560 ? Which one do you prefer?

Circled icon should not be the default one anymore, since macOS Big Sur all icons were changed to rounded squares:

I think my suggestion fits more with the new macOS look, the app name should be "Monero Wallet.app" or something like that too, yes.

[ismhdez]

Any news regarding the PR?

[selsta]

It takes a while until things get merged, will still check which one of the two I prefer.

[ismhdez]

Fixed, rebased and fixed file permissions (appicon.icns -> 644)

[selsta]

Do you know how to squash?

[ismhdez]

Do you know how to squash?

Uhm, nope

[selsta]

git rebase -i HEAD~2

then set the second commit to "s" for squash and force push.

[ismhdez]

git rebase -i HEAD~2

then set the second commit to "s" for squash and force push.

Should I do the git rebase from the upstream, right? (git rebase -i HEAD~2 upstream/master)

[selsta]

just git rebase -i HEAD~2 should work, does it not?

[ismhdez]

If I do the rebase like you're saying, the appicon.icns file is the one I'm requesting, so I cannot commit it again. What do you want me to is a rebase from your fork (where the appicon.icns is different), and commit mine's with file permission as 644? (squash & force push) 🤔

[selsta]

basically I want 1 commit that doesn't have any merge conflicts

[ismhdez]

basically I want 1 commit that doesn't have any merge conflicts

That commit is ok for you?

[selsta]

yes, thanks