diff --git a/app.json b/app.json index 5728bce..5988c0d 100644 --- a/app.json +++ b/app.json @@ -11,6 +11,7 @@ ], "version": "1.0.0", "orientation": "portrait", + "icon": "./assets/icons/app.png", "splash": { "image": "./assets/icons/splash.png", "resizeMode": "cover", diff --git a/assets/icons/app.png b/assets/icons/app.png new file mode 100644 index 0000000..98ada27 Binary files /dev/null and b/assets/icons/app.png differ diff --git a/src/core/configureStore.ts b/src/core/configureStore.ts index cb11357..083b43a 100644 --- a/src/core/configureStore.ts +++ b/src/core/configureStore.ts @@ -40,7 +40,7 @@ function configureStore( const sagaMiddleware = createSagaMiddleware(); const navigationMiddleware = createReactNavigationReduxMiddleware( - 'ScannerPreview', + '', (state: IAppReduxState) => state.nav, ); diff --git a/src/core/index.ts b/src/core/index.ts index a559c02..a0c6cda 100644 --- a/src/core/index.ts +++ b/src/core/index.ts @@ -22,7 +22,7 @@ export default function initializeCore() { state: state.nav, }); const AppWithNavigationState = - connect(mapStateToProps)(reduxifyNavigator(MainNavigator, 'ScannerPreview') as any); + connect(mapStateToProps)(reduxifyNavigator(MainNavigator, '') as any); return { store, MainNavigator: AppWithNavigationState }; } diff --git a/src/modules/Auth/view/SignTransaction/SignTransaction.tsx b/src/modules/Auth/view/SignTransaction/SignTransaction.tsx index 013ffcc..e020114 100644 --- a/src/modules/Auth/view/SignTransaction/SignTransaction.tsx +++ b/src/modules/Auth/view/SignTransaction/SignTransaction.tsx @@ -8,11 +8,13 @@ import { Input, Modal, Button } from 'shared/view/components'; import { ITransaction } from 'shared/models/types'; import { IAppReduxState } from 'shared/types/app'; import { ICommunication } from 'shared/types/redux'; -import TrustWallet, { MessagePayload, TransactionPayload } from 'react-native-trust-sdk'; +import TrustWallet, { TransactionPayload } from 'react-native-trust-sdk'; import { selectors } from '../../redux'; import styles from './styles'; +const minGasLimit = '32000'; + interface IStateProps { transaction: ITransaction | null; loadingTransaction: ICommunication; @@ -21,9 +23,10 @@ interface IStateProps { interface IState { data: string; address: string; - isOpenModal: boolean; amount: string; message: string; + isOpenErrorModal: boolean; + isOpenSuccessModal: boolean; } type IProps = IStateProps & NavigationScreenProps; @@ -33,6 +36,8 @@ class SignTransaction extends Component { title: 'Enter a data', }; + // public callbackScheme: string = 'exp://gm-qy9.varimartas.akropolisconnect.exp.direct:80/--/'; + public callbackScheme: string = 'akropolisconnect://'; public wallet: TrustWallet = new TrustWallet(this.callbackScheme); @@ -40,10 +45,11 @@ class SignTransaction extends Component { // address: '0xE47494379c1d48ee73454C251A6395FDd4F9eb43', // data: '0x8f834227000000000000000000000000000000005224', address: '', + data: '', amount: '1', message: 'hello trust', - data: '', - isOpenModal: false, + isOpenErrorModal: false, + isOpenSuccessModal: false, }; public componentDidMount() { @@ -88,84 +94,51 @@ class SignTransaction extends Component {