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

chore: remove getWebWalletUrl #16

Merged
merged 1 commit into from
Apr 8, 2022
Merged
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: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.7.1 (四月 06, 2022)

- chore: remove getWebWalletUrl

## 0.7.0 (January 21, 2022)

- chore: deprecate SERVER_URL variable
Expand Down
7 changes: 5 additions & 2 deletions blocklet.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: nft-factory-demo
version: 0.7.0
version: 0.7.1
main: api/index.js
author:
name: ArcBlock
Expand All @@ -8,7 +8,7 @@ title: NFT Factory Demo
logo: logo.png
description: Blocklet that demos capabilities of NFT on arcblock platform.
group: dapp
specVersion: 1.2.1
specVersion: 1.2.4
files:
- blocklet.md
- README.md
Expand Down Expand Up @@ -45,11 +45,13 @@ environments:
required: false
default: 'https://beta.abtnetwork.io/api/'
secure: false
shared: true
- name: VIP_PRICE
description: Please set vip price
required: true
default: '10'
secure: false
shared: true
scripts:
dev: npm run start
preStart: node api/hooks/pre-start.js
Expand All @@ -60,3 +62,4 @@ payment:
share: []
capabilities:
clusterMode: false
component: true
64 changes: 32 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nft-factory-demo",
"version": "0.7.0",
"version": "0.7.1",
"main": "index.js",
"author": "ArcBlock",
"license": "MIT",
Expand All @@ -19,27 +19,27 @@
"coverage": "npm run test -- --coverage"
},
"dependencies": {
"@arcblock/did": "^1.14.3",
"@arcblock/did-auth": "^1.14.3",
"@arcblock/did": "^1.15.7",
"@arcblock/did-auth": "^1.15.7",
"@arcblock/did-auth-storage-nedb": "^1.6.3",
"@arcblock/did-connect": "^1.16.12",
"@arcblock/did-util": "^1.14.3",
"@arcblock/nft": "^1.14.3",
"@arcblock/ux": "^1.16.12",
"@arcblock/vc": "^1.14.3",
"@blocklet/sdk": "^1.6.15",
"@arcblock/did-connect": "^1.16.70",
"@arcblock/did-util": "^1.15.7",
"@arcblock/nft": "^1.15.7",
"@arcblock/ux": "^1.16.70",
"@arcblock/vc": "^1.15.7",
"@blocklet/sdk": "^1.7.5",
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "4.11.2",
"@material-ui/lab": "^4.0.0-alpha.55",
"@ocap/asset": "^1.14.3",
"@ocap/client": "^1.14.3",
"@ocap/mcrypto": "^1.14.3",
"@ocap/message": "^1.14.3",
"@ocap/proto": "^1.14.3",
"@ocap/sdk": "^1.14.3",
"@ocap/tx-util": "^1.14.3",
"@ocap/util": "^1.14.3",
"@ocap/wallet": "^1.14.3",
"@ocap/asset": "^1.15.7",
"@ocap/client": "^1.15.7",
"@ocap/mcrypto": "^1.15.7",
"@ocap/message": "^1.15.7",
"@ocap/proto": "^1.15.7",
"@ocap/sdk": "^1.15.7",
"@ocap/tx-util": "^1.15.7",
"@ocap/util": "^1.15.7",
"@ocap/wallet": "^1.15.7",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
Expand Down Expand Up @@ -98,19 +98,19 @@
"prettier": "^2.0.2"
},
"resolutions": {
"@arcblock/did": "^1.14.3",
"@arcblock/did-auth": "^1.14.3",
"@arcblock/did-util": "^1.14.3",
"@arcblock/nft": "^1.14.3",
"@arcblock/vc": "^1.14.3",
"@ocap/asset": "^1.14.3",
"@ocap/client": "^1.14.3",
"@ocap/mcrypto": "^1.14.3",
"@ocap/message": "^1.14.3",
"@ocap/proto": "^1.14.3",
"@ocap/sdk": "^1.14.3",
"@ocap/tx-util": "^1.14.3",
"@ocap/util": "^1.14.3",
"@ocap/wallet": "^1.14.3"
"@arcblock/did": "^1.15.7",
"@arcblock/did-auth": "^1.15.7",
"@arcblock/did-util": "^1.15.7",
"@arcblock/nft": "^1.15.7",
"@arcblock/vc": "^1.15.7",
"@ocap/asset": "^1.15.7",
"@ocap/client": "^1.15.7",
"@ocap/mcrypto": "^1.15.7",
"@ocap/message": "^1.15.7",
"@ocap/proto": "^1.15.7",
"@ocap/sdk": "^1.15.7",
"@ocap/tx-util": "^1.15.7",
"@ocap/util": "^1.15.7",
"@ocap/wallet": "^1.15.7"
}
}
4 changes: 0 additions & 4 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { ThemeProvider } from 'styled-components';
import { LocaleProvider } from '@arcblock/ux/lib/Locale/context';
import { create } from '@arcblock/ux/lib/Theme';

import { getWebWalletUrl } from './libs/util';
import { SessionProvider } from './libs/session';
import { translations } from './locales';
import Main from './page/main';
Expand All @@ -16,8 +15,6 @@ if (window.blocklet && window.blocklet.prefix) {
}

function App() {
const webWalletUrl = getWebWalletUrl();

const theme = create({
typography: {
fontSize: 14,
Expand Down Expand Up @@ -45,7 +42,6 @@ function App() {
<LocaleProvider translations={translations}>
<SessionProvider
serviceHost={apiPrefix}
webWalletUrl={webWalletUrl}
>
<CssBaseline />
<Main />
Expand Down
4 changes: 0 additions & 4 deletions src/libs/util.js
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
/* eslint-disable import/prefer-default-export */
export function getWebWalletUrl() {
return window.localStorage.getItem('wallet_url') || 'https://web.abtwallet.io/';
}
2 changes: 0 additions & 2 deletions src/page/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import DidAddress from '@arcblock/did-connect/lib/Address';
import DidConnect from '@arcblock/did-connect/lib/Connect';

import { useSessionContext } from '../libs/session';
import { getWebWalletUrl } from '../libs/util';

export default function Main() {
const { session, api } = useSessionContext();
Expand Down Expand Up @@ -86,7 +85,6 @@ export default function Main() {
onClose={() => setBuyOpen(false)}
onSuccess={onAuthSuccess}
checkTimeout={5 * 60 * 1000}
webWalletUrl={getWebWalletUrl()}
messages={{
title: t('buy.title'),
scan: t('buy.scan'),
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.0
0.7.1
Loading