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.

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

PR to include 2.4 changes (front-end, fix bugs, refunds screen) #1022

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "PowPeg",
"version": "2.3.1",
"version": "2.4.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand Down
8 changes: 4 additions & 4 deletions src/common/utils/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@ export function getBtcBaseExplorerUrl() {
let network = '';
switch (EnvironmentAccessorService.getEnvironmentVariables().vueAppCoin) {
case constants.BTC_NETWORK_TESTNET:
network = 'btc-testnet';
network = '/testnet';
break;
case constants.BTC_NETWORK_MAINNET:
network = 'btc';
network = '';
break;
default:
network = 'btc-testnet';
network = '/testnet';
break;
}
return `https://live.blockcypher.com/${network}`;
return `https://mempool.space${network}`;
}

export function getBtcTxExplorerUrl(txId: string) {
Expand Down
2 changes: 1 addition & 1 deletion src/pegin/components/create/PegInForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</v-row>
<v-row no-gutters class="ga-4 ga-lg-8">
<btc-input @valid-amount="checkValidAmount" />
<rsk-destination-address @valid-address="checkValidAddress"/>
<rsk-destination-address @valid-address="checkValidAddress" :is-amount-filled="validAmount"/>
</v-row>
<btc-fee-select/>
<div v-if="showOptions" class="d-flex flex-column ga-2">
Expand Down
12 changes: 11 additions & 1 deletion src/pegin/components/create/RskDestinationAddress.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,16 @@
</v-btn>
</template>
</v-text-field>
<v-alert v-show="isAmountFilled && !isInputFilled"
color="orange" density="compact" variant="text" class="px-0">
Please inform destination address
</v-alert>
<v-alert v-show="!isValidInputAddress && isInputFilled" type="error"
color="orange" density="compact">
Not an address
</v-alert>
<v-alert v-show="notChecksummedAddressWarning" type="warning"
color="orange" density="compact" variant="outline">
color="orange" density="compact" variant="outlined">
Not a checksummed address
</v-alert>
</v-col>
Expand All @@ -42,6 +46,12 @@ import { EnvironmentAccessorService } from '@/common/services/enviroment-accesso

export default defineComponent({
name: 'RskDestinationAddress',
props: {
isAmountFilled: {
type: Boolean,
required: true,
},
},
setup(props, context) {
const connectedAccount = useGetter<string>('web3Session', constants.SESSION_GET_CHECKSUMMED_ACCOUNT);
const address = ref(connectedAccount.value);
Expand Down