LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Merge pull request #4316 from lbryio/feat-installNewDomain

Browse source 
install_new domain parameter
This commit is contained in:
jessopb 2020-06-05 10:33:06 -04:00 committed by GitHub
commit 25e6d5501b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -136,7 +136,7 @@
"json-loader": "^0.5.4", "json-loader": "^0.5.4",
"lbry-format": "https://github.com/lbryio/lbry-format.git", "lbry-format": "https://github.com/lbryio/lbry-format.git",
"lbry-redux": "lbryio/lbry-redux#a9f1f7b61d6d3abe836a8f72eee392f66786a26f", "lbry-redux": "lbryio/lbry-redux#a9f1f7b61d6d3abe836a8f72eee392f66786a26f",
"lbryinc": "lbryio/lbryinc#c21bc3075ca3f8bb130893107c11215eb7d5f4d5", "lbryinc": "lbryio/lbryinc#9c4f620ec04193d8206eea577b1e090435749366",
"lint-staged": "^7.0.2", "lint-staged": "^7.0.2",
"localforage": "^1.7.1", "localforage": "^1.7.1",
"lodash-es": "^4.17.14", "lodash-es": "^4.17.14",

13
ui/redux/actions/app.js
View file

@ -6,6 +6,7 @@ import { ipcRenderer, remote } from 'electron';
import path from 'path'; import path from 'path';
import * as ACTIONS from 'constants/action_types'; import * as ACTIONS from 'constants/action_types';
import * as MODALS from 'constants/modal_types'; import * as MODALS from 'constants/modal_types';
import { DOMAIN } from 'config';
import { import {
Lbry, Lbry,
doBalanceSubscribe, doBalanceSubscribe,
@ -333,7 +334,12 @@ export function doDaemonReady() {
const shareUsageData = IS_WEB || window.localStorage.getItem(SHARE_INTERNAL) === 'true'; const shareUsageData = IS_WEB || window.localStorage.getItem(SHARE_INTERNAL) === 'true';
dispatch( dispatch(
doAuthenticate(appVersion, undefined, undefined, shareUsageData, status => { doAuthenticate(
appVersion,
undefined,
undefined,
shareUsageData,
status => {
const trendingAlgorithm = const trendingAlgorithm =
status && status &&
status.wallet && status.wallet &&
@ -343,7 +349,10 @@ export function doDaemonReady() {
if (trendingAlgorithm) { if (trendingAlgorithm) {
analytics.trendingAlgorithmEvent(trendingAlgorithm); analytics.trendingAlgorithmEvent(trendingAlgorithm);
} }
}) },
null,
DOMAIN
)
); );
dispatch({ type: ACTIONS.DAEMON_READY }); dispatch({ type: ACTIONS.DAEMON_READY });

4
yarn.lock
View file

@ -6215,9 +6215,9 @@ lbry-redux@lbryio/lbry-redux#a9f1f7b61d6d3abe836a8f72eee392f66786a26f:
reselect "^3.0.0" reselect "^3.0.0"
uuid "^3.3.2" uuid "^3.3.2"
lbryinc@lbryio/lbryinc#c21bc3075ca3f8bb130893107c11215eb7d5f4d5: lbryinc@lbryio/lbryinc#9c4f620ec04193d8206eea577b1e090435749366:
version "0.0.1" version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/c21bc3075ca3f8bb130893107c11215eb7d5f4d5" resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/9c4f620ec04193d8206eea577b1e090435749366"
dependencies: dependencies:
reselect "^3.0.0" reselect "^3.0.0"