Skip to content
This repository was archived by the owner on Mar 23, 2023. It is now read-only.

Commit 3ca889e

Browse files
author
Brian Faust
committed
Merge branch 'staging'
2 parents da75fc2 + 976fe7a commit 3ca889e

File tree

22 files changed

+835
-156
lines changed

22 files changed

+835
-156
lines changed

‎.github/workflows/draft-artifacts.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,20 @@ jobs:
4646
# - name: Upload .AppImage
4747
# uses: actions/upload-artifact@master
4848
# with:
49-
# name: ark-desktop-wallet-linux-2.9.4.AppImage
50-
# path: build/target/ark-desktop-wallet-linux-x86_64-2.9.4.AppImage
49+
# name: ark-desktop-wallet-linux-2.9.5.AppImage
50+
# path: build/target/ark-desktop-wallet-linux-x86_64-2.9.5.AppImage
5151

5252
# - name: Upload .tar.gz
5353
# uses: actions/upload-artifact@master
5454
# with:
55-
# name: ark-desktop-wallet-linux-2.9.4.tar.gz
56-
# path: build/target/ark-desktop-wallet-linux-x64-2.9.4.tar.gz
55+
# name: ark-desktop-wallet-linux-2.9.5.tar.gz
56+
# path: build/target/ark-desktop-wallet-linux-x64-2.9.5.tar.gz
5757

5858
- name: Upload .deb
5959
uses: actions/upload-artifact@master
6060
with:
61-
name: ark-desktop-wallet-linux-2.9.4-${{ github.sha }}.deb
62-
path: build/target/ark-desktop-wallet-linux-amd64-2.9.4.deb
61+
name: ark-desktop-wallet-linux-2.9.5-${{ github.sha }}.deb
62+
path: build/target/ark-desktop-wallet-linux-amd64-2.9.5.deb
6363

6464
build-macOS:
6565
runs-on: macos-latest
@@ -102,14 +102,14 @@ jobs:
102102
# - name: Upload .zip
103103
# uses: actions/upload-artifact@master
104104
# with:
105-
# name: ark-desktop-wallet-mac-2.9.4.zip
106-
# path: build/target/ark-desktop-wallet-mac-2.9.4.zip
105+
# name: ark-desktop-wallet-mac-2.9.5.zip
106+
# path: build/target/ark-desktop-wallet-mac-2.9.5.zip
107107

108108
- name: Upload .dmg
109109
uses: actions/upload-artifact@v1
110110
with:
111-
name: ark-desktop-wallet-mac-2.9.4-${{ github.sha }}.dmg
112-
path: build/target/ark-desktop-wallet-mac-2.9.4.dmg
111+
name: ark-desktop-wallet-mac-2.9.5-${{ github.sha }}.dmg
112+
path: build/target/ark-desktop-wallet-mac-2.9.5.dmg
113113

114114
build-windows:
115115
runs-on: windows-latest
@@ -137,5 +137,5 @@ jobs:
137137
- name: Upload .exe
138138
uses: actions/upload-artifact@v1
139139
with:
140-
name: ark-desktop-wallet-win-2.9.4-${{ github.sha }}.exe
141-
path: build/target/ark-desktop-wallet-win-2.9.4.exe
140+
name: ark-desktop-wallet-win-2.9.5-${{ github.sha }}.exe
141+
path: build/target/ark-desktop-wallet-win-2.9.5.exe

‎.github/workflows/publish-release.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,28 +82,28 @@ jobs:
8282
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8383

8484
- name: Calculate Checksums for AppImage
85-
run: shasum -a 256 build/target/ark-desktop-wallet-linux-x86_64-2.9.4.AppImage
85+
run: shasum -a 256 build/target/ark-desktop-wallet-linux-x86_64-2.9.5.AppImage
8686

8787
- name: Calculate Checksums for TAR
88-
run: shasum -a 256 build/target/ark-desktop-wallet-linux-x64-2.9.4.tar.gz
88+
run: shasum -a 256 build/target/ark-desktop-wallet-linux-x64-2.9.5.tar.gz
8989

9090
- name: Calculate Checksums for DEB
91-
run: shasum -a 256 build/target/ark-desktop-wallet-linux-amd64-2.9.4.deb
91+
run: shasum -a 256 build/target/ark-desktop-wallet-linux-amd64-2.9.5.deb
9292

9393
- name: VirusTotal Scan for AppImage
9494
run: |
9595
UPLOAD_URL=$(curl -s --location --url 'https://www.virustotal.com/vtapi/v2/file/scan/upload_url?apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' | jq -r .upload_url)
96-
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-linux-x86_64-2.9.4.AppImage' | jq -r .permalink
96+
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-linux-x86_64-2.9.5.AppImage' | jq -r .permalink
9797
9898
- name: VirusTotal Scan for TAR
9999
run: |
100100
UPLOAD_URL=$(curl -s --location --url 'https://www.virustotal.com/vtapi/v2/file/scan/upload_url?apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' | jq -r .upload_url)
101-
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-linux-x64-2.9.4.tar.gz' | jq -r .permalink
101+
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-linux-x64-2.9.5.tar.gz' | jq -r .permalink
102102
103103
- name: VirusTotal Scan for DEB
104104
run: |
105105
UPLOAD_URL=$(curl -s --location --url 'https://www.virustotal.com/vtapi/v2/file/scan/upload_url?apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' | jq -r .upload_url)
106-
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-linux-amd64-2.9.4.deb' | jq -r .permalink
106+
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-linux-amd64-2.9.5.deb' | jq -r .permalink
107107
108108
publish-macos:
109109
needs: ["create-release"]
@@ -148,20 +148,20 @@ jobs:
148148
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
149149

150150
- name: Calculate Checksums for DMG
151-
run: shasum -a 256 build/target/ark-desktop-wallet-mac-2.9.4.dmg
151+
run: shasum -a 256 build/target/ark-desktop-wallet-mac-2.9.5.dmg
152152

153153
- name: Calculate Checksums for ZIP
154-
run: shasum -a 256 build/target/ark-desktop-wallet-mac-2.9.4.zip
154+
run: shasum -a 256 build/target/ark-desktop-wallet-mac-2.9.5.zip
155155

156156
- name: VirusTotal Scan for DMG
157157
run: |
158158
UPLOAD_URL=$(curl -s --location --url 'https://www.virustotal.com/vtapi/v2/file/scan/upload_url?apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' | jq -r .upload_url)
159-
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-mac-2.9.4.dmg' | jq -r .permalink
159+
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-mac-2.9.5.dmg' | jq -r .permalink
160160
161161
- name: VirusTotal Scan for ZIP
162162
run: |
163163
UPLOAD_URL=$(curl -s --location --url 'https://www.virustotal.com/vtapi/v2/file/scan/upload_url?apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' | jq -r .upload_url)
164-
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-mac-2.9.4.zip' | jq -r .permalink
164+
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-mac-2.9.5.zip' | jq -r .permalink
165165
166166
publish-windows:
167167
needs: ["create-release"]
@@ -199,5 +199,5 @@ jobs:
199199
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
200200

201201
- name: Calculate Checksums for EXE
202-
run: Get-FileHash build/target/ark-desktop-wallet-win-2.9.4.exe -Algorithm SHA256 | Format-List
202+
run: Get-FileHash build/target/ark-desktop-wallet-win-2.9.5.exe -Algorithm SHA256 | Format-List
203203
shell: powershell

‎.github/workflows/test.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,20 @@ jobs:
9090
# - name: Upload .AppImage
9191
# uses: actions/upload-artifact@master
9292
# with:
93-
# name: ark-desktop-wallet-linux-2.9.4.AppImage
94-
# path: build/target/ark-desktop-wallet-linux-x86_64-2.9.4.AppImage
93+
# name: ark-desktop-wallet-linux-2.9.5.AppImage
94+
# path: build/target/ark-desktop-wallet-linux-x86_64-2.9.5.AppImage
9595

9696
# - name: Upload .tar.gz
9797
# uses: actions/upload-artifact@master
9898
# with:
99-
# name: ark-desktop-wallet-linux-2.9.4.tar.gz
100-
# path: build/target/ark-desktop-wallet-linux-x64-2.9.4.tar.gz
99+
# name: ark-desktop-wallet-linux-2.9.5.tar.gz
100+
# path: build/target/ark-desktop-wallet-linux-x64-2.9.5.tar.gz
101101

102102
- name: Upload .deb
103103
uses: actions/upload-artifact@master
104104
with:
105-
name: ark-desktop-wallet-linux-2.9.4-${{ github.sha }}.deb
106-
path: build/target/ark-desktop-wallet-linux-amd64-2.9.4.deb
105+
name: ark-desktop-wallet-linux-2.9.5-${{ github.sha }}.deb
106+
path: build/target/ark-desktop-wallet-linux-amd64-2.9.5.deb
107107

108108
build-macOS:
109109
runs-on: macos-latest
@@ -138,14 +138,14 @@ jobs:
138138
# - name: Upload .zip
139139
# uses: actions/upload-artifact@master
140140
# with:
141-
# name: ark-desktop-wallet-mac-2.9.4.zip
142-
# path: build/target/ark-desktop-wallet-mac-2.9.4.zip
141+
# name: ark-desktop-wallet-mac-2.9.5.zip
142+
# path: build/target/ark-desktop-wallet-mac-2.9.5.zip
143143

144144
- name: Upload .dmg
145145
uses: actions/upload-artifact@v1
146146
with:
147-
name: ark-desktop-wallet-mac-2.9.4-${{ github.sha }}.dmg
148-
path: build/target/ark-desktop-wallet-mac-2.9.4.dmg
147+
name: ark-desktop-wallet-mac-2.9.5-${{ github.sha }}.dmg
148+
path: build/target/ark-desktop-wallet-mac-2.9.5.dmg
149149

150150
build-windows:
151151
runs-on: windows-latest
@@ -173,5 +173,5 @@ jobs:
173173
- name: Upload .exe
174174
uses: actions/upload-artifact@v1
175175
with:
176-
name: ark-desktop-wallet-win-2.9.4-${{ github.sha }}.exe
177-
path: build/target/ark-desktop-wallet-win-2.9.4.exe
176+
name: ark-desktop-wallet-win-2.9.5-${{ github.sha }}.exe
177+
path: build/target/ark-desktop-wallet-win-2.9.5.exe

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[![Latest Version](https://badgen.now.sh/github/release/ArkEcosystem/desktop-wallet)](https://github.com/ArkEcosystem/desktop-wallet/releases)
77
[![License: MIT](https://badgen.now.sh/badge/license/MIT/green)](https://opensource.org/licenses/MIT)
88

9-
> Lead Maintainer: [Alex Barnsley](https://github.com/alexbarnsley)
9+
> Lead Maintainer: [Lúcio Rubens](https://github.com/luciorubeens)
1010
1111
## Download
1212

‎__tests__/unit/__utils__/setup.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ require('babel-plugin-require-context-hook/register')()
1212
// implementation to use it instead when that lack of accuracy is an issue
1313
global.__Intl__ = global.Intl
1414
global.Intl = require('intl')
15+
global.Intl.Collator = global.__Intl__.Collator
1516

1617
HTMLCanvasElement.prototype.getContext = jest.fn()
1718

‎__tests__/unit/components/Transaction/TransactionForm/TransactionFormVote.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ describe('TransactionFormVote', () => {
234234
expect(wrapper.vm.showVoteUnvoteButton).toBe(false)
235235
})
236236

237-
it('should return false if wallet is voting but not for delegate', () => {
237+
it('should return true if wallet is voting but not for delegate', () => {
238238
wrapper.setProps({
239239
isVoter: false,
240240
votedDelegate: {
@@ -254,7 +254,7 @@ describe('TransactionFormVote', () => {
254254
}
255255
})
256256

257-
expect(wrapper.vm.showVoteUnvoteButton).toBe(false)
257+
expect(wrapper.vm.showVoteUnvoteButton).toBe(true)
258258
})
259259

260260
it('should return true if not voting', () => {

‎__tests__/unit/services/client.spec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ const sessionNetwork = Object.freeze({
1616
},
1717
vendorField: {
1818
maxLength: 64
19-
}
19+
},
20+
version: 23
2021
})
2122

2223
jest.mock('@/store', () => ({

‎__tests__/unit/services/crypto/transaction-signer.spec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ const sessionNetwork = Object.freeze({
1616
},
1717
vendorField: {
1818
maxLength: 64
19-
}
19+
},
20+
version: 23
2021
})
2122

2223
jest.mock('@/store', () => ({

‎config/networks/devnet.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"id": "ark.devnet",
33
"name": "ARK Devnet",
44
"title": "ARK Devnet",
5-
"server": "https://dexplorer.ark.io:8443",
5+
"server": "https://dwallets.ark.io",
66
"description": "The ARK Devnet is only used for R&D by engineers.",
77
"imagePath": "networks/ark.devnet.svg",
88
"apiVersion": 2,

‎config/networks/mainnet.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"id": "ark.mainnet",
33
"name": "ARK Mainnet",
44
"title": "ARK Mainnet",
5-
"server": "https://explorer.ark.io:8443",
5+
"server": "https://wallets.ark.io",
66
"description": "The ARK Mainnet should be chosen in most cases.",
77
"imagePath": "networks/ark.png",
88
"apiVersion": 2,

0 commit comments

Comments
 (0)