diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6186662a..913cdbb1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -569,7 +569,7 @@
+ android:theme="@style/ActivityDialog"/>
\ No newline at end of file
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestActivity.java
index 1e380808..02e1be79 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestActivity.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestActivity.java
@@ -28,6 +28,7 @@ import android.widget.ProgressBar;
import com.gmeremit.online.gmeremittance_native.R;
import com.gmeremit.online.gmeremittance_native.base.BaseActivity;
+import com.gmeremit.online.gmeremittance_native.customwidgets.ZoomOutTransformation;
import com.gmeremit.online.gmeremittance_native.kycV2.adapter.PennyTestViewPagerAdapter;
import com.gmeremit.online.gmeremittance_native.kycV2.presenter.pennytest.PennyTestPresenter;
import com.gmeremit.online.gmeremittance_native.kycV2.presenter.pennytest.PennyTestPresenterInterface;
@@ -255,7 +256,12 @@ public class PennyTestActivity extends BaseActivity implements View.OnClickListe
if( currentFragment instanceof PennyTestPromptFragment)
morphButtonIntoProgressBar(()->this.presenter.requestForPennyTest());
else if(currentFragment instanceof PennyTestOperationFragment)
- morphButtonIntoProgressBar(()->this.presenter.performPennyTest(((PennyTestOperationFragment)currentFragment).getCertNumber()));
+
+ morphButtonIntoProgressBar(()->{
+ String creditNumber=((PennyTestOperationFragment)currentFragment).getCertNumber();
+ if(creditNumber!=null)
+ this.presenter.performPennyTest(creditNumber);
+ });
break;
case R.id.iv_back:
@@ -285,20 +291,6 @@ public class PennyTestActivity extends BaseActivity implements View.OnClickListe
}
- public void closeViewWithPennyTestCompleted() {
- Intent returnIntent = new Intent();
- returnIntent.putExtra(PENNY_TEST_COMPLETED_PERFORMED_STATUS_BUNDLE_KEY, true);
- setResult(Activity.RESULT_OK, returnIntent);
- finish();
- }
-
- public void closeViewWithPennyTestRequested() {
- Intent returnIntent = new Intent();
- returnIntent.putExtra(PENNY_TEST_REQUEST_PERFORMED_STATUS_BUNDLE_KEY, true);
- setResult(Activity.RESULT_OK, returnIntent);
- finish();
- }
-
@Override
public void onBackPressed() {
if(!isLoadingInProgress)
@@ -346,6 +338,14 @@ public class PennyTestActivity extends BaseActivity implements View.OnClickListe
}
}
+
+
+ public void requestPennyTestAgain()
+ {
+ if(this.presenter!=null)
+ morphButtonIntoProgressBar(()->this.presenter.requestPennyTestAgain());
+ }
+
@Override
public void onPennyTestSuccess() {
Intent returnIntent = new Intent();
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestOperationFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestOperationFragment.java
index 5bfd9b38..983d5e9b 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestOperationFragment.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestOperationFragment.java
@@ -27,6 +27,9 @@ public class PennyTestOperationFragment extends BaseFragment implements View.OnC
@BindView(R.id.resend_request)
TextView resendRequest;
+ @BindView(R.id.accountWrapper)
+ TextView accountWrapper;
+
@BindView(R.id.ed_creditNumber)
EditText creditNumber;
private String titleMessage=null;
@@ -46,7 +49,6 @@ public class PennyTestOperationFragment extends BaseFragment implements View.OnC
private void init()
{
- creditNumber.requestFocus();
}
@Override
@@ -76,7 +78,14 @@ public class PennyTestOperationFragment extends BaseFragment implements View.OnC
public String getCertNumber() {
- return creditNumber.getText().toString();
+ if(creditNumber.getText().toString().length()>0) {
+ accountWrapper.setError(null);
+ return creditNumber.getText().toString();
+ }
+ else {
+ accountWrapper.setError("Please enter a valid code");
+ return null;
+ }
}
@Override
@@ -94,9 +103,13 @@ public class PennyTestOperationFragment extends BaseFragment implements View.OnC
}
private void requestPennyTestAgain() {
- PennyTestPresenterInterface presenter= (PennyTestPresenterInterface) getActivity();
- if(presenter!=null)
- presenter.requestPennyTestAgain();
+ try {
+ ((PennyTestActivity) getActivity()).requestPennyTestAgain();
+
+ }catch(NullPointerException e)
+ {
+
+ }
}
public void setTitle(String msg) {
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2Presenter.java
index be8b2ede..466878ab 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2Presenter.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2Presenter.java
@@ -154,9 +154,9 @@ public class WithdrawV2Presenter extends BasePresenter implements WithdrawV2Pres
@Override
protected void onSuccess(GenericResponseDataModel response) {
if (response.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
- view.showPopUpMessage(response.getMsg(), CustomAlertDialog.AlertType.SUCCESS, alertType -> view.exitView());
+ view.showPopUpMessage(response.getData().getMsg(), CustomAlertDialog.AlertType.SUCCESS, alertType -> view.exitView());
} else {
- view.showPopUpMessage(response.getData().getMsg(), CustomAlertDialog.AlertType.FAILED, null);
+ view.showPopUpMessage(response.getMsg(), CustomAlertDialog.AlertType.FAILED, null);
}
}
diff --git a/app/src/main/res/layout/fragment_penny_test_operation.xml b/app/src/main/res/layout/fragment_penny_test_operation.xml
index b3f7b895..80f850df 100644
--- a/app/src/main/res/layout/fragment_penny_test_operation.xml
+++ b/app/src/main/res/layout/fragment_penny_test_operation.xml
@@ -1,89 +1,94 @@
-
-
-
-
-
+ android:layout_height="wrap_content">
-
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="16dp"
+ android:text="Please enter the amount deposited by GME inorder to complete your bank account verification process."
+ android:textSize="17sp"
+ app:layout_constraintBottom_toTopOf="@+id/accountWrapper"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.0"
+ app:layout_constraintVertical_chainStyle="packed" />
+
+
-
+
-
+
+
+
+
+
-
+
+
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_penny_test_prompt.xml b/app/src/main/res/layout/fragment_penny_test_prompt.xml
index 5cc186d8..57ae2a25 100644
--- a/app/src/main/res/layout/fragment_penny_test_prompt.xml
+++ b/app/src/main/res/layout/fragment_penny_test_prompt.xml
@@ -15,7 +15,7 @@
android:paddingEnd="15dp"
android:paddingBottom="15dp"
android:text="Your bank account verification is required inorder to complete the registration. Do you want to verify it now?"
- android:textSize="21sp"
+ android:textSize="17sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"