Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RSK integration to wallet #11954

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

RSK integration to wallet #11954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fe4e3b
RSK integration to wallet
alepc253 Nov 10, 2021
618b094
Linting fixes
alepc253 Nov 10, 2021
25b2f72
Missing validation
alepc253 Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app-template/build-electron-template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ builder
'ripple',
'dogecoin',
'litecoin',
'rsk',
'*NAME*'
]
},
Expand Down
1 change: 1 addition & 0 deletions app-template/config-template.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
<variable name="SEVENTH_URL_SCHEME" value="wc" />
<variable name="EIGHTH_URL_SCHEME" value="dogecoin" />
<variable name="NINTH_URL_SCHEME" value="litecoin" />
<variable name="TENTH_URL_SCHEME" value="rsk" />
<variable name="ANDROID_SCHEME" value="" />
<variable name="ANDROID_HOST" value="" />
<variable name="ANDROID_PATHPREFIX" value="" />
Expand Down
2 changes: 2 additions & 0 deletions electron/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ if (!app.isDefaultProtocolClient('dogecoin'))
app.setAsDefaultProtocolClient('dogecoin');
if (!app.isDefaultProtocolClient('litecoin'))
app.setAsDefaultProtocolClient('litecoin');
if (!app.isDefaultProtocolClient('rsk'))
app.setAsDefaultProtocolClient('rsk');
if (!app.isDefaultProtocolClient(appConfig.name))
app.setAsDefaultProtocolClient(appConfig.name);

Expand Down
3 changes: 3 additions & 0 deletions src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,6 +926,9 @@ export class CopayApp {
} else if (pathData.indexOf('litecoin:/') != -1) {
this.logger.debug('Litecoin URL found');
this.handleOpenUrl(pathData.substring(pathData.indexOf('litecoin:/')));
} else if (pathData.indexOf('rsk:/') != -1) {
this.logger.debug('RSK URL found');
this.handleOpenUrl(pathData.substring(pathData.indexOf('rsk:/')));
} else if (pathData.indexOf(this.appProvider.info.name + '://') != -1) {
this.logger.debug(this.appProvider.info.name + ' URL found');
this.handleOpenUrl(
Expand Down
8 changes: 8 additions & 0 deletions src/app/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,14 @@ ion-spinner * {
background-color: #a6a9aa;
}

.rbtc-background {
background-color: #f7931a;
}

.rsk-background {
background-color: #f7931a;
}

button.item {
&.activated {
background-color: $feather;
Expand Down
15 changes: 15 additions & 0 deletions src/assets/img/currencies/rbtc.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions src/assets/img/currencies/rsk.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 57 additions & 0 deletions src/assets/img/rsk_logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/components/coin-icon/coin-icon.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ coin-icon {
&_ltc {
background-color: #a6a9aa;
}
&_rbtc {
background-color: #f7931a;
}
&_default {
background-color: #e6f8e9;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/incoming-data-menu/incoming-data-menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<action-sheet>
<ion-list class="bp-list" *ngIf="type === 'bitcoinAddress' || type === 'ethereumAddress' || type === 'rippleAddress' || type === 'dogecoinAddress' || type === 'litecoinAddress'">
<ion-list class="bp-list" *ngIf="type === 'bitcoinAddress' || type === 'ethereumAddress' || type === 'rippleAddress' || type === 'dogecoinAddress' || type === 'litecoinAddress' || type === 'rskAddress'">
<ion-item-divider *ngIf="coinName">{{'{coinName} Address' | translate: { coinName: coinName } }}</ion-item-divider>
<ion-item>
{{data}}
Expand Down
Loading