status-im
/
MyCrypto
mirror of https://github.com/status-im/MyCrypto.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add QR signer modal to root so its always available (#1509)

This commit is contained in:
William O'Beirne 2018-04-13 00:34:30 -04:00 committed by Daniel Ternyak
parent 2bb706d4a1
commit b4c4b05df6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/Root.tsx
View File

@ -13,6 +13,7 @@ import CheckTransaction from 'containers/Tabs/CheckTransaction';
import ErrorScreen from 'components/ErrorScreen'; import ErrorScreen from 'components/ErrorScreen';
import PageNotFound from 'components/PageNotFound'; import PageNotFound from 'components/PageNotFound';
import LogOutPrompt from 'components/LogOutPrompt'; import LogOutPrompt from 'components/LogOutPrompt';
import QrSignerModal from 'containers/QrSignerModal';
import { TitleBar } from 'components/ui'; import { TitleBar } from 'components/ui';
import { Store } from 'redux'; import { Store } from 'redux';
import { pollOfflineStatus, TPollOfflineStatus } from 'actions/config'; import { pollOfflineStatus, TPollOfflineStatus } from 'actions/config';
@ -102,6 +103,7 @@ class RootClass extends Component<Props, State> {
{routes} {routes}
<LegacyRoutes /> <LegacyRoutes />
<LogOutPrompt /> <LogOutPrompt />
<QrSignerModal />
</React.Fragment> </React.Fragment>
</Router> </Router>
</Provider> </Provider>

2
common/containers/Tabs/SendTransaction/index.tsx
View File

@ -2,7 +2,6 @@ import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import translate from 'translations'; import translate from 'translations';
import TabSection from 'containers/TabSection'; import TabSection from 'containers/TabSection';
import QrSignerModal from 'containers/QrSignerModal';
import { UnlockHeader } from 'components/ui'; import { UnlockHeader } from 'components/ui';
import { getWalletInst } from 'selectors/wallet'; import { getWalletInst } from 'selectors/wallet';
import { AppState } from 'reducers'; import { AppState } from 'reducers';
@ -109,7 +108,6 @@ class SendTransaction extends React.Component<Props> {
</div> </div>
)} )}
</section> </section>
<QrSignerModal />
</TabSection> </TabSection>
); );
} }